From 78f55c10e912cda2b43f50ff7e45b32663bec29e Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 11 Nov 2016 23:01:00 +0300 Subject: [PATCH] Closed beta 10019006: left main menu. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 2 +- Telegram/SourceFiles/ui/widgets/buttons.h | 5 +++-- Telegram/build/version | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index d757b76cd..4b0dbe013 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,19,5 - PRODUCTVERSION 0,10,19,5 + FILEVERSION 0,10,19,6 + PRODUCTVERSION 0,10,19,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.10.19.5" + VALUE "FileVersion", "0.10.19.6" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.19.5" + VALUE "ProductVersion", "0.10.19.6" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index abf93f304..99ce4ed04 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,19,5 - PRODUCTVERSION 0,10,19,5 + FILEVERSION 0,10,19,6 + PRODUCTVERSION 0,10,19,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.10.19.5" + VALUE "FileVersion", "0.10.19.6" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.19.5" + VALUE "ProductVersion", "0.10.19.6" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 169174315..e9ddd6088 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/utils.h" -#define BETA_VERSION_MACRO (10019005ULL) +#define BETA_VERSION_MACRO (10019006ULL) constexpr int AppVersion = 10020; constexpr str_const AppVersionStr = "0.10.20"; diff --git a/Telegram/SourceFiles/ui/widgets/buttons.h b/Telegram/SourceFiles/ui/widgets/buttons.h index cf6557d03..f7c1011a5 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.h +++ b/Telegram/SourceFiles/ui/widgets/buttons.h @@ -30,7 +30,6 @@ public: FlatButton(QWidget *parent, const QString &text, const style::FlatButton &st); void step_appearance(float64 ms, bool timer); - void paintEvent(QPaintEvent *e); void setOpacity(float64 o); float64 opacity() const; @@ -40,11 +39,13 @@ public: int32 textWidth() const; protected: + void paintEvent(QPaintEvent *e) override; + void onStateChanged(int oldState, StateChangeSource source) override; private: QString _text, _textForAutoSize; - int _width, _textWidth; + int _width; const style::FlatButton &_st; diff --git a/Telegram/build/version b/Telegram/build/version index 42cb9bf9d..10659728d 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -3,4 +3,4 @@ AppVersionStrMajor 0.10 AppVersionStrSmall 0.10.20 AppVersionStr 0.10.20 AlphaChannel 0 -BetaVersion 10019005 +BetaVersion 10019006