RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

This commit is contained in:
John Preston 2015-01-16 19:46:13 +03:00
parent 1ca86a2390 13887d91d9
commit 23cc9d866b
10 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/PrepareWin.bat
View File

@ -1,8 +1,8 @@
@echo OFF
set "AppVersionStrSmall=0.7.7"
set "AppVersionStr=0.7.7"
set "AppVersionStrFull=0.7.7.0"
set "AppVersionStrSmall=0.7.8"
set "AppVersionStr=0.7.8"
set "AppVersionStrFull=0.7.8.0"
echo.
echo Preparing version %AppVersionStr%..

2
Telegram/Resources/style.txt
View File

@ -222,7 +222,7 @@ cbDefFlat: flatCheckbox {
imageRect: sprite(140px, 68px, 22px, 22px);
chkImageRect: sprite(115px, 68px, 22px, 22px);
overImageRect: sprite(140px, 68px, 22px, 22px);
overImageRect: sprite(190px, 68px, 22px, 22px);
chkOverImageRect: sprite(115px, 68px, 22px, 22px);
disImageRect: sprite(140px, 43px, 22px, 22px);
chkDisImageRect: sprite(115px, 43px, 22px, 22px);

BIN
Telegram/SourceFiles/art/sprite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

BIN
Telegram/SourceFiles/art/sprite_200x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 104 KiB

4
Telegram/SourceFiles/config.h
View File

@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
*/
#pragma once
static const int32 AppVersion = 7007;
static const wchar_t *AppVersionStr = L"0.7.7";
static const int32 AppVersion = 7008;
static const wchar_t *AppVersionStr = L"0.7.8";
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
static const wchar_t *AppName = L"Telegram Desktop";

8
Telegram/SourceFiles/historywidget.cpp
View File

@ -381,7 +381,7 @@ void HistoryList::dragActionStart(const QPoint &screenPos, Qt::MouseButton butto
if (_selected.cbegin().value() == FullItemSel) {
if (_selected.constFind(_dragItem) != _selected.cend() && App::hoveredItem()) {
_dragAction = PrepareDrag; // start items drag
} else {
} else if (!_dragWasInactive) {
_dragAction = PrepareSelect; // start items select
}
}
@ -428,7 +428,7 @@ void HistoryList::dragActionStart(const QPoint &screenPos, Qt::MouseButton butto
}
if (uponSelected) {
_dragAction = PrepareDrag; // start text drag
} else {
} else if (!_dragWasInactive) {
if (afterDragSymbol) ++_dragSymbol;
uint32 selStatus = (_dragSymbol << 16) | _dragSymbol;
if (selStatus != FullItemSel && (_selected.isEmpty() || _selected.cbegin().value() != FullItemSel)) {
@ -443,7 +443,7 @@ void HistoryList::dragActionStart(const QPoint &screenPos, Qt::MouseButton butto
_dragAction = PrepareSelect;
}
}
} else {
} else if (!_dragWasInactive) {
_dragAction = PrepareSelect; // start items select
}
}
@ -594,6 +594,8 @@ void HistoryList::mouseDoubleClickEvent(QMouseEvent *e) {
_trippleClickPoint = e->globalPos();
_trippleClickTimer.start(QApplication::doubleClickInterval());
}
} else {
mousePressEvent(e);
}
}

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.7.7</string>
<string>0.7.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1625,7 +1625,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.7.7;
CURRENT_PROJECT_VERSION = 0.7.8;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@ -1643,7 +1643,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.7.7;
CURRENT_PROJECT_VERSION = 0.7.8;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1669,10 +1669,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.7.7;
CURRENT_PROJECT_VERSION = 0.7.8;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.7;
DYLIB_CURRENT_VERSION = 0.7.7;
DYLIB_CURRENT_VERSION = 0.7.8;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -1812,10 +1812,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.7.7;
CURRENT_PROJECT_VERSION = 0.7.8;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.7;
DYLIB_CURRENT_VERSION = 0.7.7;
DYLIB_CURRENT_VERSION = 0.7.8;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

2
Telegram/Version.sh
View File

@ -1,2 +1,2 @@
echo 7007 0.7.7
echo 7008 0.7.8