diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-12 14:34:08 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-10-14 02:22:54 +0000 |
| commit | 0596575a87b766eab0f6a8b4593888d6edf3a085 (patch) | |
| tree | 6f6c5cab429d21bb353986cf6c4ecdae2bdfd15d /ui/qt | |
| parent | 537cb8ed981a845a84e80e45efe77d0759acb68f (diff) | |
| download | wireshark-0596575a87b766eab0f6a8b4593888d6edf3a085.tar.gz | |
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>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/main_welcome.cpp | 17 | ||||
| -rw-r--r-- | ui/qt/main_welcome.ui | 23 |
2 files changed, 31 insertions, 9 deletions
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp index 621003dcc4..f0d25548ff 100644 --- a/ui/qt/main_welcome.cpp +++ b/ui/qt/main_welcome.cpp @@ -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;" diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index 3037468771..a5ccd1f8e6 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -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,11 +54,24 @@ <item> <widget class="QLabel" name="mainWelcomeBanner"> <property name="text"> - <string>Welcome to Wireshark.</string> + <string><html><head/><body><p><span style=" font-size:large;">Welcome to Wireshark</span></p></body></html></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"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |