diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 70882e6d5..efcbab811 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -146,15 +146,15 @@ struct BuiltInDc { }; static const BuiltInDc _builtInDcs[] = { - { 1, "149.154.175.50", 443 }, - { 2, "149.154.167.51", 443 }, - { 3, "174.140.142.6", 443 }, - { 4, "149.154.167.91", 443 }, - { 5, "149.154.171.5", 443 } + { 1, "149.154.175.50", 443 }, + { 2, "149.154.167.51", 443 }, + { 3, "174.140.142.6", 443 }, + { 4, "149.154.167.91", 443 }, + { 5, "149.154.171.5", 443 } }; static const BuiltInDc _builtInTestDcs[] = { - { 1, "173.240.5.253", 443 } + { 1, "173.240.5.253", 443 } }; inline const BuiltInDc *builtInDcs() { diff --git a/Telegram/SourceFiles/pspecific_linux.cpp b/Telegram/SourceFiles/pspecific_linux.cpp index 850a36254..a8b7a1e57 100644 --- a/Telegram/SourceFiles/pspecific_linux.cpp +++ b/Telegram/SourceFiles/pspecific_linux.cpp @@ -50,7 +50,7 @@ namespace { }; PsMainWindow::PsMainWindow(QWidget *parent) : QMainWindow(parent), -posInited(false), trayIcon(0), trayIconMenu(0), icon256(qsl(":/gui/art/icon256.png")), wndIcon(QPixmap::fromImage(icon256)) { +posInited(false), trayIcon(0), trayIconMenu(0), icon256(qsl(":/gui/art/icon256.png")), iconbig256(icon256), wndIcon(QPixmap::fromImage(icon256)) { connect(&psIdleTimer, SIGNAL(timeout()), this, SLOT(psIdleTimeout())); psIdleTimer.setSingleShot(false); } diff --git a/Telegram/SourceFiles/pspecific_linux.h b/Telegram/SourceFiles/pspecific_linux.h index 9f96c74ec..af64d15b2 100644 --- a/Telegram/SourceFiles/pspecific_linux.h +++ b/Telegram/SourceFiles/pspecific_linux.h @@ -87,7 +87,7 @@ protected: bool posInited; QSystemTrayIcon *trayIcon; QMenu *trayIconMenu; - QImage icon256; + QImage icon256, iconbig256; QIcon wndIcon; virtual void setupTrayIcon() = 0; diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp index 3cfbd7150..547bad9d7 100644 --- a/Telegram/SourceFiles/pspecific_mac.cpp +++ b/Telegram/SourceFiles/pspecific_mac.cpp @@ -71,7 +71,7 @@ void MacPrivate::notifyReplied(unsigned long long peer, const char *str) { } PsMainWindow::PsMainWindow(QWidget *parent) : QMainWindow(parent), -posInited(false), trayIcon(0), trayIconMenu(0), icon256(qsl(":/gui/art/icon256.png")), wndIcon(QPixmap(qsl(":/gui/art/iconbig256.png"))), +posInited(false), trayIcon(0), trayIconMenu(0), icon256(qsl(":/gui/art/icon256.png")), iconbig256(qsl(":/gui/art/iconbig256.png")), wndIcon(QPixmap::fromImage(iconbig256)), psLogout(0), psUndo(0), psRedo(0), psCut(0), psCopy(0), psPaste(0), psDelete(0), psSelectAll(0), psContacts(0), psAddContact(0), psNewGroup(0), psShowTelegram(0) { QImage tray(qsl(":/gui/art/osxtray.png")); trayImg = tray.copy(0, cRetina() ? 0 : tray.width() / 2, tray.width() / (cRetina() ? 2 : 4), tray.width() / (cRetina() ? 2 : 4)); diff --git a/Telegram/SourceFiles/pspecific_mac.h b/Telegram/SourceFiles/pspecific_mac.h index 3dea453b1..8bfaa4f2c 100644 --- a/Telegram/SourceFiles/pspecific_mac.h +++ b/Telegram/SourceFiles/pspecific_mac.h @@ -111,7 +111,7 @@ protected: bool posInited; QSystemTrayIcon *trayIcon; QMenu *trayIconMenu; - QImage icon256; + QImage icon256, iconbig256; QIcon wndIcon; QImage trayImg, trayImgSel; diff --git a/Telegram/SourceFiles/pspecific_wnd.cpp b/Telegram/SourceFiles/pspecific_wnd.cpp index 35287abec..cdfc3857e 100644 --- a/Telegram/SourceFiles/pspecific_wnd.cpp +++ b/Telegram/SourceFiles/pspecific_wnd.cpp @@ -860,7 +860,7 @@ namespace { }; -PsMainWindow::PsMainWindow(QWidget *parent) : QMainWindow(parent), ps_hWnd(0), ps_menu(0), icon256(qsl(":/gui/art/icon256.png")), wndIcon(QPixmap::fromImage(icon256)), +PsMainWindow::PsMainWindow(QWidget *parent) : QMainWindow(parent), ps_hWnd(0), ps_menu(0), icon256(qsl(":/gui/art/icon256.png")), iconbig256(qsl(":/gui/art/iconbig256.png")), wndIcon(QPixmap::fromImage(icon256)), ps_iconBig(0), ps_iconSmall(0), ps_iconOverlay(0), trayIcon(0), trayIconMenu(0), posInited(false), ps_tbHider_hWnd(createTaskbarHider()), psIdle(false) { tbCreatedMsgId = RegisterWindowMessage(L"TaskbarButtonCreated"); connect(&psIdleTimer, SIGNAL(timeout()), this, SLOT(psIdleTimeout())); diff --git a/Telegram/SourceFiles/pspecific_wnd.h b/Telegram/SourceFiles/pspecific_wnd.h index 1384fc9c8..5a8e97c1a 100644 --- a/Telegram/SourceFiles/pspecific_wnd.h +++ b/Telegram/SourceFiles/pspecific_wnd.h @@ -86,7 +86,7 @@ protected: bool posInited; QSystemTrayIcon *trayIcon; ContextMenu *trayIconMenu; - QImage icon256; + QImage icon256, iconbig256; QIcon wndIcon; virtual void setupTrayIcon() = 0; diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp index 0f8776723..ed8f1f244 100644 --- a/Telegram/SourceFiles/window.cpp +++ b/Telegram/SourceFiles/window.cpp @@ -336,6 +336,9 @@ _connecting(0), _clearManager(0), dragging(false), _inactivePress(false), _media icon16 = icon256.scaledToWidth(16, Qt::SmoothTransformation); icon32 = icon256.scaledToWidth(32, Qt::SmoothTransformation); icon64 = icon256.scaledToWidth(64, Qt::SmoothTransformation); + iconbig16 = iconbig256.scaledToWidth(16, Qt::SmoothTransformation); + iconbig32 = iconbig256.scaledToWidth(32, Qt::SmoothTransformation); + iconbig64 = iconbig256.scaledToWidth(64, Qt::SmoothTransformation); if (objectName().isEmpty()) { setObjectName(qsl("MainWindow")); @@ -1298,7 +1301,7 @@ void Window::notifyActivateAll() { } QImage Window::iconLarge() const { - return icon256; + return iconbig256; } void Window::placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color) { @@ -1389,7 +1392,7 @@ QImage Window::iconWithCounter(int size, int count, style::color bg, bool smallI if (size != 16 && size != 32) size = 64; } - QImage img((size == 16) ? icon16 : (size == 32 ? icon32 : icon64)); + QImage img(smallIcon ? ((size == 16) ? iconbig16 : (size == 32 ? iconbig32 : iconbig64)) : ((size == 16) ? icon16 : (size == 32 ? icon32 : icon64))); if (!count) return img; if (smallIcon) { diff --git a/Telegram/SourceFiles/window.h b/Telegram/SourceFiles/window.h index ae87e98a3..34ccf3340 100644 --- a/Telegram/SourceFiles/window.h +++ b/Telegram/SourceFiles/window.h @@ -261,7 +261,7 @@ private: void placeSmallCounter(QImage &img, int size, int count, style::color bg, const QPoint &shift, style::color color); QImage iconWithCounter(int size, int count, style::color bg, bool smallIcon); - QImage icon16, icon32, icon64; + QImage icon16, icon32, icon64, iconbig16, iconbig32, iconbig64; QWidget *centralwidget;