Browse Source

resize tray icon because a 1024x1024 icon won't show in ubuntu (bug)

pull/1/head
Jonas Schnelli 8 years ago committed by Wladimir J. van der Laan
parent
commit
ac23394ea8
  1. 6
      src/qt/bitcoingui.cpp
  2. 3
      src/qt/networkstyle.cpp
  3. 2
      src/qt/networkstyle.h

6
src/qt/bitcoingui.cpp

@ -115,8 +115,8 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) : @@ -115,8 +115,8 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
}
windowTitle += " " + networkStyle->getTitleAddText();
#ifndef Q_OS_MAC
QApplication::setWindowIcon(networkStyle->getAppIcon());
setWindowIcon(networkStyle->getAppIcon());
QApplication::setWindowIcon(networkStyle->getTrayAndWindowIcon());
setWindowIcon(networkStyle->getTrayAndWindowIcon());
#else
MacDockIconHandler::instance()->setIcon(networkStyle->getAppIcon());
#endif
@ -491,7 +491,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle) @@ -491,7 +491,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle)
trayIcon = new QSystemTrayIcon(this);
QString toolTip = tr("Bitcoin Core client") + " " + networkStyle->getTitleAddText();
trayIcon->setToolTip(toolTip);
trayIcon->setIcon(networkStyle->getAppIcon());
trayIcon->setIcon(networkStyle->getTrayAndWindowIcon());
trayIcon->show();
#endif

3
src/qt/networkstyle.cpp

@ -71,7 +71,8 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift, @@ -71,7 +71,8 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift,
pixmap.convertFromImage(img);
}
appIcon = QIcon(pixmap);
appIcon = QIcon(pixmap);
trayAndWindowIcon = QIcon(pixmap.scaled(QSize(256,256)));
}
const NetworkStyle *NetworkStyle::instantiate(const QString &networkId)

2
src/qt/networkstyle.h

@ -18,6 +18,7 @@ public: @@ -18,6 +18,7 @@ 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; }
private:
@ -25,6 +26,7 @@ private: @@ -25,6 +26,7 @@ private:
QString appName;
QIcon appIcon;
QIcon trayAndWindowIcon;
QString titleAddText;
};

Loading…
Cancel
Save