procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Projects ready for Xcode and QtCreator. Retina circle masks fixed. 9049004 beta.

This commit is contained in:
John Preston 2016-06-09 20:54:31 +03:00
parent dbe4a5b7c7
commit 3bb53b6ed1
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,49,3 FILEVERSION 0,9,49,4
PRODUCTVERSION 0,9,49,3 PRODUCTVERSION 0,9,49,4
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.49.3" VALUE "FileVersion", "0.9.49.4"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.49.3" VALUE "ProductVersion", "0.9.49.4"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,49,3 FILEVERSION 0,9,49,4
PRODUCTVERSION 0,9,49,3 PRODUCTVERSION 0,9,49,4
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.9.49.3" VALUE "FileVersion", "0.9.49.4"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.49.3" VALUE "ProductVersion", "0.9.49.4"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
Telegram/SourceFiles/core/version.h
View File

@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/basic_types.h" #include "core/basic_types.h"
#define BETA_VERSION_MACRO (9049003ULL) #define BETA_VERSION_MACRO (9049004ULL)
constexpr int AppVersion = 9049; constexpr int AppVersion = 9049;
constexpr str_const AppVersionStr = "0.9.49"; constexpr str_const AppVersionStr = "0.9.49";

6
Telegram/SourceFiles/ui/style/style_core.cpp
View File

