diff --git a/Telegram/SourceFiles/art/icon128.png b/Telegram/SourceFiles/art/icon128.png index 103c5c910..bc337cb5a 100644 Binary files a/Telegram/SourceFiles/art/icon128.png and b/Telegram/SourceFiles/art/icon128.png differ diff --git a/Telegram/SourceFiles/art/icon128@2x.png b/Telegram/SourceFiles/art/icon128@2x.png index 6e09c29dd..8ca330aeb 100644 Binary files a/Telegram/SourceFiles/art/icon128@2x.png and b/Telegram/SourceFiles/art/icon128@2x.png differ diff --git a/Telegram/SourceFiles/art/icon16.png b/Telegram/SourceFiles/art/icon16.png index c15f5a9da..d8c95f007 100644 Binary files a/Telegram/SourceFiles/art/icon16.png and b/Telegram/SourceFiles/art/icon16.png differ diff --git a/Telegram/SourceFiles/art/icon16@2x.png b/Telegram/SourceFiles/art/icon16@2x.png index 214be0fbd..7281f6412 100644 Binary files a/Telegram/SourceFiles/art/icon16@2x.png and b/Telegram/SourceFiles/art/icon16@2x.png differ diff --git a/Telegram/SourceFiles/art/icon256.ico b/Telegram/SourceFiles/art/icon256.ico index 33cf4ea80..51e896e63 100644 Binary files a/Telegram/SourceFiles/art/icon256.ico and b/Telegram/SourceFiles/art/icon256.ico differ diff --git a/Telegram/SourceFiles/art/icon256.png b/Telegram/SourceFiles/art/icon256.png index 6e09c29dd..88b743257 100644 Binary files a/Telegram/SourceFiles/art/icon256.png and b/Telegram/SourceFiles/art/icon256.png differ diff --git a/Telegram/SourceFiles/art/icon256@2x.png b/Telegram/SourceFiles/art/icon256@2x.png index 019795054..59b2dce23 100644 Binary files a/Telegram/SourceFiles/art/icon256@2x.png and b/Telegram/SourceFiles/art/icon256@2x.png differ diff --git a/Telegram/SourceFiles/art/icon32.ico b/Telegram/SourceFiles/art/icon32.ico deleted file mode 100644 index a7acfad16..000000000 Binary files a/Telegram/SourceFiles/art/icon32.ico and /dev/null differ diff --git a/Telegram/SourceFiles/art/icon32.png b/Telegram/SourceFiles/art/icon32.png index 214be0fbd..c40bb6b9d 100644 Binary files a/Telegram/SourceFiles/art/icon32.png and b/Telegram/SourceFiles/art/icon32.png differ diff --git a/Telegram/SourceFiles/art/icon32@2x.png b/Telegram/SourceFiles/art/icon32@2x.png index eae1706f3..0f5e77715 100644 Binary files a/Telegram/SourceFiles/art/icon32@2x.png and b/Telegram/SourceFiles/art/icon32@2x.png differ diff --git a/Telegram/SourceFiles/art/icon48.png b/Telegram/SourceFiles/art/icon48.png index 74e2d0cc0..360347222 100644 Binary files a/Telegram/SourceFiles/art/icon48.png and b/Telegram/SourceFiles/art/icon48.png differ diff --git a/Telegram/SourceFiles/art/icon48@2x.png b/Telegram/SourceFiles/art/icon48@2x.png index 40dc0000e..06591cca7 100644 Binary files a/Telegram/SourceFiles/art/icon48@2x.png and b/Telegram/SourceFiles/art/icon48@2x.png differ diff --git a/Telegram/SourceFiles/art/icon512.png b/Telegram/SourceFiles/art/icon512.png index 019795054..daa293ba2 100644 Binary files a/Telegram/SourceFiles/art/icon512.png and b/Telegram/SourceFiles/art/icon512.png differ diff --git a/Telegram/SourceFiles/art/icon512@2x.png b/Telegram/SourceFiles/art/icon512@2x.png index 0972bff34..28455ade1 100644 Binary files a/Telegram/SourceFiles/art/icon512@2x.png and b/Telegram/SourceFiles/art/icon512@2x.png differ diff --git a/Telegram/SourceFiles/art/icon64.png b/Telegram/SourceFiles/art/icon64.png index eae1706f3..6e2f53592 100644 Binary files a/Telegram/SourceFiles/art/icon64.png and b/Telegram/SourceFiles/art/icon64.png differ diff --git a/Telegram/SourceFiles/art/icon64@2x.png b/Telegram/SourceFiles/art/icon64@2x.png index 103c5c910..cd41f0a35 100644 Binary files a/Telegram/SourceFiles/art/icon64@2x.png and b/Telegram/SourceFiles/art/icon64@2x.png differ diff --git a/Telegram/SourceFiles/art/icon_green.png b/Telegram/SourceFiles/art/icon_green.png new file mode 100644 index 000000000..9b214e0df Binary files /dev/null and b/Telegram/SourceFiles/art/icon_green.png differ diff --git a/Telegram/SourceFiles/art/iconbig256.png b/Telegram/SourceFiles/art/iconbig256.png new file mode 100644 index 000000000..1f1313834 Binary files /dev/null and b/Telegram/SourceFiles/art/iconbig256.png differ diff --git a/Telegram/SourceFiles/art/iconbig_green.png b/Telegram/SourceFiles/art/iconbig_green.png new file mode 100644 index 000000000..a14b88e32 Binary files /dev/null and b/Telegram/SourceFiles/art/iconbig_green.png differ diff --git a/Telegram/SourceFiles/pspecific_mac.cpp b/Telegram/SourceFiles/pspecific_mac.cpp index b887166e2..3cfbd7150 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/icon256.png"))), +posInited(false), trayIcon(0), trayIconMenu(0), icon256(qsl(":/gui/art/icon256.png")), wndIcon(QPixmap(qsl(":/gui/art/iconbig256.png"))), 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/telegram.qrc b/Telegram/SourceFiles/telegram.qrc index f31cda881..5762dc7d8 100644 --- a/Telegram/SourceFiles/telegram.qrc +++ b/Telegram/SourceFiles/telegram.qrc @@ -18,6 +18,7 @@ art/emoji_200x.png art/blank.gif art/icon256.png + art/iconbig256.png art/fonts/DejaVuSans.ttf art/osxtray.png diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png index 103c5c910..bc337cb5a 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 941bbe0f0..8ca330aeb 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png index c15f5a9da..d8c95f007 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png index a4c14b60c..7281f6412 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png index 6e09c29dd..88b743257 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png index c45893b93..59b2dce23 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png index 214be0fbd..c40bb6b9d 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png index 4511a59e8..0f5e77715 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png index 019795054..daa293ba2 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png index 2a681dea4..28455ade1 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png index 103c5c910..bc337cb5a 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png index 941bbe0f0..8ca330aeb 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png index c15f5a9da..d8c95f007 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png index a4c14b60c..7281f6412 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png index 6e09c29dd..88b743257 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png index c45893b93..59b2dce23 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png index 214be0fbd..c40bb6b9d 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png index 4511a59e8..0f5e77715 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png index 019795054..daa293ba2 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png index 2a681dea4..28455ade1 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png differ