osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update the Qt welcome banner. 

Make the main welcome message more prominent.

Change-Id: I92d2ed88abbe504af8a0818f9902e39a9fc3d6d5
Reviewed-on: https://code.wireshark.org/review/10969
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 1f400db73e2bf4685c4a49b1d0898b37ac858d9f)
Reviewed-on: https://code.wireshark.org/review/10988
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Gerald Combs 2015-10-12 14:34:08 -07:00 committed by Guy Harris
parent 537cb8ed98
commit 0596575a87
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/qt/main_welcome.cpp
View File

@ -49,6 +49,10 @@
#include <QGraphicsBlurEffect>
#endif
#ifndef VERSION_FLAVOR
#define VERSION_FLAVOR ""
#endif
MainWelcome::MainWelcome(QWidget *parent) :
QFrame(parent),
welcome_ui_(new Ui::MainWelcome),
@ -59,7 +63,6 @@ MainWelcome::MainWelcome(QWidget *parent) :
welcome_ui_->interfaceTree->resetColumnCount();
welcome_ui_->mainWelcomeBanner->setText(tr("Welcome to Wireshark."));
recent_files_ = welcome_ui_->recentList;
setStyleSheet(QString(
@ -79,6 +82,18 @@ MainWelcome::MainWelcome(QWidget *parent) :
)
);
QString welcome_ss = QString(
"QLabel {"
" border-radius: 0.33em;"
" color: #%1;"
" background-color: #%2;"
" padding: 0.33em;"
"}"
)
.arg(tango_aluminium_6, 6, 16, QChar('0')) // Text color
.arg(tango_sky_blue_2, 6, 16, QChar('0')); // Background color
welcome_ui_->mainWelcomeBanner->setStyleSheet(welcome_ss);
QString title_ss = QString(
"QLabel {"
" color: #%1;"

23
ui/qt/main_welcome.ui
View File

@ -10,12 +10,6 @@
<height>663</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
@ -44,7 +38,7 @@
<height>0</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,0">
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,1,0">
<property name="leftMargin">
<number>0</number>
</property>
@ -60,10 +54,23 @@
<item>
<widget class="QLabel" name="mainWelcomeBanner">
<property name="text">
<string>Welcome to Wireshark.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:large;&quot;&gt;Welcome to Wireshark&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="bannerSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="flavorBanner">
<property name="alignment">