Skip to content

Commit 276e122

Browse files
committed
fixed context menus, version 0.6.1
1 parent c216a88 commit 276e122

File tree

10 files changed

+20
-21
lines changed

10 files changed

+20
-21
lines changed

Telegram/PrepareLinux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AppVersionStr=0.6.0
2-
AppVersion=6000
1+
AppVersionStr=0.6.1
2+
AppVersion=6001
33

44
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
55
echo "Deploy folder for version $AppVersionStr already exists!"

Telegram/PrepareLinux32.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AppVersionStr=0.6.0
2-
AppVersion=6000
1+
AppVersionStr=0.6.1
2+
AppVersion=6001
33

44
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
55
echo "Deploy folder for version $AppVersionStr already exists!"

Telegram/PrepareMac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AppVersionStr=0.6.0
2-
AppVersion=6000
1+
AppVersionStr=0.6.1
2+
AppVersion=6001
33

44
if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
55
echo "Deploy folder for version $AppVersionStr already exists!"

Telegram/Setup.iss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#define MyAppShortName "Telegram"
55
#define MyAppName "Telegram Desktop"
6-
#define MyAppVersion "0.6"
7-
#define MyAppVersionZero "0.6.0"
8-
#define MyAppFullVersion "0.6.0.0"
6+
#define MyAppVersion "0.6.1"
7+
#define MyAppVersionZero "0.6.1"
8+
#define MyAppFullVersion "0.6.1.0"
99
#define MyAppPublisher "Telegram Messenger LLP"
1010
#define MyAppURL "https://tdesktop.com"
1111
#define MyAppExeName "Telegram.exe"

Telegram/SignWinSetup.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cd ..\Win32\Deploy
2-
call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.0.exe
2+
call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.1.exe
33
cd ..\..\Telegram

Telegram/SourceFiles/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
1717
*/
1818
#pragma once
1919

20-
static const int32 AppVersion = 6000;
21-
static const wchar_t *AppVersionStr = L"0.6";
20+
static const int32 AppVersion = 6001;
21+
static const wchar_t *AppVersionStr = L"0.6.1";
2222
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
2323
static const wchar_t *AppName = L"Telegram Desktop";
2424
static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}";

Telegram/SourceFiles/gui/contextmenu.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "lang.h"
2525

26-
ContextMenu::ContextMenu(QWidget *parent, const style::iconedButton &st) : TWidget(parent),
26+
ContextMenu::ContextMenu(QWidget *parent, const style::iconedButton &st) : TWidget(0),
2727
_hiding(false), _buttonStyle(st), _shadow(st::dropdownShadow), _selected(-1), a_opacity(0), _deleteOnHide(false) {
2828
resetActions();
2929

@@ -207,7 +207,6 @@ void ContextMenu::showStart() {
207207
a_opacity.start(1);
208208
anim::start(this);
209209
animStep(0);
210-
setParent(0);
211210
psUpdateOverlayed(this);
212211
show();
213212
windowHandle()->requestActivate();

Telegram/Telegram.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundlePackageType</key>
1212
<string>APPL</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>0.6.0</string>
14+
<string>0.6.1</string>
1515
<key>CFBundleSignature</key>
1616
<string>????</string>
1717
<key>NOTE</key>

Telegram/Telegram.rc

0 Bytes
Binary file not shown.

Telegram/Telegram.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@
14971497
buildSettings = {
14981498
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
14991499
COPY_PHASE_STRIP = NO;
1500-
CURRENT_PROJECT_VERSION = 0.6.0;
1500+
CURRENT_PROJECT_VERSION = 0.6.1;
15011501
DEBUG_INFORMATION_FORMAT = dwarf;
15021502
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
15031503
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1515,7 +1515,7 @@
15151515
buildSettings = {
15161516
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
15171517
COPY_PHASE_STRIP = YES;
1518-
CURRENT_PROJECT_VERSION = 0.6.0;
1518+
CURRENT_PROJECT_VERSION = 0.6.1;
15191519
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
15201520
GCC_OPTIMIZATION_LEVEL = fast;
15211521
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1541,10 +1541,10 @@
15411541
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
15421542
CODE_SIGN_IDENTITY = "";
15431543
COPY_PHASE_STRIP = NO;
1544-
CURRENT_PROJECT_VERSION = 0.6.0;
1544+
CURRENT_PROJECT_VERSION = 0.6.1;
15451545
DEBUG_INFORMATION_FORMAT = dwarf;
15461546
DYLIB_COMPATIBILITY_VERSION = 0.6;
1547-
DYLIB_CURRENT_VERSION = 0.6.0;
1547+
DYLIB_CURRENT_VERSION = 0.6.1;
15481548
ENABLE_STRICT_OBJC_MSGSEND = YES;
15491549
FRAMEWORK_SEARCH_PATHS = "";
15501550
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1683,10 +1683,10 @@
16831683
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
16841684
CODE_SIGN_IDENTITY = "";
16851685
COPY_PHASE_STRIP = NO;
1686-
CURRENT_PROJECT_VERSION = 0.6.0;
1686+
CURRENT_PROJECT_VERSION = 0.6.1;
16871687
DEBUG_INFORMATION_FORMAT = dwarf;
16881688
DYLIB_COMPATIBILITY_VERSION = 0.6;
1689-
DYLIB_CURRENT_VERSION = 0.6.0;
1689+
DYLIB_CURRENT_VERSION = 0.6.1;
16901690
ENABLE_STRICT_OBJC_MSGSEND = YES;
16911691
FRAMEWORK_SEARCH_PATHS = "";
16921692
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

0 commit comments

Comments
 (0)