diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-16 11:15:40 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-16 11:15:41 +0100 |
commit | bb3c75bdf48cf04f97fa84f494f7366fac99e379 (patch) | |
tree | 5296d36bb6221baf8ec222e102afdd9d8dcbbe60 /src/qt/networkstyle.h | |
parent | f3af0c898f1ba280761101844c4694c7427f304a (diff) | |
parent | ac23394ea8118fe50131513bcd68c822a7ac4095 (diff) | |
download | bitcoin-bb3c75bdf48cf04f97fa84f494f7366fac99e379.tar.xz |
Merge pull request #5228
ac23394 resize tray icon because a 1024x1024 icon won't show in ubuntu (bug) (Jonas Schnelli)
8e76ca0 Qt: Go back to using QIcon functionality for scaling (Wladimir J. van der Laan)
54f2571 Qt: HiDPI (retina) support for splash screen (Jonas Schnelli)
Diffstat (limited to 'src/qt/networkstyle.h')
-rw-r--r-- | src/qt/networkstyle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index e49b86c950..953004c127 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -18,16 +18,16 @@ public: const QString &getAppName() const { return appName; } const QIcon &getAppIcon() const { return appIcon; } + const QIcon &getTrayAndWindowIcon() const { return trayAndWindowIcon; } const QString &getTitleAddText() const { return titleAddText; } - const QPixmap &getSplashImage() const { return splashImage; } private: - NetworkStyle(const QString &appName, const QString &appIcon, const char *titleAddText, const QString &splashImage); + NetworkStyle(const QString &appName, const int iconColorHueShift, const int iconColorSaturationReduction, const char *titleAddText); QString appName; QIcon appIcon; + QIcon trayAndWindowIcon; QString titleAddText; - QPixmap splashImage; }; #endif // BITCOIN_QT_NETWORKSTYLE_H |