diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-08-03 08:39:13 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-04 05:56:18 +0000 |
| commit | f155beb0946391ea633936647b4c68998ecf01bb (patch) | |
| tree | 246e0247f9c53feb046af045eb89b2b6240d79bc /ui | |
| parent | ce7b994383a8089e7c05b7c88132fe78de9a1be9 (diff) | |
Qt: Fixup the welcome screen stylesheet.
Pass in a QString argument only when we have a placeholder. Fixes a
QString::arg: Argument missing: MainWelcome { ...
warning on Windows.
Change-Id: I42dd155252bd9fd4f21f0112b62044c7397c9810
Reviewed-on: https://code.wireshark.org/review/22934
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_welcome.cpp | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp index 0da1105e41..30c13f656e 100644 --- a/ui/qt/main_welcome.cpp +++ b/ui/qt/main_welcome.cpp @@ -79,28 +79,30 @@ MainWelcome::MainWelcome(QWidget *parent) : QColor hover_color = ColorUtils::alphaBlend(palette().window(), palette().highlight(), 0.5); - setStyleSheet(QString( - "MainWelcome {" - " padding: 1em;" - " }" - "MainWelcome, QAbstractItemView {" - " background-color: palette(base);" - " color: palette(text);" - " }" - "QAbstractItemView {" - " border: 0;" - "}" + QString welcome_ss = QString( + "MainWelcome {" + " padding: 1em;" + " }" + "MainWelcome, QAbstractItemView {" + " background-color: palette(base);" + " color: palette(text);" + " }" + "QAbstractItemView {" + " border: 0;" + "}" + ); #if !defined(Q_OS_WIN) - "QAbstractItemView:item:hover {" - " background-color: %1;" - " color: palette(text);" - "}" + welcome_ss += QString( + "QAbstractItemView:item:hover {" + " background-color: %1;" + " color: palette(text);" + "}" + ) + .arg(hover_color.name()); #endif - ) - .arg(hover_color.name()) - ); + setStyleSheet(welcome_ss); - QString welcome_ss = QString( + QString banner_ss = QString( "QLabel {" " border-radius: 0.33em;" " color: %1;" @@ -110,7 +112,7 @@ MainWelcome::MainWelcome(QWidget *parent) : ) .arg(QColor(tango_aluminium_6).name()) // Text color .arg(QColor(tango_sky_blue_2).name()); // Background color - welcome_ui_->mainWelcomeBanner->setStyleSheet(welcome_ss); + welcome_ui_->mainWelcomeBanner->setStyleSheet(banner_ss); QString title_button_ss = QString( "QLabel {" |