From f66d8ee0f815517706d7d99350fa0a78806cf90a Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 9 Feb 2015 23:29:02 +0000 Subject: [PATCH] version 0.7.13 prepared --- Telegram/PrepareWin.bat | 8 ++++---- Telegram/SourceFiles/config.h | 6 +++--- Telegram/SourceFiles/settingswidget.cpp | 2 +- Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5540 -> 5540 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ Telegram/Version.sh | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat index 8ac8fb365..85f198972 100644 --- a/Telegram/PrepareWin.bat +++ b/Telegram/PrepareWin.bat @@ -1,9 +1,9 @@ @echo OFF -set "AppVersionStrSmall=0.7.12" -set "AppVersionStr=0.7.12" -set "AppVersionStrFull=0.7.12.0" -set "DevChannel=1" +set "AppVersionStrSmall=0.7.13" +set "AppVersionStr=0.7.13" +set "AppVersionStrFull=0.7.13.0" +set "DevChannel=0" if %DevChannel% neq 0 goto preparedev diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 9095934f4..9ddf8fa7a 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,9 +17,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org */ #pragma once -static const int32 AppVersion = 7012; -static const wchar_t *AppVersionStr = L"0.7.12"; -static const bool DevChannel = true; +static const int32 AppVersion = 7013; +static const wchar_t *AppVersionStr = L"0.7.13"; +static const bool DevChannel = false; static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/settingswidget.cpp b/Telegram/SourceFiles/settingswidget.cpp index 6b65139dd..d4ce0095d 100644 --- a/Telegram/SourceFiles/settingswidget.cpp +++ b/Telegram/SourceFiles/settingswidget.cpp @@ -219,7 +219,7 @@ SettingsInner::SettingsInner(SettingsWidget *parent) : QWidget(parent), connect(&_dpiAutoScale, SIGNAL(changed()), this, SLOT(onScaleAuto())); connect(&_dpiSlider, SIGNAL(changed(int32)), this, SLOT(onScaleChange())); - _curVersionText = lng_settings_current_version(lt_version, QString::fromWCharArray(AppVersionStr)) + ' '; + _curVersionText = lng_settings_current_version(lt_version, QString::fromWCharArray(AppVersionStr) + (DevChannel ? " dev" : "")) + ' '; _curVersionWidth = st::linkFont->m.width(_curVersionText); _newVersionText = lang(lng_settings_update_ready) + ' '; _newVersionWidth = st::linkFont->m.width(_newVersionText); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 4e908471b..9cf7885e5 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.7.12 + 0.7.13 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 7276603a096df370237752f66fc2f95280bc60fa..95f91a44fc0475099ec65e45a7f8a68f305288cd 100644 GIT binary patch delta 53 zcmZ3Yy+nIM5ig_h