RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finished moving resource files to Resources. Fixed avatar render.

This commit is contained in:
John Preston 2016-04-09 17:56:40 +04:00
parent 1045d628d6
commit 8f00650f0e
14 changed files with 147 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Build.bat
View File

@ -56,7 +56,7 @@ if %BetaVersion% neq 0 (
exit /b 1 exit /b 1
) )
) )
cd SourceFiles\ cd Resources\
if "%1" == "fast" ( if "%1" == "fast" (
echo Skipping touching of telegram.qrc.. echo Skipping touching of telegram.qrc..
) else ( ) else (

2
Telegram/Build.sh
View File

@ -192,7 +192,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
DropboxSymbolsPath="./../../../Dropbox/Telegram/symbols" DropboxSymbolsPath="./../../../Dropbox/Telegram/symbols"
if [ "$FastParam" != "fast" ]; then if [ "$FastParam" != "fast" ]; then
touch "./SourceFiles/telegram.qrc" touch "./Resources/telegram.qrc"
fi fi
xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build xcodebuild -project Telegram.xcodeproj -alltargets -configuration Release build

4
Telegram/Setup.iss
View File

@ -25,10 +25,10 @@ DefaultGroupName={#MyAppName}
AllowNoIcons=yes AllowNoIcons=yes
OutputDir=.\..\Win32\Deploy OutputDir=.\..\Win32\Deploy
OutputBaseFilename=tsetup.{#MyAppVersionFull} OutputBaseFilename=tsetup.{#MyAppVersionFull}
SetupIconFile=.\SourceFiles\art\icon256.ico SetupIconFile=.\Resources\art\icon256.ico
UninstallDisplayIcon={app}\Telegram.exe UninstallDisplayIcon={app}\Telegram.exe
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
DisableStartupPrompt=yes DisableStartupPrompt=yes
PrivilegesRequired=lowest PrivilegesRequired=lowest
VersionInfoVersion={#MyAppVersion}.0 VersionInfoVersion={#MyAppVersion}.0

2
Telegram/SourceFiles/_other/memain.cpp
View File

@ -21,7 +21,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "memain.h" #include "memain.h"
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
QString emoji_in("./SourceFiles/art/emojisprite_"), emoji_out("./SourceFiles/gui/emoji_config.cpp"), emoji_png("./SourceFiles/art/emoji"); QString emoji_in("./Resources/art/emojisprite_"), emoji_out("./SourceFiles/gui/emoji_config.cpp"), emoji_png("./Resources/art/emoji");
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
if (string("-emoji_in") == argv[i]) { if (string("-emoji_in") == argv[i]) {
if (++i < argc) emoji_in = argv[i]; if (++i < argc) emoji_in = argv[i];

2
Telegram/SourceFiles/_other/msmain.cpp
View File

@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include <QtCore/QDir> #include <QtCore/QDir>
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
QString classes_in("style_classes.txt"), classes_out("style_classes.h"), styles_in("style.txt"), styles_out("style_auto.h"), path_to_sprites("./SourceFiles/art/"); QString classes_in("style_classes.txt"), classes_out("style_classes.h"), styles_in("style.txt"), styles_out("style_auto.h"), path_to_sprites("./Resources/art/");
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
if (string("-classes_in") == argv[i]) { if (string("-classes_in") == argv[i]) {
if (++i < argc) classes_in = argv[i]; if (++i < argc) classes_in = argv[i];

20
Telegram/SourceFiles/history.cpp
View File

@ -7406,13 +7406,17 @@ void HistoryMessage::draw(Painter &p, const QRect &r, uint32 selection, uint64 m
int dateh = 0, unreadbarh = 0; int dateh = 0, unreadbarh = 0;
if (auto date = Get<HistoryMessageDate>()) { if (auto date = Get<HistoryMessageDate>()) {
dateh = date->height(); dateh = date->height();
date->paint(p, 0, _history->width); if (r.intersects(QRect(0, 0, _history->width, dateh))) {
date->paint(p, 0, _history->width);
}
} }
if (auto unreadbar = Get<HistoryMessageUnreadBar>()) { if (auto unreadbar = Get<HistoryMessageUnreadBar>()) {
unreadbarh = unreadbar->height(); unreadbarh = unreadbar->height();
p.translate(0, dateh); if (r.intersects(QRect(0, dateh, _history->width, unreadbarh))) {
unreadbar->paint(p, 0, _history->width); p.translate(0, dateh);
p.translate(0, -dateh); unreadbar->paint(p, 0, _history->width);
p.translate(0, -dateh);
}
} }
uint64 animms = App::main() ? App::main()->animActiveTimeStart(this) : 0; uint64 animms = App::main() ? App::main()->animActiveTimeStart(this) : 0;
@ -8217,13 +8221,17 @@ void HistoryService::draw(Painter &p, const QRect &r, uint32 selection, uint64 m
int dateh = 0, unreadbarh = 0; int dateh = 0, unreadbarh = 0;
if (auto date = Get<HistoryMessageDate>()) { if (auto date = Get<HistoryMessageDate>()) {
dateh = date->height(); dateh = date->height();
date->paint(p, 0, _history->width); if (r.intersects(QRect(0, 0, _history->width, dateh))) {
date->paint(p, 0, _history->width);
}
p.translate(0, dateh); p.translate(0, dateh);
height -= dateh; height -= dateh;
} }
if (auto unreadbar = Get<HistoryMessageUnreadBar>()) { if (auto unreadbar = Get<HistoryMessageUnreadBar>()) {
unreadbarh = unreadbar->height(); unreadbarh = unreadbar->height();
unreadbar->paint(p, 0, _history->width); if (r.intersects(QRect(0, 0, _history->width, unreadbarh))) {
unreadbar->paint(p, 0, _history->width);
}
p.translate(0, unreadbarh); p.translate(0, unreadbarh);
height -= unreadbarh; height -= unreadbarh;
} }

7
Telegram/SourceFiles/historywidget.cpp
View File

@ -287,12 +287,13 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
int32 iItem = (_curHistory == _history ? _curItem : 0); int32 iItem = (_curHistory == _history ? _curItem : 0);
HistoryItem *item = block->items[iItem]; HistoryItem *item = block->items[iItem];
QRect historyRect = r.intersected(QRect(0, hdrawtop, width(), r.height()));
int32 y = htop + block->y + item->y; int32 y = htop + block->y + item->y;
p.save(); p.save();
p.translate(0, y); p.translate(0, y);
while (y < drawToY) { while (y < drawToY) {
int32 h = item->height(); int32 h = item->height();
if (r.y() < y + h && hdrawtop < y + h) { if (historyRect.y() < y + h && hdrawtop < y + h) {
uint32 sel = 0; uint32 sel = 0;
if (y >= selfromy && y < seltoy) { if (y >= selfromy && y < seltoy) {
sel = (_dragSelecting && !item->serviceMsg() && item->id > 0) ? FullSelection : 0; sel = (_dragSelecting && !item->serviceMsg() && item->id > 0) ? FullSelection : 0;
@ -302,7 +303,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
sel = i.value(); sel = i.value();
} }
} }
item->draw(p, r.translated(0, -y), sel, ms); item->draw(p, historyRect.translated(0, -y), sel, ms);
if (item->hasViews()) { if (item->hasViews()) {
App::main()->scheduleViewIncrement(item); App::main()->scheduleViewIncrement(item);
@ -323,7 +324,9 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
item = block->items[iItem]; item = block->items[iItem];
} }
p.restore(); p.restore();
}
if (mtop >= 0 || htop >= 0) {
enumerateUserpics([&p, &r](HistoryMessage *message, int userpicTop) -> bool { enumerateUserpics([&p, &r](HistoryMessage *message, int userpicTop) -> bool {
// stop the enumeration if the userpic is above the painted rect // stop the enumeration if the userpic is above the painted rect
if (userpicTop + st::msgPhotoSize <= r.top()) { if (userpicTop + st::msgPhotoSize <= r.top()) {

30
Telegram/Telegram.pro
View File

@ -31,22 +31,22 @@ linux {
style_auto_cpp.target = ./GeneratedFiles/style_auto.cpp style_auto_cpp.target = ./GeneratedFiles/style_auto.cpp
style_auto_cpp.depends = FORCE style_auto_cpp.depends = FORCE
style_auto_cpp.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/SourceFiles/art/ style_auto_cpp.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/Resources/art/
style_auto_cpp.depends = ./../../Telegram/Resources/style.txt style_auto_cpp.depends = ./../../Telegram/Resources/style.txt
style_auto_h.target = ./GeneratedFiles/style_auto.h style_auto_h.target = ./GeneratedFiles/style_auto.h
style_auto_h.depends = FORCE style_auto_h.depends = FORCE
style_auto_h.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/SourceFiles/art/ style_auto_h.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/Resources/art/
style_auto_h.depends = ./../../Telegram/Resources/style.txt style_auto_h.depends = ./../../Telegram/Resources/style.txt
style_classes_h.target = ./GeneratedFiles/style_classes.h style_classes_h.target = ./GeneratedFiles/style_classes.h
style_classes_h.depends = FORCE style_classes_h.depends = FORCE
style_classes_h.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/SourceFiles/art/ style_classes_h.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/Resources/art/
style_classes_h.depends = ./../../Telegram/Resources/style_classes.txt style_classes_h.depends = ./../../Telegram/Resources/style_classes.txt
numbers_cpp.target = ./GeneratedFiles/numbers.cpp numbers_cpp.target = ./GeneratedFiles/numbers.cpp
numbers_cpp.depends = FORCE numbers_cpp.depends = FORCE
numbers_cpp.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/SourceFiles/art/ numbers_cpp.commands = mkdir -p ./../../Telegram/GeneratedFiles && ./../DebugStyle/MetaStyle -classes_in ./../../Telegram/Resources/style_classes.txt -classes_out ./../../Telegram/GeneratedFiles/style_classes.h -styles_in ./../../Telegram/Resources/style.txt -styles_out ./../../Telegram/GeneratedFiles/style_auto.h -path_to_sprites ./../../Telegram/Resources/art/
numbers_cpp.depends = ./../../Telegram/Resources/numbers.txt numbers_cpp.depends = ./../../Telegram/Resources/numbers.txt
lang_auto_cpp.target = ./GeneratedFiles/lang_auto.cpp lang_auto_cpp.target = ./GeneratedFiles/lang_auto.cpp
@ -363,16 +363,16 @@ LIBS += /usr/local/lib/libxkbcommon.a
LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a
RESOURCES += \ RESOURCES += \
./SourceFiles/telegram.qrc \ ./Resources/telegram.qrc \
./SourceFiles/telegram_linux.qrc \ ./Resources/telegram_linux.qrc \
./SourceFiles/telegram_emojis.qrc ./Resources/telegram_emojis.qrc
OTHER_FILES += \ OTHER_FILES += \
Resources/style_classes.txt \ ./Resources/style_classes.txt \
Resources/style.txt \ ./Resources/style.txt \
Resources/lang.strings \ ./Resources/lang.strings \
SourceFiles/langs/lang_it.strings \ ./Resources/langs/lang_it.strings \
SourceFiles/langs/lang_es.strings \ ./Resources/langs/lang_es.strings \
SourceFiles/langs/lang_de.strings \ ./Resources/langs/lang_de.strings \
SourceFiles/langs/lang_nl.strings \ ./Resources/langs/lang_nl.strings \
SourceFiles/langs/lang_pt_BR.strings ./Resources/langs/lang_pt_BR.strings

2
Telegram/Telegram.rc
View File

@ -26,7 +26,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico" IDI_ICON1 ICON "Resources\\art\\icon256.ico"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //

44
Telegram/Telegram.vcxproj
View File

@ -1529,16 +1529,16 @@
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\style_classes.txt"> <CustomBuild Include="Resources\style_classes.txt">
<Outputs>.\GeneratedFiles\style_classes.h</Outputs> <Outputs>.\GeneratedFiles\style_classes.h</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art\\"</Command> <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\Resources\art\\"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\style.txt"> <CustomBuild Include="Resources\style.txt">
<Outputs>.\GeneratedFiles\style_auto.h</Outputs> <Outputs>.\GeneratedFiles\style_auto.h</Outputs>
<Outputs>.\GeneratedFiles\style_auto.cpp</Outputs> <Outputs>.\GeneratedFiles\style_auto.cpp</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art\\"</Command> <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\Resources\art\\"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\numbers.txt"> <CustomBuild Include="Resources\numbers.txt">
<Outputs>.\GeneratedFiles\numbers.cpp</Outputs> <Outputs>.\GeneratedFiles\numbers.cpp</Outputs>
<Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\SourceFiles\art\\"</Command> <Command>"$(SolutionDir)$(Platform)\$(Configuration)Style\MetaStyle.exe" -classes_in ".\Resources\style_classes.txt" -classes_out ".\GeneratedFiles\style_classes.h" -styles_in ".\Resources\style.txt" -styles_out ".\GeneratedFiles\style_auto.h" -path_to_sprites ".\Resources\art\\"</Command>
</CustomBuild> </CustomBuild>
<CustomBuild Include="Resources\lang.strings"> <CustomBuild Include="Resources\lang.strings">
<Outputs>.\GeneratedFiles\lang_auto.h</Outputs> <Outputs>.\GeneratedFiles\lang_auto.h</Outputs>
@ -2258,13 +2258,13 @@
<ClInclude Include="SourceFiles\stdafx.h" /> <ClInclude Include="SourceFiles\stdafx.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="SourceFiles\telegram.qrc"> <CustomBuild Include="Resources\telegram.qrc">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\SourceFiles\art\icon256.png;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\Resources\art\icon256.png;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\SourceFiles\art\icon256.png;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\Resources\art\icon256.png;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">%(FullPath);.\SourceFiles\art\icon256.png;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">%(FullPath);.\Resources\art\icon256.png;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
@ -2273,13 +2273,13 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</CustomBuild> </CustomBuild>
<CustomBuild Include="SourceFiles\telegram_emojis.qrc"> <CustomBuild Include="Resources\telegram_emojis.qrc">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\SourceFiles\art\emoji.webp;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\Resources\art\emoji.webp;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\SourceFiles\art\emoji.webp;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\Resources\art\emoji.webp;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">%(FullPath);.\SourceFiles\art\emoji.webp;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">%(FullPath);.\Resources\art\emoji.webp;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
@ -2288,13 +2288,13 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</CustomBuild> </CustomBuild>
<CustomBuild Include="SourceFiles\telegram_wnd.qrc"> <CustomBuild Include="Resources\telegram_wnd.qrc">
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\SourceFiles\etc\qt_win.conf;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FullPath);.\Resources\etc\qt_win.conf;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command> <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\SourceFiles\etc\qt_win.conf;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FullPath);.\Resources\etc\qt_win.conf;%(AdditionalInputs)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">%(FullPath);.\SourceFiles\etc\qt_win.conf;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">%(FullPath);.\Resources\etc\qt_win.conf;%(AdditionalInputs)</AdditionalInputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Rcc%27ing %(Identity)...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Rcc%27ing %(Identity)...</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Rcc%27ing %(Identity)...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs)</Outputs>
@ -2305,18 +2305,18 @@
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="SourceFiles\art\icon256.ico" /> <Image Include="Resources\art\icon256.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Telegram.rc" /> <ResourceCompile Include="Telegram.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="SourceFiles\langs\lang_de.strings" /> <None Include="Resources\langs\lang_de.strings" />
<None Include="SourceFiles\langs\lang_es.strings" /> <None Include="Resources\langs\lang_es.strings" />
<None Include="SourceFiles\langs\lang_it.strings" /> <None Include="Resources\langs\lang_it.strings" />
<None Include="SourceFiles\langs\lang_ko.strings" /> <None Include="Resources\langs\lang_ko.strings" />
<None Include="SourceFiles\langs\lang_nl.strings" /> <None Include="Resources\langs\lang_nl.strings" />
<None Include="SourceFiles\langs\lang_pt_BR.strings" /> <None Include="Resources\langs\lang_pt_BR.strings" />
<None Include="SourceFiles\mtproto\generate.py" /> <None Include="SourceFiles\mtproto\generate.py" />
<None Include="SourceFiles\mtproto\scheme.tl" /> <None Include="SourceFiles\mtproto\scheme.tl" />
<None Include="SourceFiles\pspecific_mac_p.mm"> <None Include="SourceFiles\pspecific_mac_p.mm">

44
Telegram/Telegram.vcxproj.filters
View File

@ -34,9 +34,6 @@
<Extensions>cpp;moc</Extensions> <Extensions>cpp;moc</Extensions>
<SourceControlFiles>False</SourceControlFiles> <SourceControlFiles>False</SourceControlFiles>
</Filter> </Filter>
<Filter Include="langs">
<UniqueIdentifier>{67311646-a8af-4626-976d-0a5733bf90e8}</UniqueIdentifier>
</Filter>
<Filter Include="Resources"> <Filter Include="Resources">
<UniqueIdentifier>{df139398-6d5d-4bd5-8abe-b509b102f5d8}</UniqueIdentifier> <UniqueIdentifier>{df139398-6d5d-4bd5-8abe-b509b102f5d8}</UniqueIdentifier>
</Filter> </Filter>
@ -61,6 +58,9 @@
<Filter Include="serialize"> <Filter Include="serialize">
<UniqueIdentifier>{e9244e0a-a3ae-43dc-8a72-fd7d14cee20b}</UniqueIdentifier> <UniqueIdentifier>{e9244e0a-a3ae-43dc-8a72-fd7d14cee20b}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Resources\langs">
<UniqueIdentifier>{67311646-a8af-4626-976d-0a5733bf90e8}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="SourceFiles\main.cpp"> <ClCompile Include="SourceFiles\main.cpp">
@ -1288,13 +1288,13 @@
<CustomBuild Include="Resources\style_classes.txt"> <CustomBuild Include="Resources\style_classes.txt">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="SourceFiles\telegram.qrc"> <CustomBuild Include="Resources\telegram.qrc">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="SourceFiles\telegram_emojis.qrc"> <CustomBuild Include="Resources\telegram_emojis.qrc">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="SourceFiles\telegram_wnd.qrc"> <CustomBuild Include="Resources\telegram_wnd.qrc">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="SourceFiles\layout.h"> <CustomBuild Include="SourceFiles\layout.h">
@ -1383,26 +1383,23 @@
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="SourceFiles\langs\lang_it.strings"> <None Include="Resources\langs\lang_it.strings">
<Filter>langs</Filter> <Filter>Resources\langs</Filter>
</None> </None>
<None Include="SourceFiles\langs\lang_es.strings"> <None Include="Resources\langs\lang_es.strings">
<Filter>langs</Filter> <Filter>Resources\langs</Filter>
</None> </None>
<None Include="SourceFiles\langs\lang_de.strings"> <None Include="Resources\langs\lang_de.strings">
<Filter>langs</Filter> <Filter>Resources\langs</Filter>
</None> </None>
<None Include="SourceFiles\langs\lang_nl.strings"> <None Include="Resources\langs\lang_nl.strings">
<Filter>langs</Filter> <Filter>Resources\langs</Filter>
</None> </None>
<None Include="SourceFiles\langs\lang_pt_BR.strings"> <None Include="Resources\langs\lang_pt_BR.strings">
<Filter>langs</Filter> <Filter>Resources\langs</Filter>
</None> </None>
<None Include="SourceFiles\langs\lang_ko.strings"> <None Include="Resources\langs\lang_ko.strings">
<Filter>langs</Filter> <Filter>Resources\langs</Filter>
</None>
<None Include="SourceFiles\pspecific_mac_p.mm">
<Filter>Source Files</Filter>
</None> </None>
<None Include="Telegram.xcodeproj\project.pbxproj"> <None Include="Telegram.xcodeproj\project.pbxproj">
<Filter>Version</Filter> <Filter>Version</Filter>
@ -1425,9 +1422,12 @@
<None Include="SourceFiles\mtproto\scheme.tl"> <None Include="SourceFiles\mtproto\scheme.tl">
<Filter>mtproto</Filter> <Filter>mtproto</Filter>
</None> </None>
<None Include="SourceFiles\pspecific_mac_p.mm">
<Filter>Source Files</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="SourceFiles\art\icon256.ico"> <Image Include="Resources\art\icon256.ico">
<Filter>Resources</Filter> <Filter>Resources</Filter>
</Image> </Image>
</ItemGroup> </ItemGroup>

20
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -309,12 +309,12 @@
071AD86E1C5E8536008C9E90 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = ThirdParty/minizip/zip.h; sourceTree = SOURCE_ROOT; }; 071AD86E1C5E8536008C9E90 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = zip.h; path = ThirdParty/minizip/zip.h; sourceTree = SOURCE_ROOT; };
071AD8D11C5E8E6D008C9E90 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = ThirdParty/minizip/zip.c; sourceTree = SOURCE_ROOT; }; 071AD8D11C5E8E6D008C9E90 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zip.c; path = ThirdParty/minizip/zip.c; sourceTree = SOURCE_ROOT; };
071AD8F71C5E99D6008C9E90 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = ThirdParty/minizip/ioapi.c; sourceTree = SOURCE_ROOT; }; 071AD8F71C5E99D6008C9E90 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = ThirdParty/minizip/ioapi.c; sourceTree = SOURCE_ROOT; };
072E117A1A56EB9400A87ACC /* lang_pt_BR.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_pt_BR.strings; path = SourceFiles/langs/lang_pt_BR.strings; sourceTree = SOURCE_ROOT; }; 072E117A1A56EB9400A87ACC /* lang_pt_BR.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_pt_BR.strings; path = Resources/langs/lang_pt_BR.strings; sourceTree = SOURCE_ROOT; };
0732E4A7199E262300D50FE7 /* overviewwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = overviewwidget.cpp; path = SourceFiles/overviewwidget.cpp; sourceTree = SOURCE_ROOT; }; 0732E4A7199E262300D50FE7 /* overviewwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = overviewwidget.cpp; path = SourceFiles/overviewwidget.cpp; sourceTree = SOURCE_ROOT; };
0732E4A8199E262300D50FE7 /* overviewwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overviewwidget.h; path = SourceFiles/overviewwidget.h; sourceTree = SOURCE_ROOT; }; 0732E4A8199E262300D50FE7 /* overviewwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overviewwidget.h; path = SourceFiles/overviewwidget.h; sourceTree = SOURCE_ROOT; };
0732E4AB199E268A00D50FE7 /* moc_overviewwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_overviewwidget.cpp; path = GeneratedFiles/Debug/moc_overviewwidget.cpp; sourceTree = SOURCE_ROOT; }; 0732E4AB199E268A00D50FE7 /* moc_overviewwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_overviewwidget.cpp; path = GeneratedFiles/Debug/moc_overviewwidget.cpp; sourceTree = SOURCE_ROOT; };
074756181A1372C600CA07F7 /* moc_basic_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_basic_types.cpp; path = GeneratedFiles/Debug/moc_basic_types.cpp; sourceTree = SOURCE_ROOT; }; 074756181A1372C600CA07F7 /* moc_basic_types.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_basic_types.cpp; path = GeneratedFiles/Debug/moc_basic_types.cpp; sourceTree = SOURCE_ROOT; };
074968CC1A44D13400394F46 /* lang_it.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_it.strings; path = SourceFiles/langs/lang_it.strings; sourceTree = SOURCE_ROOT; }; 074968CC1A44D13400394F46 /* lang_it.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_it.strings; path = Resources/langs/lang_it.strings; sourceTree = SOURCE_ROOT; };
074968CE1A44D14C00394F46 /* languagebox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = languagebox.cpp; path = SourceFiles/boxes/languagebox.cpp; sourceTree = SOURCE_ROOT; }; 074968CE1A44D14C00394F46 /* languagebox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = languagebox.cpp; path = SourceFiles/boxes/languagebox.cpp; sourceTree = SOURCE_ROOT; };
074968CF1A44D14C00394F46 /* languagebox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = languagebox.h; path = SourceFiles/boxes/languagebox.h; sourceTree = SOURCE_ROOT; }; 074968CF1A44D14C00394F46 /* languagebox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = languagebox.h; path = SourceFiles/boxes/languagebox.h; sourceTree = SOURCE_ROOT; };
074968D11A44D1DF00394F46 /* moc_languagebox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_languagebox.cpp; path = GeneratedFiles/Debug/moc_languagebox.cpp; sourceTree = SOURCE_ROOT; }; 074968D11A44D1DF00394F46 /* moc_languagebox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_languagebox.cpp; path = GeneratedFiles/Debug/moc_languagebox.cpp; sourceTree = SOURCE_ROOT; };
@ -330,7 +330,7 @@
0755AEDB1AD12A80004D738A /* moc_intropwdcheck.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_intropwdcheck.cpp; path = GeneratedFiles/Debug/moc_intropwdcheck.cpp; sourceTree = SOURCE_ROOT; }; 0755AEDB1AD12A80004D738A /* moc_intropwdcheck.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_intropwdcheck.cpp; path = GeneratedFiles/Debug/moc_intropwdcheck.cpp; sourceTree = SOURCE_ROOT; };
0755AEDC1AD12A80004D738A /* moc_sessionsbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_sessionsbox.cpp; path = GeneratedFiles/Debug/moc_sessionsbox.cpp; sourceTree = SOURCE_ROOT; }; 0755AEDC1AD12A80004D738A /* moc_sessionsbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_sessionsbox.cpp; path = GeneratedFiles/Debug/moc_sessionsbox.cpp; sourceTree = SOURCE_ROOT; };
075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; }; 075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
075F99A91A45EEF200915C72 /* lang_es.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_es.strings; path = SourceFiles/langs/lang_es.strings; sourceTree = SOURCE_ROOT; }; 075F99A91A45EEF200915C72 /* lang_es.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_es.strings; path = Resources/langs/lang_es.strings; sourceTree = SOURCE_ROOT; };
075FEBEA1C82336D0003ECA3 /* shortcuts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shortcuts.cpp; path = SourceFiles/shortcuts.cpp; sourceTree = SOURCE_ROOT; }; 075FEBEA1C82336D0003ECA3 /* shortcuts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shortcuts.cpp; path = SourceFiles/shortcuts.cpp; sourceTree = SOURCE_ROOT; };
075FEBEB1C82336D0003ECA3 /* shortcuts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shortcuts.h; path = SourceFiles/shortcuts.h; sourceTree = SOURCE_ROOT; }; 075FEBEB1C82336D0003ECA3 /* shortcuts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shortcuts.h; path = SourceFiles/shortcuts.h; sourceTree = SOURCE_ROOT; };
0764D5581ABAD6F900FBFEED /* apiwrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = apiwrap.cpp; path = SourceFiles/apiwrap.cpp; sourceTree = SOURCE_ROOT; }; 0764D5581ABAD6F900FBFEED /* apiwrap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = apiwrap.cpp; path = SourceFiles/apiwrap.cpp; sourceTree = SOURCE_ROOT; };
@ -355,16 +355,16 @@
078A2FC91A811C5900CCC7A0 /* moc_backgroundbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_backgroundbox.cpp; path = GeneratedFiles/Debug/moc_backgroundbox.cpp; sourceTree = SOURCE_ROOT; }; 078A2FC91A811C5900CCC7A0 /* moc_backgroundbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_backgroundbox.cpp; path = GeneratedFiles/Debug/moc_backgroundbox.cpp; sourceTree = SOURCE_ROOT; };
078A2FCB1A811CA600CCC7A0 /* backgroundbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = backgroundbox.cpp; path = SourceFiles/boxes/backgroundbox.cpp; sourceTree = SOURCE_ROOT; }; 078A2FCB1A811CA600CCC7A0 /* backgroundbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = backgroundbox.cpp; path = SourceFiles/boxes/backgroundbox.cpp; sourceTree = SOURCE_ROOT; };
078A2FCC1A811CA600CCC7A0 /* backgroundbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = backgroundbox.h; path = SourceFiles/boxes/backgroundbox.h; sourceTree = SOURCE_ROOT; }; 078A2FCC1A811CA600CCC7A0 /* backgroundbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = backgroundbox.h; path = SourceFiles/boxes/backgroundbox.h; sourceTree = SOURCE_ROOT; };
078DD0241A48DD9E00DD14CC /* lang_de.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_de.strings; path = SourceFiles/langs/lang_de.strings; sourceTree = SOURCE_ROOT; }; 078DD0241A48DD9E00DD14CC /* lang_de.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_de.strings; path = Resources/langs/lang_de.strings; sourceTree = SOURCE_ROOT; };
078DD0251A48DD9E00DD14CC /* lang_nl.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_nl.strings; path = SourceFiles/langs/lang_nl.strings; sourceTree = SOURCE_ROOT; }; 078DD0251A48DD9E00DD14CC /* lang_nl.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_nl.strings; path = Resources/langs/lang_nl.strings; sourceTree = SOURCE_ROOT; };
07A190511A723E0A004287AE /* lang_ko.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_ko.strings; path = SourceFiles/langs/lang_ko.strings; sourceTree = SOURCE_ROOT; }; 07A190511A723E0A004287AE /* lang_ko.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = lang_ko.strings; path = Resources/langs/lang_ko.strings; sourceTree = SOURCE_ROOT; };
07A69330199277BA0099CB9F /* mediaview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mediaview.cpp; path = SourceFiles/mediaview.cpp; sourceTree = SOURCE_ROOT; }; 07A69330199277BA0099CB9F /* mediaview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mediaview.cpp; path = SourceFiles/mediaview.cpp; sourceTree = SOURCE_ROOT; };
07A69331199277BA0099CB9F /* mediaview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mediaview.h; path = SourceFiles/mediaview.h; sourceTree = SOURCE_ROOT; }; 07A69331199277BA0099CB9F /* mediaview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mediaview.h; path = SourceFiles/mediaview.h; sourceTree = SOURCE_ROOT; };
07A6933419927B160099CB9F /* moc_mediaview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_mediaview.cpp; path = GeneratedFiles/Debug/moc_mediaview.cpp; sourceTree = SOURCE_ROOT; }; 07A6933419927B160099CB9F /* moc_mediaview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_mediaview.cpp; path = GeneratedFiles/Debug/moc_mediaview.cpp; sourceTree = SOURCE_ROOT; };
07AF95F21AFD03B90060B057 /* qrc_telegram_emojis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qrc_telegram_emojis.cpp; path = GeneratedFiles/qrc_telegram_emojis.cpp; sourceTree = SOURCE_ROOT; }; 07AF95F21AFD03B90060B057 /* qrc_telegram_emojis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qrc_telegram_emojis.cpp; path = GeneratedFiles/qrc_telegram_emojis.cpp; sourceTree = SOURCE_ROOT; };
07AF95F31AFD03B90060B057 /* qrc_telegram_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qrc_telegram_mac.cpp; path = GeneratedFiles/qrc_telegram_mac.cpp; sourceTree = SOURCE_ROOT; }; 07AF95F31AFD03B90060B057 /* qrc_telegram_mac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qrc_telegram_mac.cpp; path = GeneratedFiles/qrc_telegram_mac.cpp; sourceTree = SOURCE_ROOT; };
07AF95F71AFD03C80060B057 /* telegram_emojis.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = telegram_emojis.qrc; path = SourceFiles/telegram_emojis.qrc; sourceTree = SOURCE_ROOT; }; 07AF95F71AFD03C80060B057 /* telegram_emojis.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = telegram_emojis.qrc; path = Resources/telegram_emojis.qrc; sourceTree = SOURCE_ROOT; };
07AF95F81AFD03C80060B057 /* telegram_mac.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = telegram_mac.qrc; path = SourceFiles/telegram_mac.qrc; sourceTree = SOURCE_ROOT; }; 07AF95F81AFD03C80060B057 /* telegram_mac.qrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = telegram_mac.qrc; path = Resources/telegram_mac.qrc; sourceTree = SOURCE_ROOT; };
07B604301B46A0EC00CA29FE /* playerwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = playerwidget.cpp; path = SourceFiles/playerwidget.cpp; sourceTree = SOURCE_ROOT; }; 07B604301B46A0EC00CA29FE /* playerwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = playerwidget.cpp; path = SourceFiles/playerwidget.cpp; sourceTree = SOURCE_ROOT; };
07B604311B46A0EC00CA29FE /* playerwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playerwidget.h; path = SourceFiles/playerwidget.h; sourceTree = SOURCE_ROOT; }; 07B604311B46A0EC00CA29FE /* playerwidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playerwidget.h; path = SourceFiles/playerwidget.h; sourceTree = SOURCE_ROOT; };
07B604341B46A20900CA29FE /* moc_playerwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_playerwidget.cpp; path = GeneratedFiles/Debug/moc_playerwidget.cpp; sourceTree = SOURCE_ROOT; }; 07B604341B46A20900CA29FE /* moc_playerwidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_playerwidget.cpp; path = GeneratedFiles/Debug/moc_playerwidget.cpp; sourceTree = SOURCE_ROOT; };
@ -442,7 +442,7 @@
1080B6D395843B8F76A2E45E /* moc_title.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_title.cpp; path = GeneratedFiles/Debug/moc_title.cpp; sourceTree = "<absolute>"; }; 1080B6D395843B8F76A2E45E /* moc_title.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_title.cpp; path = GeneratedFiles/Debug/moc_title.cpp; sourceTree = "<absolute>"; };
111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; }; 111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.5.1/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
120EBCD9A37DB9A36BFE58C0 /* contactsbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = contactsbox.h; path = SourceFiles/boxes/contactsbox.h; sourceTree = "<absolute>"; }; 120EBCD9A37DB9A36BFE58C0 /* contactsbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = contactsbox.h; path = SourceFiles/boxes/contactsbox.h; sourceTree = "<absolute>"; };
1292B92B4848460640F6A391 /* telegram.qrc */ = {isa = PBXFileReference; lastKnownFileType = text; name = telegram.qrc; path = SourceFiles/telegram.qrc; sourceTree = "<absolute>"; }; 1292B92B4848460640F6A391 /* telegram.qrc */ = {isa = PBXFileReference; lastKnownFileType = text; name = telegram.qrc; path = Resources/telegram.qrc; sourceTree = "<absolute>"; };
135FD3715BFDC50AD7B00E04 /* text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = text.cpp; path = SourceFiles/ui/text.cpp; sourceTree = "<absolute>"; }; 135FD3715BFDC50AD7B00E04 /* text.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = text.cpp; path = SourceFiles/ui/text.cpp; sourceTree = "<absolute>"; };
143405635D04698F421A12EA /* aboutbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = aboutbox.h; path = SourceFiles/boxes/aboutbox.h; sourceTree = "<absolute>"; }; 143405635D04698F421A12EA /* aboutbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = aboutbox.h; path = SourceFiles/boxes/aboutbox.h; sourceTree = "<absolute>"; };
14437BFDCD58FF1742EF1B35 /* photocropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = photocropbox.h; path = SourceFiles/boxes/photocropbox.h; sourceTree = "<absolute>"; }; 14437BFDCD58FF1742EF1B35 /* photocropbox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = photocropbox.h; path = SourceFiles/boxes/photocropbox.h; sourceTree = "<absolute>"; };
@ -1606,7 +1606,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "open ../Mac/DebugStyle/MetaStyle.app --args -classes_in \"../../Telegram/Resources/style_classes.txt\" -classes_out \"../../Telegram/GeneratedFiles/style_classes.h\" -styles_in \"../../Telegram/Resources/style.txt\" -styles_out \"../../Telegram/GeneratedFiles/style_auto.h\" -path_to_sprites \"../../Telegram/SourceFiles/art/\""; shellScript = "open ../Mac/DebugStyle/MetaStyle.app --args -classes_in \"../../Telegram/Resources/style_classes.txt\" -classes_out \"../../Telegram/GeneratedFiles/style_classes.h\" -styles_in \"../../Telegram/Resources/style.txt\" -styles_out \"../../Telegram/GeneratedFiles/style_auto.h\" -path_to_sprites \"../../Telegram/Resources/art/\"";
}; };
07C3AF3B194CCC310016CFF1 /* Meta Lang */ = { 07C3AF3B194CCC310016CFF1 /* Meta Lang */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;

84
Telegram/Telegram.xcodeproj/qt_preprocess.mak
View File

@ -108,44 +108,56 @@ compiler_no_pch_compiler_clean:
compiler_rcc_make_all: GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cpp GeneratedFiles/qrc_telegram_mac.cpp compiler_rcc_make_all: GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cpp GeneratedFiles/qrc_telegram_mac.cpp
compiler_rcc_clean: compiler_rcc_clean:
-$(DEL_FILE) GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cpp GeneratedFiles/qrc_telegram_mac.cpp -$(DEL_FILE) GeneratedFiles/qrc_telegram.cpp GeneratedFiles/qrc_telegram_emojis.cpp GeneratedFiles/qrc_telegram_mac.cpp
GeneratedFiles/qrc_telegram.cpp: SourceFiles/telegram.qrc \ GeneratedFiles/qrc_telegram.cpp: Resources/telegram.qrc \
SourceFiles/art/blank.gif \ Resources/art/fonts/OpenSans-Regular.ttf \
SourceFiles/art/bg.jpg \ Resources/art/fonts/OpenSans-Bold.ttf \
SourceFiles/art/sprite_150x.png \ Resources/art/fonts/OpenSans-Semibold.ttf \
SourceFiles/art/sprite.png \ Resources/art/newmsg.wav \
SourceFiles/art/icon256.png \ Resources/art/bg.jpg \
SourceFiles/art/sprite_200x.png \ Resources/art/bg0.jpg \
SourceFiles/art/newmsg.wav \ Resources/art/sprite.png \
SourceFiles/art/sprite_125x.png \ Resources/art/sprite_125x.png \
SourceFiles/art/fonts/OpenSans-Regular.ttf \ Resources/art/sprite_150x.png \
SourceFiles/art/fonts/OpenSans-Bold.ttf \ Resources/art/sprite_200x.png \
SourceFiles/art/fonts/OpenSans-Semibold.ttf \ Resources/art/blank.gif \
SourceFiles/qmime/freedesktop.org.xml \ Resources/art/icon256.png \
SourceFiles/art/usercolor4.png \ Resources/art/iconbig256.png \
SourceFiles/art/chatcolor1.png \ Resources/art/chatcolor1.png \
SourceFiles/art/usercolor8.png \ Resources/art/chatcolor2.png
SourceFiles/art/usercolor3.png \ Resources/art/chatcolor3.png \
SourceFiles/art/usercolor7.png \ Resources/art/chatcolor4.png \
SourceFiles/art/chatcolor4.png \ Resources/art/channelcolor1.png \
SourceFiles/art/usercolor2.png \ Resources/art/channelcolor2.png
SourceFiles/art/usercolor6.png \ Resources/art/channelcolor3.png \
SourceFiles/art/chatcolor3.png \ Resources/art/channelcolor4.png \
SourceFiles/art/usercolor1.png \ Resources/art/usercolor1.png \
SourceFiles/art/usercolor5.png \ Resources/art/usercolor2.png \
SourceFiles/art/chatcolor2.png Resources/art/usercolor3.png \
/usr/local/Qt-5.5.1/bin/rcc -name telegram SourceFiles/telegram.qrc -o GeneratedFiles/qrc_telegram.cpp Resources/art/usercolor4.png \
Resources/art/usercolor5.png \
Resources/art/usercolor6.png \
Resources/art/usercolor7.png \
Resources/art/usercolor8.png \
Resources/qmime/freedesktop.org.xml \
Resources/langs/lang_it.strings \
Resources/langs/lang_es.strings \
Resources/langs/lang_de.strings \
Resources/langs/lang_nl.strings \
Resources/langs/lang_pt_BR.strings \
Resources/langs/lang_ko.strings \
/usr/local/Qt-5.5.1/bin/rcc -name telegram Resources/telegram.qrc -o GeneratedFiles/qrc_telegram.cpp
GeneratedFiles/qrc_telegram_emojis.cpp: SourceFiles/telegram_emojis.qrc \ GeneratedFiles/qrc_telegram_emojis.cpp: Resources/telegram_emojis.qrc \
SourceFiles/art/emoji.webp \ Resources/art/emoji.webp \
SourceFiles/art/emoji_150x.webp \ Resources/art/emoji_125x.webp \
SourceFiles/art/emoji_200x.webp \ Resources/art/emoji_150x.webp \
SourceFiles/art/emoji_250x.webp \ Resources/art/emoji_200x.webp \
SourceFiles/art/emoji_125x.webp Resources/art/emoji_250x.webp
/usr/local/Qt-5.5.1/bin/rcc -name telegram_emojis SourceFiles/telegram_emojis.qrc -o GeneratedFiles/qrc_telegram_emojis.cpp /usr/local/Qt-5.5.1/bin/rcc -name telegram_emojis Resources/telegram_emojis.qrc -o GeneratedFiles/qrc_telegram_emojis.cpp
GeneratedFiles/qrc_telegram_mac.cpp: SourceFiles/telegram_mac.qrc \ GeneratedFiles/qrc_telegram_mac.cpp: Resources/telegram_mac.qrc \
SourceFiles/art/osxtray.png Resources/art/osxtray.png
/usr/local/Qt-5.5.1/bin/rcc -name telegram_mac SourceFiles/telegram_mac.qrc -o GeneratedFiles/qrc_telegram_mac.cpp /usr/local/Qt-5.5.1/bin/rcc -name telegram_mac Resources/telegram_mac.qrc -o GeneratedFiles/qrc_telegram_mac.cpp
compiler_moc_header_make_all: GeneratedFiles/Debug/moc_apiwrap.cpp\ compiler_moc_header_make_all: GeneratedFiles/Debug/moc_apiwrap.cpp\
GeneratedFiles/Debug/moc_application.cpp\ GeneratedFiles/Debug/moc_application.cpp\

8
Telegram/UpdateLang.sh
View File

@ -4,9 +4,9 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
done < tdesktop/Telegram/Resources/LangList done < tdesktop/Telegram/Resources/LangList
cd translations/telegram-desktop.langstrings/ cd translations/telegram-desktop.langstrings/
for file in *.strings; do for file in *.strings; do
iconv -f "UTF-16LE" -t "UTF-8" "$file" > "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp" iconv -f "UTF-16LE" -t "UTF-8" "$file" > "../../tdesktop/Telegram/Resources/langs/lang_$file.tmp"
awk '{ if (NR==1) sub(/^\xef\xbb\xbf/,""); sub(/ /,""); print }' "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp" > "../../tdesktop/Telegram/SourceFiles/langs/lang_$file" awk '{ if (NR==1) sub(/^\xef\xbb\xbf/,""); sub(/ /,""); print }' "../../tdesktop/Telegram/Resources/langs/lang_$file.tmp" > "../../tdesktop/Telegram/Resources/langs/lang_$file"
rm "../../tdesktop/Telegram/SourceFiles/langs/lang_$file.tmp" rm "../../tdesktop/Telegram/Resources/langs/lang_$file.tmp"
done done
cd ../../tdesktop/Telegram/ cd ../../tdesktop/Telegram/
touch SourceFiles/telegram.qrc touch Resources/telegram.qrc