osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Gerald Combs 2017-08-03 08:39:13 -07:00 committed by Anders Broman
parent ce7b994383
commit f155beb094
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui/qt/main_welcome.cpp
View File

@ -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;"
"}"
#if !defined(Q_OS_WIN)
"QAbstractItemView:item:hover {"
" background-color: %1;"
" color: palette(text);"
"}"
#endif
)
.arg(hover_color.name())
);
QString welcome_ss = QString(
"MainWelcome {"
" padding: 1em;"
" }"
"MainWelcome, QAbstractItemView {"
" background-color: palette(base);"
" color: palette(text);"
" }"
"QAbstractItemView {"
" border: 0;"
"}"
);
#if !defined(Q_OS_WIN)
welcome_ss += QString(
"QAbstractItemView:item:hover {"
" background-color: %1;"
" color: palette(text);"
"}"
)
.arg(hover_color.name());
#endif
setStyleSheet(welcome_ss);
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 {"