procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev_private' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev_private

Browse source
This commit is contained in:
John Preston 2016-07-29 11:06:35 +01:00
commit 4b98cac6da
5 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Telegram/Resources/all_files.style
View file

@ -23,6 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
using "basic_types.style";
using "basic.style";
using "boxes/boxes.style";
using "dialogs/dialogs.style";
using "history/history.style";
using "overview/overview.style";

4
Telegram/SourceFiles/boxes/confirmbox.h
View file

@ -277,8 +277,8 @@ protected:
void resizeEvent(QResizeEvent *e) override;
void paintEvent(QPaintEvent *e) override;
void showAll();
void hideAll();
void showAll() override;
void hideAll() override;
private:
ChildWidget<FlatLabel> _title, _status;

2
Telegram/SourceFiles/boxes/stickersetbox.cpp
View file

@ -1032,7 +1032,7 @@ void StickersInner::rebuild() {
int maxNameWidth = countMaxNameWidth();
clear();
auto &order = ([this]() {
auto &order = ([this]() -> const Stickers::Order & {
if (_section == Section::Installed) {
return Global::StickerSetsOrder();
} else if (_section == Section::Featured) {

10
Telegram/Telegram.pro
View file

@ -63,6 +63,8 @@ file_style_basic.target = GeneratedFiles/styles/style_basic.cpp
file_style_basic.depends = style_target
file_style_basic_types.target = GeneratedFiles/styles/style_basic_types.cpp
file_style_basic_types.depends = style_target
file_style_boxes.target = GeneratedFiles/styles/style_boxes.cpp
file_style_boxes.depends = style_target
file_style_dialogs.target = GeneratedFiles/styles/style_dialogs.cpp
file_style_dialogs.depends = style_target
file_style_history.target = GeneratedFiles/styles/style_history.cpp
@ -77,9 +79,9 @@ file_style_widgets.target = GeneratedFiles/styles/style_widgets.cpp
file_style_widgets.depends = style_target
QMAKE_EXTRA_TARGETS += codegen_style codegen_numbers codegen_lang \
file_style_basic file_style_basic_types file_style_dialogs \
file_style_history file_style_mediaview file_style_overview \
file_style_profile file_style_widgets
file_style_basic file_style_basic_types file_style_boxes \
file_style_dialogs file_style_history file_style_mediaview \
file_style_overview file_style_profile file_style_widgets
PRE_TARGETDEPS += style_target numbers_target lang_target
@ -100,6 +102,7 @@ SOURCES += \
./GeneratedFiles/numbers.cpp \
./GeneratedFiles/styles/style_basic.cpp \
./GeneratedFiles/styles/style_basic_types.cpp \
./GeneratedFiles/styles/style_boxes.cpp \
./GeneratedFiles/styles/style_dialogs.cpp \
./GeneratedFiles/styles/style_history.cpp \
./GeneratedFiles/styles/style_mediaview.cpp \
@ -269,6 +272,7 @@ HEADERS += \
./GeneratedFiles/numbers.h \
./GeneratedFiles/styles/style_basic.h \
./GeneratedFiles/styles/style_basic_types.h \
./GeneratedFiles/styles/style_boxes.h \
./GeneratedFiles/styles/style_dialogs.h \
./GeneratedFiles/styles/style_history.h \
./GeneratedFiles/styles/style_mediaview.h \

6
Telegram/Telegram.xcodeproj/project.pbxproj
View file

@ -141,6 +141,7 @@
0785004D1CCA847400168DBB /* libqtfreetype.a in Link Binary With Libraries */ = {isa = PBXBuildFile; fileRef = 0785004C1CCA847400168DBB /* libqtfreetype.a */; };
078A2FCA1A811C5900CCC7A0 /* moc_backgroundbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 078A2FC91A811C5900CCC7A0 /* moc_backgroundbox.cpp */; };
078A2FCD1A811CA600CCC7A0 /* backgroundbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 078A2FCB1A811CA600CCC7A0 /* backgroundbox.cpp */; };
079B51411D4935C0002FB6AF /* style_boxes.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 079B513F1D4935C0002FB6AF /* style_boxes.cpp */; };
07A69332199277BA0099CB9F /* mediaview.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07A69330199277BA0099CB9F /* mediaview.cpp */; };
07A6933519927B160099CB9F /* moc_mediaview.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07A6933419927B160099CB9F /* moc_mediaview.cpp */; };
07AF95F41AFD03B90060B057 /* qrc_telegram_emojis.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 07AF95F21AFD03B90060B057 /* qrc_telegram_emojis.cpp */; };
@ -582,6 +583,8 @@
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 = 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 = Resources/langs/lang_nl.strings; sourceTree = SOURCE_ROOT; };
079B513F1D4935C0002FB6AF /* style_boxes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = style_boxes.cpp; path = GeneratedFiles/styles/style_boxes.cpp; sourceTree = SOURCE_ROOT; };
079B51401D4935C0002FB6AF /* style_boxes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = style_boxes.h; path = GeneratedFiles/styles/style_boxes.h; 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; };
07A69331199277BA0099CB9F /* mediaview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mediaview.h; path = SourceFiles/mediaview.h; sourceTree = SOURCE_ROOT; };
@ -1092,6 +1095,8 @@
0747FF7D1CC6435100096FC3 /* style_basic.h */,
0747FF7A1CC6435100096FC3 /* style_basic_types.cpp */,
0747FF7B1CC6435100096FC3 /* style_basic_types.h */,
079B513F1D4935C0002FB6AF /* style_boxes.cpp */,
079B51401D4935C0002FB6AF /* style_boxes.h */,
0716C99C1D08251C00797B22 /* style_dialogs.cpp */,
0716C99D1D08251C00797B22 /* style_dialogs.h */,
0716C99E1D08251C00797B22 /* style_history.cpp */,
@ -2164,6 +2169,7 @@
BA41D511A9BBCA09365DF88C /* downloadpathbox.cpp in Compile Sources */,
07DB67511AD07CB800A51329 /* intropwdcheck.cpp in Compile Sources */,
07C8FE0F1CB80890007A8702 /* toast_widget.cpp in Compile Sources */,
079B51411D4935C0002FB6AF /* style_boxes.cpp in Compile Sources */,
0716C9741D058C8600797B22 /* moc_profile_inner_widget.cpp in Compile Sources */,
3ABE4F9B2264F770D944106D /* emojibox.cpp in Compile Sources */,
07D703BB19B88FB900C4EED2 /* moc_media_audio.cpp in Compile Sources */,