procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

version 0.5.17 prepared: some crash fixes, multi media overview selection

This commit is contained in:
John Preston 2014-08-21 17:35:39 +04:00
parent 8a817eb204
commit 7bff0bcdb2
9 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/PrepareLinux.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.5.16 AppVersionStr=0.5.17
AppVersion=5016 AppVersion=5017
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!" echo "Deploy folder for version $AppVersionStr already exists!"

4
Telegram/PrepareLinux32.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.5.16 AppVersionStr=0.5.17
AppVersion=5016 AppVersion=5017
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!" echo "Deploy folder for version $AppVersionStr already exists!"

4
Telegram/PrepareMac.sh
View File

@ -1,5 +1,5 @@
AppVersionStr=0.5.16 AppVersionStr=0.5.17
AppVersion=5016 AppVersion=5017
if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
echo "Deploy folder for version $AppVersionStr already exists!" echo "Deploy folder for version $AppVersionStr already exists!"

6
Telegram/Setup.iss
View File

@ -3,9 +3,9 @@
#define MyAppShortName "Telegram" #define MyAppShortName "Telegram"
#define MyAppName "Telegram Win (Unofficial)" #define MyAppName "Telegram Win (Unofficial)"
#define MyAppVersion "0.5.16" #define MyAppVersion "0.5.17"
#define MyAppVersionZero "0.5.16" #define MyAppVersionZero "0.5.17"
#define MyAppFullVersion "0.5.16.0" #define MyAppFullVersion "0.5.17.0"
#define MyAppPublisher "Telegram (Unofficial)" #define MyAppPublisher "Telegram (Unofficial)"
#define MyAppURL "https://tdesktop.com" #define MyAppURL "https://tdesktop.com"
#define MyAppExeName "Telegram.exe" #define MyAppExeName "Telegram.exe"

4
Telegram/SourceFiles/config.h
View File

@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
*/ */
#pragma once #pragma once
static const int32 AppVersion = 5016; static const int32 AppVersion = 5017;
static const wchar_t *AppVersionStr = L"0.5.16"; static const wchar_t *AppVersionStr = L"0.5.17";
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
static const wchar_t *AppName = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Win (Unofficial)";
#else #else

12
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -392,6 +392,7 @@ void OverviewInner::dragActionStart(const QPoint &screenPos, Qt::MouseButton but
_selected.insert(_dragItem, selStatus); _selected.insert(_dragItem, selStatus);
_dragAction = Selecting; _dragAction = Selecting;
updateMsg(_dragItem, _dragItemIndex); updateMsg(_dragItem, _dragItemIndex);
_overview->updateTopBarSelection();
} else { } else {
_dragAction = PrepareSelect; _dragAction = PrepareSelect;
} }
@ -521,6 +522,7 @@ void OverviewInner::applyDragSelection() {
} }
_dragSelFrom = _dragSelTo = 0; _dragSelFrom = _dragSelTo = 0;
_dragSelFromIndex = _dragSelToIndex = -1; _dragSelFromIndex = _dragSelToIndex = -1;
_overview->updateTopBarSelection();
} }
QPoint OverviewInner::mapMouseToItem(QPoint p, MsgId itemId, int32 itemIndex) { QPoint OverviewInner::mapMouseToItem(QPoint p, MsgId itemId, int32 itemIndex) {
@ -1562,11 +1564,13 @@ void OverviewWidget::updateTopBarSelection() {
int32 selectedForForward, selectedForDelete; int32 selectedForForward, selectedForDelete;
_inner.getSelectionState(selectedForForward, selectedForDelete); _inner.getSelectionState(selectedForForward, selectedForDelete);
_selCount = selectedForDelete ? selectedForDelete : selectedForForward; _selCount = selectedForDelete ? selectedForDelete : selectedForForward;
App::main()->topBar()->showSelected(_selCount > 0 ? _selCount : 0); if (App::main()) {
if (!App::wnd()->layerShown()) { App::main()->topBar()->showSelected(_selCount > 0 ? _selCount : 0);
App::main()->topBar()->update();
}
if (App::wnd() && !App::wnd()->layerShown()) {
_inner.setFocus(); _inner.setFocus();
} }
App::main()->topBar()->update();
update(); update();
} }
@ -1652,6 +1656,8 @@ void OverviewWidget::fillSelectedItems(SelectedItemSet &sel, bool forDelete) {
} }
OverviewWidget::~OverviewWidget() { OverviewWidget::~OverviewWidget() {
onClearSelected();
updateTopBarSelection();
} }
void OverviewWidget::activate() { void OverviewWidget::activate() {

2
Telegram/Telegram.plist
View File

@ -11,7 +11,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.5.16</string> <string>0.5.17</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>NOTE</key> <key>NOTE</key>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

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

@ -1478,7 +1478,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.5.16; CURRENT_PROJECT_VERSION = 0.5.17;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -1496,7 +1496,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.5.16; CURRENT_PROJECT_VERSION = 0.5.17;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast; GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@ -1521,10 +1521,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.5.16; CURRENT_PROJECT_VERSION = 0.5.17;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5; DYLIB_COMPATIBILITY_VERSION = 0.5;
DYLIB_CURRENT_VERSION = 0.5.16; DYLIB_CURRENT_VERSION = 0.5.17;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
@ -1650,10 +1650,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.5.16; CURRENT_PROJECT_VERSION = 0.5.17;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5; DYLIB_COMPATIBILITY_VERSION = 0.5;
DYLIB_CURRENT_VERSION = 0.5.16; DYLIB_CURRENT_VERSION = 0.5.17;
FRAMEWORK_SEARCH_PATHS = ""; FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;