mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into video

Browse Source 
Conflicts:
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/ui/animation.cpp
	Telegram/Telegram.pro
This commit is contained in:
John Preston
2016-07-11 21:12:10 +03:00
parent 356b48bcca 5c474aee27
commit d806d079a2
65 changed files with 1990 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/SourceFiles/application.cpp
View File

@@ -1051,8 +1051,12 @@ void AppClass::checkMapVersion() {
if (Local::oldMapVersion() < AppVersion) {
if (Local::oldMapVersion()) {
QString versionFeatures;
if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9055) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Main window position and size are saved between the launches in Windows\n\xe2\x80\x94 Dock and top bar hiding fixed in OS X\n\xe2\x80\x94 Various design improvements and other bug fixes");
if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9057) {
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements\n\xe2\x80\x94 Linux : trying to use GTK file chooser when it is available");
#else // Q_OS_LINUX32 || Q_OS_LINUX64
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements");
#endif // Q_OS_LINUX32 || Q_OS_LINUX64
// versionFeatures = langNewVersionText();
} else if (Local::oldMapVersion() < 9056) {
versionFeatures = langNewVersionText();