@ -104,14 +104,14 @@ namespace internal {
QImage createCircleMask(int size, const QColor &bg, const QColor &fg) { QImage createCircleMask(int size, const QColor &bg, const QColor &fg) {
int realSize = size * cIntRetinaFactor(); int realSize = size * cIntRetinaFactor();
auto result = QImage(size, size, QImage::Format::Format_Grayscale8); auto result = QImage(realSize, realSize, QImage::Format::Format_Grayscale8);
{ {
QPainter pcircle(&result); QPainter pcircle(&result);
pcircle.setRenderHint(QPainter::HighQualityAntialiasing, true); pcircle.setRenderHint(QPainter::HighQualityAntialiasing, true);
pcircle.fillRect(0, 0, size, size, bg); pcircle.fillRect(0, 0, realSize, realSize, bg);
pcircle.setPen(Qt::NoPen); pcircle.setPen(Qt::NoPen);
pcircle.setBrush(fg); pcircle.setBrush(fg);
pcircle.drawEllipse(0, 0, size, size); pcircle.drawEllipse(0, 0, realSize, realSize);
} }
result.setDevicePixelRatio(cRetinaFactor()); result.setDevicePixelRatio(cRetinaFactor());
return result; return result;

6
Telegram/Telegram.pro
View File

@ -127,12 +127,14 @@ SOURCES += \
./SourceFiles/core/click_handler.cpp \ ./SourceFiles/core/click_handler.cpp \
./SourceFiles/core/click_handler_types.cpp \ ./SourceFiles/core/click_handler_types.cpp \
./SourceFiles/core/observer.cpp \ ./SourceFiles/core/observer.cpp \
./SourceFiles/data/data_abstract_structure.cpp \
./SourceFiles/data/data_drafts.cpp \ ./SourceFiles/data/data_drafts.cpp \
./SourceFiles/dialogs/dialogs_indexed_list.cpp \ ./SourceFiles/dialogs/dialogs_indexed_list.cpp \
./SourceFiles/dialogs/dialogs_layout.cpp \ ./SourceFiles/dialogs/dialogs_layout.cpp \
./SourceFiles/dialogs/dialogs_list.cpp \ ./SourceFiles/dialogs/dialogs_list.cpp \
./SourceFiles/dialogs/dialogs_row.cpp \ ./SourceFiles/dialogs/dialogs_row.cpp \
./SourceFiles/history/field_autocomplete.cpp \ ./SourceFiles/history/field_autocomplete.cpp \
./SourceFiles/history/history_service_layout.cpp \
./SourceFiles/inline_bots/inline_bot_layout_internal.cpp \ ./SourceFiles/inline_bots/inline_bot_layout_internal.cpp \
./SourceFiles/inline_bots/inline_bot_layout_item.cpp \ ./SourceFiles/inline_bots/inline_bot_layout_item.cpp \
./SourceFiles/inline_bots/inline_bot_result.cpp \ ./SourceFiles/inline_bots/inline_bot_result.cpp \
@ -275,14 +277,16 @@ HEADERS += \
./SourceFiles/core/observer.h \ ./SourceFiles/core/observer.h \
./SourceFiles/core/vector_of_moveable.h \ ./SourceFiles/core/vector_of_moveable.h \
./SourceFiles/core/version.h \ ./SourceFiles/core/version.h \
./SourceFiles/data/data_abstract_structure.h \
./SourceFiles/data/data_drafts.h \ ./SourceFiles/data/data_drafts.h \
./SourceFiles/dialogs/dialogs_common.h \ ./SourceFiles/dialogs/dialogs_common.h \
./SourceFiles/dialogs/dialogs_indexed_list.h \ ./SourceFiles/dialogs/dialogs_indexed_list.h \
./SourceFiles/dialogs/dialogs_layout.h \ ./SourceFiles/dialogs/dialogs_layout.h \
./SourceFiles/dialogs/dialogs_list.h \ ./SourceFiles/dialogs/dialogs_list.h \
./SourceFiles/dialogs/dialogs_row.h \ ./SourceFiles/dialogs/dialogs_row.h \
./SourceFiles/history/history_common.h \
./SourceFiles/history/field_autocomplete.h \ ./SourceFiles/history/field_autocomplete.h \
./SourceFiles/history/history_common.h \
./SourceFiles/history/history_service_layout.h \
./SourceFiles/inline_bots/inline_bot_layout_internal.h \ ./SourceFiles/inline_bots/inline_bot_layout_internal.h \
./SourceFiles/inline_bots/inline_bot_layout_item.h \ ./SourceFiles/inline_bots/inline_bot_layout_item.h \
./SourceFiles/inline_bots/inline_bot_result.h \ ./SourceFiles/inline_bots/inline_bot_result.h \

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

@ -110,6 +110,8 @@
0755AEDD1AD12A80004D738A /* moc_abstractbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0755AEDA1AD12A80004D738A /* moc_abstractbox.cpp */; }; 0755AEDD1AD12A80004D738A /* moc_abstractbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0755AEDA1AD12A80004D738A /* moc_abstractbox.cpp */; };
0755AEDE1AD12A80004D738A /* moc_intropwdcheck.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0755AEDB1AD12A80004D738A /* moc_intropwdcheck.cpp */; }; 0755AEDE1AD12A80004D738A /* moc_intropwdcheck.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0755AEDB1AD12A80004D738A /* moc_intropwdcheck.cpp */; };
0755AEDF1AD12A80004D738A /* moc_sessionsbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0755AEDC1AD12A80004D738A /* moc_sessionsbox.cpp */; }; 0755AEDF1AD12A80004D738A /* moc_sessionsbox.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0755AEDC1AD12A80004D738A /* moc_sessionsbox.cpp */; };
075CDF6A1D09E2BA009EA100 /* history_service_layout.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 075CDF681D09E2BA009EA100 /* history_service_layout.cpp */; };
075CDF6E1D09E2D0009EA100 /* data_abstract_structure.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 075CDF6C1D09E2D0009EA100 /* data_abstract_structure.cpp */; };
075FEBEC1C82336D0003ECA3 /* shortcuts.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 075FEBEA1C82336D0003ECA3 /* shortcuts.cpp */; }; 075FEBEC1C82336D0003ECA3 /* shortcuts.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 075FEBEA1C82336D0003ECA3 /* shortcuts.cpp */; };
0764D55A1ABAD6F900FBFEED /* apiwrap.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0764D5581ABAD6F900FBFEED /* apiwrap.cpp */; }; 0764D55A1ABAD6F900FBFEED /* apiwrap.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0764D5581ABAD6F900FBFEED /* apiwrap.cpp */; };
0764D55D1ABAD71B00FBFEED /* moc_apiwrap.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0764D55C1ABAD71B00FBFEED /* moc_apiwrap.cpp */; }; 0764D55D1ABAD71B00FBFEED /* moc_apiwrap.cpp in Compile Sources */ = {isa = PBXBuildFile; fileRef = 0764D55C1ABAD71B00FBFEED /* moc_apiwrap.cpp */; };
@ -494,6 +496,10 @@
0755AEDA1AD12A80004D738A /* moc_abstractbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_abstractbox.cpp; path = GeneratedFiles/Debug/moc_abstractbox.cpp; sourceTree = SOURCE_ROOT; }; 0755AEDA1AD12A80004D738A /* moc_abstractbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_abstractbox.cpp; path = GeneratedFiles/Debug/moc_abstractbox.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; }; 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; };
075CDF681D09E2BA009EA100 /* history_service_layout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = history_service_layout.cpp; path = SourceFiles/history/history_service_layout.cpp; sourceTree = SOURCE_ROOT; };
075CDF691D09E2BA009EA100 /* history_service_layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = history_service_layout.h; path = SourceFiles/history/history_service_layout.h; sourceTree = SOURCE_ROOT; };
075CDF6C1D09E2D0009EA100 /* data_abstract_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = data_abstract_structure.cpp; path = SourceFiles/data/data_abstract_structure.cpp; sourceTree = SOURCE_ROOT; };
075CDF6D1D09E2D0009EA100 /* data_abstract_structure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = data_abstract_structure.h; path = SourceFiles/data/data_abstract_structure.h; 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; }; 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; };
@ -938,6 +944,8 @@
0716C9A21D08255E00797B22 /* data */ = { 0716C9A21D08255E00797B22 /* data */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
075CDF6C1D09E2D0009EA100 /* data_abstract_structure.cpp */,
075CDF6D1D09E2D0009EA100 /* data_abstract_structure.h */,
0716C9A31D08256C00797B22 /* data_drafts.cpp */, 0716C9A31D08256C00797B22 /* data_drafts.cpp */,
0716C9A41D08256C00797B22 /* data_drafts.h */, 0716C9A41D08256C00797B22 /* data_drafts.h */,
); );
@ -1059,6 +1067,8 @@
076C51D21CE205120038F22A /* field_autocomplete.cpp */, 076C51D21CE205120038F22A /* field_autocomplete.cpp */,
076C51D31CE205120038F22A /* field_autocomplete.h */, 076C51D31CE205120038F22A /* field_autocomplete.h */,
076B1C571CBFC8D9002C0BC2 /* history_common.h */, 076B1C571CBFC8D9002C0BC2 /* history_common.h */,
075CDF681D09E2BA009EA100 /* history_service_layout.cpp */,
075CDF691D09E2BA009EA100 /* history_service_layout.h */,
); );
name = history; name = history;
sourceTree = "<group>"; sourceTree = "<group>";
@ -1959,6 +1969,7 @@
0716C9A11D08251C00797B22 /* style_history.cpp in Compile Sources */, 0716C9A11D08251C00797B22 /* style_history.cpp in Compile Sources */,
0716C94D1D0589A700797B22 /* profile_cover.cpp in Compile Sources */, 0716C94D1D0589A700797B22 /* profile_cover.cpp in Compile Sources */,
0716C95D1D058C1B00797B22 /* report_box.cpp in Compile Sources */, 0716C95D1D058C1B00797B22 /* report_box.cpp in Compile Sources */,
075CDF6A1D09E2BA009EA100 /* history_service_layout.cpp in Compile Sources */,
07DE92A71AA4925B00A18F6F /* autolockbox.cpp in Compile Sources */, 07DE92A71AA4925B00A18F6F /* autolockbox.cpp in Compile Sources */,
07D8509919F8320900623D75 /* usernamebox.cpp in Compile Sources */, 07D8509919F8320900623D75 /* usernamebox.cpp in Compile Sources */,
0747FF7E1CC6435100096FC3 /* style_basic_types.cpp in Compile Sources */, 0747FF7E1CC6435100096FC3 /* style_basic_types.cpp in Compile Sources */,
@ -1979,6 +1990,7 @@
07B604351B46A20900CA29FE /* moc_playerwidget.cpp in Compile Sources */, 07B604351B46A20900CA29FE /* moc_playerwidget.cpp in Compile Sources */,
8F6F5D7F82036331E8C6DAE6 /* moc_connection.cpp in Compile Sources */, 8F6F5D7F82036331E8C6DAE6 /* moc_connection.cpp in Compile Sources */,
0716C9531D0589A700797B22 /* profile_section_memento.cpp in Compile Sources */, 0716C9531D0589A700797B22 /* profile_section_memento.cpp in Compile Sources */,
075CDF6E1D09E2D0009EA100 /* data_abstract_structure.cpp in Compile Sources */,
B780F9E21269259B90A1F32A /* moc_dcenter.cpp in Compile Sources */, B780F9E21269259B90A1F32A /* moc_dcenter.cpp in Compile Sources */,
07080BCF1A43588C00741A51 /* lang_auto.cpp in Compile Sources */, 07080BCF1A43588C00741A51 /* lang_auto.cpp in Compile Sources */,
07539B1D1A1416AF00083EFC /* moc_history.cpp in Compile Sources */, 07539B1D1A1416AF00083EFC /* moc_history.cpp in Compile Sources */,

2
Telegram/build/version
View File

@ -3,4 +3,4 @@ AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.49 AppVersionStrSmall 0.9.49
AppVersionStr 0.9.49 AppVersionStr 0.9.49
AlphaChannel 0 AlphaChannel 0
BetaVersion 9049003 BetaVersion 9049004