From 276e122b6275d22384421bba43e0ff96c0dc402c Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 30 Sep 2014 12:24:56 -0700 Subject: [PATCH] fixed context menus, version 0.6.1 --- Telegram/PrepareLinux.sh | 4 ++-- Telegram/PrepareLinux32.sh | 4 ++-- Telegram/PrepareMac.sh | 4 ++-- Telegram/Setup.iss | 6 +++--- Telegram/SignWinSetup.bat | 2 +- Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/gui/contextmenu.cpp | 3 +-- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5542 -> 5542 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ 10 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh index 9e811ddf2..8db6e1487 100755 --- a/Telegram/PrepareLinux.sh +++ b/Telegram/PrepareLinux.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.0 -AppVersion=6000 +AppVersionStr=0.6.1 +AppVersion=6001 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh index 8fd9e5ede..9b15a215a 100755 --- a/Telegram/PrepareLinux32.sh +++ b/Telegram/PrepareLinux32.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.0 -AppVersion=6000 +AppVersionStr=0.6.1 +AppVersion=6001 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh index a300b965f..037507202 100755 --- a/Telegram/PrepareMac.sh +++ b/Telegram/PrepareMac.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.6.0 -AppVersion=6000 +AppVersionStr=0.6.1 +AppVersion=6001 if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss index 66e309171..8f860e4c1 100644 --- a/Telegram/Setup.iss +++ b/Telegram/Setup.iss @@ -3,9 +3,9 @@ #define MyAppShortName "Telegram" #define MyAppName "Telegram Desktop" -#define MyAppVersion "0.6" -#define MyAppVersionZero "0.6.0" -#define MyAppFullVersion "0.6.0.0" +#define MyAppVersion "0.6.1" +#define MyAppVersionZero "0.6.1" +#define MyAppFullVersion "0.6.1.0" #define MyAppPublisher "Telegram Messenger LLP" #define MyAppURL "https://tdesktop.com" #define MyAppExeName "Telegram.exe" diff --git a/Telegram/SignWinSetup.bat b/Telegram/SignWinSetup.bat index 97782e52b..c7944ac55 100644 --- a/Telegram/SignWinSetup.bat +++ b/Telegram/SignWinSetup.bat @@ -1,3 +1,3 @@ cd ..\Win32\Deploy -call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.0.exe +call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.1.exe cd ..\..\Telegram diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index ef5cffda4..728e5aca0 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com */ #pragma once -static const int32 AppVersion = 6000; -static const wchar_t *AppVersionStr = L"0.6"; +static const int32 AppVersion = 6001; +static const wchar_t *AppVersionStr = L"0.6.1"; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; diff --git a/Telegram/SourceFiles/gui/contextmenu.cpp b/Telegram/SourceFiles/gui/contextmenu.cpp index f02f84f17..bebf47243 100644 --- a/Telegram/SourceFiles/gui/contextmenu.cpp +++ b/Telegram/SourceFiles/gui/contextmenu.cpp @@ -23,7 +23,7 @@ #include "lang.h" -ContextMenu::ContextMenu(QWidget *parent, const style::iconedButton &st) : TWidget(parent), +ContextMenu::ContextMenu(QWidget *parent, const style::iconedButton &st) : TWidget(0), _hiding(false), _buttonStyle(st), _shadow(st::dropdownShadow), _selected(-1), a_opacity(0), _deleteOnHide(false) { resetActions(); @@ -207,7 +207,6 @@ void ContextMenu::showStart() { a_opacity.start(1); anim::start(this); animStep(0); - setParent(0); psUpdateOverlayed(this); show(); windowHandle()->requestActivate(); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index a2f405dea..11202a800 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.6.0 + 0.6.1 CFBundleSignature ???? NOTE diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 2e05aedb6d2198d02066ffba4b6bfd12d4508214..270685eef6932627732728c4e14dd4618abfa9f3 100644 GIT binary patch delta 42 vcmZ3cy-a(94mYFWWL<7UM#IhV-2F^I>OHSDBT(!;uk_>yexc0~{C;cz3H=NU delta 42 vcmZ3cy-a(94mYF0WL<7UMuW}q-2F^I>OHSDBT(!;uk_>yexc0~{C;cz37iZE diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index b2e912e4a..85e5e35ac 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1497,7 +1497,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.6.0; + CURRENT_PROJECT_VERSION = 0.6.1; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1515,7 +1515,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.6.0; + CURRENT_PROJECT_VERSION = 0.6.1; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1541,10 +1541,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.6.0; + CURRENT_PROJECT_VERSION = 0.6.1; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.6; - DYLIB_CURRENT_VERSION = 0.6.0; + DYLIB_CURRENT_VERSION = 0.6.1; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1683,10 +1683,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.6.0; + CURRENT_PROJECT_VERSION = 0.6.1; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.6; - DYLIB_CURRENT_VERSION = 0.6.0; + DYLIB_CURRENT_VERSION = 0.6.1; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;