diff --git a/.gitignore b/.gitignore index a155d81c7..49c8fc4d5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,12 @@ /Telegram/SourceFiles/art/grid_200x.png /Telegram/SourceFiles/art/sprite_125x.png /Telegram/SourceFiles/art/sprite_150x.png +/Telegram/Resources/art/grid.png +/Telegram/Resources/art/grid_125x.png +/Telegram/Resources/art/grid_150x.png +/Telegram/Resources/art/grid_200x.png +/Telegram/Resources/art/sprite_125x.png +/Telegram/Resources/art/sprite_150x.png /Telegram/*.user *.vcxproj.user *.suo diff --git a/Telegram/SourceFiles/art/bg.jpg b/Telegram/Resources/art/bg.jpg similarity index 100% rename from Telegram/SourceFiles/art/bg.jpg rename to Telegram/Resources/art/bg.jpg diff --git a/Telegram/SourceFiles/art/bg0.png b/Telegram/Resources/art/bg0.png similarity index 100% rename from Telegram/SourceFiles/art/bg0.png rename to Telegram/Resources/art/bg0.png diff --git a/Telegram/SourceFiles/art/blank.gif b/Telegram/Resources/art/blank.gif similarity index 100% rename from Telegram/SourceFiles/art/blank.gif rename to Telegram/Resources/art/blank.gif diff --git a/Telegram/SourceFiles/art/channelcolor1.png b/Telegram/Resources/art/channelcolor1.png similarity index 100% rename from Telegram/SourceFiles/art/channelcolor1.png rename to Telegram/Resources/art/channelcolor1.png diff --git a/Telegram/SourceFiles/art/channelcolor2.png b/Telegram/Resources/art/channelcolor2.png similarity index 100% rename from Telegram/SourceFiles/art/channelcolor2.png rename to Telegram/Resources/art/channelcolor2.png diff --git a/Telegram/SourceFiles/art/channelcolor3.png b/Telegram/Resources/art/channelcolor3.png similarity index 100% rename from Telegram/SourceFiles/art/channelcolor3.png rename to Telegram/Resources/art/channelcolor3.png diff --git a/Telegram/SourceFiles/art/channelcolor4.png b/Telegram/Resources/art/channelcolor4.png similarity index 100% rename from Telegram/SourceFiles/art/channelcolor4.png rename to Telegram/Resources/art/channelcolor4.png diff --git a/Telegram/SourceFiles/art/chatcolor1.png b/Telegram/Resources/art/chatcolor1.png similarity index 100% rename from Telegram/SourceFiles/art/chatcolor1.png rename to Telegram/Resources/art/chatcolor1.png diff --git a/Telegram/SourceFiles/art/chatcolor2.png b/Telegram/Resources/art/chatcolor2.png similarity index 100% rename from Telegram/SourceFiles/art/chatcolor2.png rename to Telegram/Resources/art/chatcolor2.png diff --git a/Telegram/SourceFiles/art/chatcolor3.png b/Telegram/Resources/art/chatcolor3.png similarity index 100% rename from Telegram/SourceFiles/art/chatcolor3.png rename to Telegram/Resources/art/chatcolor3.png diff --git a/Telegram/SourceFiles/art/chatcolor4.png b/Telegram/Resources/art/chatcolor4.png similarity index 100% rename from Telegram/SourceFiles/art/chatcolor4.png rename to Telegram/Resources/art/chatcolor4.png diff --git a/Telegram/SourceFiles/art/emoji.webp b/Telegram/Resources/art/emoji.webp similarity index 100% rename from Telegram/SourceFiles/art/emoji.webp rename to Telegram/Resources/art/emoji.webp diff --git a/Telegram/SourceFiles/art/emoji_125x.webp b/Telegram/Resources/art/emoji_125x.webp similarity index 100% rename from Telegram/SourceFiles/art/emoji_125x.webp rename to Telegram/Resources/art/emoji_125x.webp diff --git a/Telegram/SourceFiles/art/emoji_150x.webp b/Telegram/Resources/art/emoji_150x.webp similarity index 100% rename from Telegram/SourceFiles/art/emoji_150x.webp rename to Telegram/Resources/art/emoji_150x.webp diff --git a/Telegram/SourceFiles/art/emoji_200x.webp b/Telegram/Resources/art/emoji_200x.webp similarity index 100% rename from Telegram/SourceFiles/art/emoji_200x.webp rename to Telegram/Resources/art/emoji_200x.webp diff --git a/Telegram/SourceFiles/art/emoji_250x.webp b/Telegram/Resources/art/emoji_250x.webp similarity index 100% rename from Telegram/SourceFiles/art/emoji_250x.webp rename to Telegram/Resources/art/emoji_250x.webp diff --git a/Telegram/SourceFiles/art/favicon.ico b/Telegram/Resources/art/favicon.ico similarity index 100% rename from Telegram/SourceFiles/art/favicon.ico rename to Telegram/Resources/art/favicon.ico diff --git a/Telegram/SourceFiles/art/fonts/OpenSans-Bold.ttf b/Telegram/Resources/art/fonts/OpenSans-Bold.ttf similarity index 100% rename from Telegram/SourceFiles/art/fonts/OpenSans-Bold.ttf rename to Telegram/Resources/art/fonts/OpenSans-Bold.ttf diff --git a/Telegram/SourceFiles/art/fonts/OpenSans-Regular.ttf b/Telegram/Resources/art/fonts/OpenSans-Regular.ttf similarity index 100% rename from Telegram/SourceFiles/art/fonts/OpenSans-Regular.ttf rename to Telegram/Resources/art/fonts/OpenSans-Regular.ttf diff --git a/Telegram/SourceFiles/art/fonts/OpenSans-Semibold.ttf b/Telegram/Resources/art/fonts/OpenSans-Semibold.ttf similarity index 100% rename from Telegram/SourceFiles/art/fonts/OpenSans-Semibold.ttf rename to Telegram/Resources/art/fonts/OpenSans-Semibold.ttf diff --git a/Telegram/SourceFiles/art/icon128.png b/Telegram/Resources/art/icon128.png similarity index 100% rename from Telegram/SourceFiles/art/icon128.png rename to Telegram/Resources/art/icon128.png diff --git a/Telegram/SourceFiles/art/icon128@2x.png b/Telegram/Resources/art/icon128@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon128@2x.png rename to Telegram/Resources/art/icon128@2x.png diff --git a/Telegram/SourceFiles/art/icon16.png b/Telegram/Resources/art/icon16.png similarity index 100% rename from Telegram/SourceFiles/art/icon16.png rename to Telegram/Resources/art/icon16.png diff --git a/Telegram/SourceFiles/art/icon16@2x.png b/Telegram/Resources/art/icon16@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon16@2x.png rename to Telegram/Resources/art/icon16@2x.png diff --git a/Telegram/SourceFiles/art/icon256.ico b/Telegram/Resources/art/icon256.ico similarity index 100% rename from Telegram/SourceFiles/art/icon256.ico rename to Telegram/Resources/art/icon256.ico diff --git a/Telegram/SourceFiles/art/icon256.png b/Telegram/Resources/art/icon256.png similarity index 100% rename from Telegram/SourceFiles/art/icon256.png rename to Telegram/Resources/art/icon256.png diff --git a/Telegram/SourceFiles/art/icon256@2x.png b/Telegram/Resources/art/icon256@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon256@2x.png rename to Telegram/Resources/art/icon256@2x.png diff --git a/Telegram/SourceFiles/art/icon32.png b/Telegram/Resources/art/icon32.png similarity index 100% rename from Telegram/SourceFiles/art/icon32.png rename to Telegram/Resources/art/icon32.png diff --git a/Telegram/SourceFiles/art/icon32@2x.png b/Telegram/Resources/art/icon32@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon32@2x.png rename to Telegram/Resources/art/icon32@2x.png diff --git a/Telegram/SourceFiles/art/icon48.png b/Telegram/Resources/art/icon48.png similarity index 100% rename from Telegram/SourceFiles/art/icon48.png rename to Telegram/Resources/art/icon48.png diff --git a/Telegram/SourceFiles/art/icon48@2x.png b/Telegram/Resources/art/icon48@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon48@2x.png rename to Telegram/Resources/art/icon48@2x.png diff --git a/Telegram/SourceFiles/art/icon512.png b/Telegram/Resources/art/icon512.png similarity index 100% rename from Telegram/SourceFiles/art/icon512.png rename to Telegram/Resources/art/icon512.png diff --git a/Telegram/SourceFiles/art/icon512@2x.png b/Telegram/Resources/art/icon512@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon512@2x.png rename to Telegram/Resources/art/icon512@2x.png diff --git a/Telegram/SourceFiles/art/icon64.png b/Telegram/Resources/art/icon64.png similarity index 100% rename from Telegram/SourceFiles/art/icon64.png rename to Telegram/Resources/art/icon64.png diff --git a/Telegram/SourceFiles/art/icon64@2x.png b/Telegram/Resources/art/icon64@2x.png similarity index 100% rename from Telegram/SourceFiles/art/icon64@2x.png rename to Telegram/Resources/art/icon64@2x.png diff --git a/Telegram/SourceFiles/art/icon_green.png b/Telegram/Resources/art/icon_green.png similarity index 100% rename from Telegram/SourceFiles/art/icon_green.png rename to Telegram/Resources/art/icon_green.png diff --git a/Telegram/SourceFiles/art/iconbig256.png b/Telegram/Resources/art/iconbig256.png similarity index 100% rename from Telegram/SourceFiles/art/iconbig256.png rename to Telegram/Resources/art/iconbig256.png diff --git a/Telegram/SourceFiles/art/iconbig_green.png b/Telegram/Resources/art/iconbig_green.png similarity index 100% rename from Telegram/SourceFiles/art/iconbig_green.png rename to Telegram/Resources/art/iconbig_green.png diff --git a/Telegram/SourceFiles/art/newmsg.wav b/Telegram/Resources/art/newmsg.wav similarity index 100% rename from Telegram/SourceFiles/art/newmsg.wav rename to Telegram/Resources/art/newmsg.wav diff --git a/Telegram/SourceFiles/art/osxsetup.tif b/Telegram/Resources/art/osxsetup.tif similarity index 100% rename from Telegram/SourceFiles/art/osxsetup.tif rename to Telegram/Resources/art/osxsetup.tif diff --git a/Telegram/SourceFiles/art/osxsetup.tiff b/Telegram/Resources/art/osxsetup.tiff similarity index 100% rename from Telegram/SourceFiles/art/osxsetup.tiff rename to Telegram/Resources/art/osxsetup.tiff diff --git a/Telegram/SourceFiles/art/osxsetup@2x.tif b/Telegram/Resources/art/osxsetup@2x.tif similarity index 100% rename from Telegram/SourceFiles/art/osxsetup@2x.tif rename to Telegram/Resources/art/osxsetup@2x.tif diff --git a/Telegram/SourceFiles/art/osxtray.png b/Telegram/Resources/art/osxtray.png similarity index 100% rename from Telegram/SourceFiles/art/osxtray.png rename to Telegram/Resources/art/osxtray.png diff --git a/Telegram/SourceFiles/art/sprite.png b/Telegram/Resources/art/sprite.png similarity index 100% rename from Telegram/SourceFiles/art/sprite.png rename to Telegram/Resources/art/sprite.png diff --git a/Telegram/SourceFiles/art/sprite_200x.png b/Telegram/Resources/art/sprite_200x.png similarity index 100% rename from Telegram/SourceFiles/art/sprite_200x.png rename to Telegram/Resources/art/sprite_200x.png diff --git a/Telegram/SourceFiles/art/usercolor1.png b/Telegram/Resources/art/usercolor1.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor1.png rename to Telegram/Resources/art/usercolor1.png diff --git a/Telegram/SourceFiles/art/usercolor2.png b/Telegram/Resources/art/usercolor2.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor2.png rename to Telegram/Resources/art/usercolor2.png diff --git a/Telegram/SourceFiles/art/usercolor3.png b/Telegram/Resources/art/usercolor3.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor3.png rename to Telegram/Resources/art/usercolor3.png diff --git a/Telegram/SourceFiles/art/usercolor4.png b/Telegram/Resources/art/usercolor4.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor4.png rename to Telegram/Resources/art/usercolor4.png diff --git a/Telegram/SourceFiles/art/usercolor5.png b/Telegram/Resources/art/usercolor5.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor5.png rename to Telegram/Resources/art/usercolor5.png diff --git a/Telegram/SourceFiles/art/usercolor6.png b/Telegram/Resources/art/usercolor6.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor6.png rename to Telegram/Resources/art/usercolor6.png diff --git a/Telegram/SourceFiles/art/usercolor7.png b/Telegram/Resources/art/usercolor7.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor7.png rename to Telegram/Resources/art/usercolor7.png diff --git a/Telegram/SourceFiles/art/usercolor8.png b/Telegram/Resources/art/usercolor8.png similarity index 100% rename from Telegram/SourceFiles/art/usercolor8.png rename to Telegram/Resources/art/usercolor8.png diff --git a/Telegram/SourceFiles/etc/qt_linux.conf b/Telegram/Resources/etc/qt_linux.conf similarity index 100% rename from Telegram/SourceFiles/etc/qt_linux.conf rename to Telegram/Resources/etc/qt_linux.conf diff --git a/Telegram/SourceFiles/etc/qt_win.conf b/Telegram/Resources/etc/qt_win.conf similarity index 100% rename from Telegram/SourceFiles/etc/qt_win.conf rename to Telegram/Resources/etc/qt_win.conf diff --git a/Telegram/SourceFiles/langs/lang_de.strings b/Telegram/Resources/langs/lang_de.strings similarity index 100% rename from Telegram/SourceFiles/langs/lang_de.strings rename to Telegram/Resources/langs/lang_de.strings diff --git a/Telegram/SourceFiles/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings similarity index 100% rename from Telegram/SourceFiles/langs/lang_es.strings rename to Telegram/Resources/langs/lang_es.strings diff --git a/Telegram/SourceFiles/langs/lang_it.strings b/Telegram/Resources/langs/lang_it.strings similarity index 100% rename from Telegram/SourceFiles/langs/lang_it.strings rename to Telegram/Resources/langs/lang_it.strings diff --git a/Telegram/SourceFiles/langs/lang_ko.strings b/Telegram/Resources/langs/lang_ko.strings similarity index 100% rename from Telegram/SourceFiles/langs/lang_ko.strings rename to Telegram/Resources/langs/lang_ko.strings diff --git a/Telegram/SourceFiles/langs/lang_nl.strings b/Telegram/Resources/langs/lang_nl.strings similarity index 100% rename from Telegram/SourceFiles/langs/lang_nl.strings rename to Telegram/Resources/langs/lang_nl.strings diff --git a/Telegram/SourceFiles/langs/lang_pt_BR.strings b/Telegram/Resources/langs/lang_pt_BR.strings similarity index 100% rename from Telegram/SourceFiles/langs/lang_pt_BR.strings rename to Telegram/Resources/langs/lang_pt_BR.strings diff --git a/Telegram/SourceFiles/qmime/freedesktop.org.xml b/Telegram/Resources/qmime/freedesktop.org.xml similarity index 100% rename from Telegram/SourceFiles/qmime/freedesktop.org.xml rename to Telegram/Resources/qmime/freedesktop.org.xml diff --git a/Telegram/SourceFiles/telegram.qrc b/Telegram/Resources/telegram.qrc similarity index 100% rename from Telegram/SourceFiles/telegram.qrc rename to Telegram/Resources/telegram.qrc diff --git a/Telegram/SourceFiles/telegram_emojis.qrc b/Telegram/Resources/telegram_emojis.qrc similarity index 100% rename from Telegram/SourceFiles/telegram_emojis.qrc rename to Telegram/Resources/telegram_emojis.qrc diff --git a/Telegram/SourceFiles/telegram_linux.qrc b/Telegram/Resources/telegram_linux.qrc similarity index 100% rename from Telegram/SourceFiles/telegram_linux.qrc rename to Telegram/Resources/telegram_linux.qrc diff --git a/Telegram/SourceFiles/telegram_mac.qrc b/Telegram/Resources/telegram_mac.qrc similarity index 100% rename from Telegram/SourceFiles/telegram_mac.qrc rename to Telegram/Resources/telegram_mac.qrc diff --git a/Telegram/SourceFiles/telegram_wnd.qrc b/Telegram/Resources/telegram_wnd.qrc similarity index 100% rename from Telegram/SourceFiles/telegram_wnd.qrc rename to Telegram/Resources/telegram_wnd.qrc diff --git a/Telegram/SourceFiles/Telegram.plist b/Telegram/SourceFiles/Telegram.plist deleted file mode 100644 index d8286c37a..000000000 --- a/Telegram/SourceFiles/Telegram.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - NSPrincipalClass - NSApplication - CFBundleIconFile - - CFBundlePackageType - APPL - CFBundleGetInfoString - Created by Qt/QMake - CFBundleSignature - ???? - CFBundleExecutable - Telegram - CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:rfc1034identifier} - NOTE - This file was generated by Qt/QMake. - -