From c5182abc7d6ac988e087865ebb43a0db130f29ca Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 30 Jul 2014 12:13:09 +0400 Subject: [PATCH] fixed file saving with bad names, version 0.5.12 prepared --- Telegram/PrepareLinux.sh | 4 ++-- Telegram/PrepareLinux32.sh | 4 ++-- Telegram/PrepareMac.sh | 4 ++-- Telegram/Setup.iss | 6 +++--- Telegram/SourceFiles/art/icons.png | Bin 4273 -> 0 bytes Telegram/SourceFiles/config.h | 4 ++-- Telegram/SourceFiles/history.cpp | 7 +++++++ Telegram/Telegram.plist | 2 +- Telegram/Telegram.rc | Bin 5566 -> 5566 bytes Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++------ 10 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 Telegram/SourceFiles/art/icons.png diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh index 4c4514f2bc616..7876847264e9d 100755 --- a/Telegram/PrepareLinux.sh +++ b/Telegram/PrepareLinux.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.5.11 -AppVersion=5011 +AppVersionStr=0.5.12 +AppVersion=5012 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 7afa796077851..4b0e9af46d67f 100755 --- a/Telegram/PrepareLinux32.sh +++ b/Telegram/PrepareLinux32.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.5.11 -AppVersion=5011 +AppVersionStr=0.5.12 +AppVersion=5012 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 6ea0dad9b651e..815cce9e72dd7 100755 --- a/Telegram/PrepareMac.sh +++ b/Telegram/PrepareMac.sh @@ -1,5 +1,5 @@ -AppVersionStr=0.5.11 -AppVersion=5011 +AppVersionStr=0.5.12 +AppVersion=5012 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 675df36ce3e01..4f97c38329d03 100644 --- a/Telegram/Setup.iss +++ b/Telegram/Setup.iss @@ -3,9 +3,9 @@ #define MyAppShortName "Telegram" #define MyAppName "Telegram Win (Unofficial)" -#define MyAppVersion "0.5.11" -#define MyAppVersionZero "0.5.11" -#define MyAppFullVersion "0.5.11.0" +#define MyAppVersion "0.5.12" +#define MyAppVersionZero "0.5.12" +#define MyAppFullVersion "0.5.12.0" #define MyAppPublisher "Telegram (Unofficial)" #define MyAppURL "https://tdesktop.com" #define MyAppExeName "Telegram.exe" diff --git a/Telegram/SourceFiles/art/icons.png b/Telegram/SourceFiles/art/icons.png deleted file mode 100644 index 6729c2a2ff828d78a8829165788b560dfc586ca2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4273 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 T!pLG>00000NkvXXu0mjfkC6l- diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 4d022aae6d371..886c85538cb1a 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 = 5011; -static const wchar_t *AppVersionStr = L"0.5.11"; +static const int32 AppVersion = 5012; +static const wchar_t *AppVersionStr = L"0.5.12"; #ifdef Q_OS_WIN static const wchar_t *AppName = L"Telegram Win (Unofficial)"; #else diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index 092f245fdaaaa..b40705a050b9c 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -227,6 +227,13 @@ void PhotoLink::onClick(Qt::MouseButton button) const { } QString saveFileName(const QString &title, const QString &filter, const QString &prefix, QString name, bool savingAs, const QDir &dir = QDir()) { +#ifdef Q_OS_WIN + name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); +#elif defined Q_OS_MAC + name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); +#elif defined Q_OS_LINUX + name = name.replace(QRegularExpression(qsl("[\\/]")), qsl("_")); +#endif if (cAskDownloadPath() || savingAs) { if (!name.isEmpty() && name.at(0) == QChar::fromLatin1('.')) { name = filedialogDefaultName(prefix, name); diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index 4dca2881be2b0..78d5ff23cb776 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.11 + 0.5.12 CFBundleSignature ???? NOTE diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index bb58d14548196ad3e75263776fd45a17c5281fb5..ad303d9610623bab2d75edd026a4704beb52d182 100644 GIT binary patch delta 58 zcmdm|y-$0C9yg=WWPNU9RwD)-27}2Pxg|F@a2GKFxq3kETwdMHDtvN`aIW~~IQ|4S E0JbO&4gdfE delta 58 zcmdm|y-$0C9yg=mWPNU9Rzn6I27}2Pxg|F@a2GKFxq3kETwdMHDtvN`aIW~~IQ|4S E0JWbE3IG5A diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index d9d60b5fac747..a36ed7e6e63b9 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1453,7 +1453,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.5.11; + CURRENT_PROJECT_VERSION = 0.5.12; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1471,7 +1471,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.5.11; + CURRENT_PROJECT_VERSION = 0.5.12; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1495,9 +1495,9 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.5.11; + CURRENT_PROJECT_VERSION = 0.5.12; DYLIB_COMPATIBILITY_VERSION = 0.5; - DYLIB_CURRENT_VERSION = 0.5.11; + DYLIB_CURRENT_VERSION = 0.5.12; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; @@ -1620,10 +1620,10 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.5.11; + CURRENT_PROJECT_VERSION = 0.5.12; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.5; - DYLIB_CURRENT_VERSION = 0.5.11; + DYLIB_CURRENT_VERSION = 0.5.12; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0;