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

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

This commit is contained in:
John Preston 2014-08-12 00:54:45 +04:00
parent ed3d5cf0ef 7f976fa251
commit 73b6ec8ff0
11 changed files with 30 additions and 22 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.14 AppVersionStr=0.5.15
AppVersion=5014 AppVersion=5015
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.14 AppVersionStr=0.5.15
AppVersion=5014 AppVersion=5015
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.14 AppVersionStr=0.5.15
AppVersion=5014 AppVersion=5015
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.14" #define MyAppVersion "0.5.15"
#define MyAppVersionZero "0.5.14" #define MyAppVersionZero "0.5.15"
#define MyAppFullVersion "0.5.14.0" #define MyAppFullVersion "0.5.15.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 = 5014; static const int32 AppVersion = 5015;
static const wchar_t *AppVersionStr = L"0.5.14"; static const wchar_t *AppVersionStr = L"0.5.15";
#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

11
Telegram/SourceFiles/history.cpp
View File

@ -1087,8 +1087,9 @@ HistoryItem *History::doAddToBack(HistoryBlock *to, bool newBlock, HistoryItem *
HistoryMedia *media = adding->getMedia(true); HistoryMedia *media = adding->getMedia(true);
if (media && media->type() == MediaTypePhoto) { if (media && media->type() == MediaTypePhoto) {
if (_photosOverviewIds.constFind(adding->id) == _photosOverviewIds.cend()) { if (_photosOverviewIds.constFind(adding->id) == _photosOverviewIds.cend()) {
_photosOverview.push_front(adding->id); _photosOverview.push_back(adding->id);
_photosOverviewIds.insert(adding->id); _photosOverviewIds.insert(adding->id);
if (_photosOverviewCount > 0) ++_photosOverviewCount;
if (App::wnd()) App::wnd()->mediaOverviewUpdated(peer); if (App::wnd()) App::wnd()->mediaOverviewUpdated(peer);
} }
} }
@ -1727,6 +1728,12 @@ void HistoryItem::destroy() {
for (History::MediaOverview::iterator i = history()->_photosOverview.begin(), e = history()->_photosOverview.end(); i != e; ++i) { for (History::MediaOverview::iterator i = history()->_photosOverview.begin(), e = history()->_photosOverview.end(); i != e; ++i) {
if ((*i) == id) { if ((*i) == id) {
history()->_photosOverview.erase(i); history()->_photosOverview.erase(i);
if (history()->_photosOverviewCount > 0) {
--history()->_photosOverviewCount;
if (!history()->_photosOverviewCount) {
history()->_photosOverviewCount = -1;
}
}
break; break;
} }
} }
@ -1848,7 +1855,7 @@ HistoryMedia *HistoryPhoto::clone() const {
void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, const QString &time, int32 timeWidth, bool selected) const { void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, const QString &time, int32 timeWidth, bool selected) const {
data->full->load(false, false); data->full->load(false, false);
bool out = parent->out(); bool out = parent->out();
if (parent != App::contextItem()/* || App::wnd()->photoShown() != data*/) { if (parent != App::contextItem() || /*App::wnd()->photoShown() != data*/ true) {
if (data->full->loaded()) { if (data->full->loaded()) {
p.drawPixmap(0, 0, data->full->pix(_maxw, _height)); p.drawPixmap(0, 0, data->full->pix(_maxw, _height));
} else { } else {

3
Telegram/SourceFiles/mediaview.cpp
View File

@ -61,8 +61,7 @@ void MediaView::moveToScreen() {
if (!geom.contains(_avail)) { if (!geom.contains(_avail)) {
_avail = geom; _avail = geom;
} }
_avail.setX(_avail.x() - geom.x()); _avail.moveTo(0, 0);
_avail.setY(_avail.y() - geom.y());
_maxWidth = _avail.width() - 2 * st::medviewNavBarWidth; _maxWidth = _avail.width() - 2 * st::medviewNavBarWidth;
_maxHeight = _avail.height() - st::medviewTopSkip - st::medviewBottomSkip; _maxHeight = _avail.height() - st::medviewTopSkip - st::medviewBottomSkip;
_leftNav = QRect(0, 0, st::medviewNavBarWidth, height()); _leftNav = QRect(0, 0, st::medviewNavBarWidth, height());

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.14</string> <string>0.5.15</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>NOTE</key> <key>NOTE</key>

2
Telegram/Telegram.pro
View File

@ -88,6 +88,7 @@ SOURCES += \
./SourceFiles/historywidget.cpp \ ./SourceFiles/historywidget.cpp \
./SourceFiles/langloaderplain.cpp \ ./SourceFiles/langloaderplain.cpp \
./SourceFiles/layerwidget.cpp \ ./SourceFiles/layerwidget.cpp \
./SourceFiles/mediaview.cpp \
./SourceFiles/profilewidget.cpp \ ./SourceFiles/profilewidget.cpp \
./SourceFiles/localimageloader.cpp \ ./SourceFiles/localimageloader.cpp \
./SourceFiles/logs.cpp \ ./SourceFiles/logs.cpp \
@ -156,6 +157,7 @@ HEADERS += \
./SourceFiles/historywidget.h \ ./SourceFiles/historywidget.h \
./SourceFiles/langloaderplain.h \ ./SourceFiles/langloaderplain.h \
./SourceFiles/layerwidget.h \ ./SourceFiles/layerwidget.h \
./SourceFiles/mediaview.h \
./SourceFiles/profilewidget.h \ ./SourceFiles/profilewidget.h \
./SourceFiles/localimageloader.h \ ./SourceFiles/localimageloader.h \
./SourceFiles/logs.h \ ./SourceFiles/logs.h \

BIN
Telegram/Telegram.rc
View File

Binary file not shown.

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

@ -1468,7 +1468,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.14; CURRENT_PROJECT_VERSION = 0.5.15;
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;
@ -1486,7 +1486,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.14; CURRENT_PROJECT_VERSION = 0.5.15;
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;
@ -1511,10 +1511,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.14; CURRENT_PROJECT_VERSION = 0.5.15;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5; DYLIB_COMPATIBILITY_VERSION = 0.5;
DYLIB_CURRENT_VERSION = 0.5.14; DYLIB_CURRENT_VERSION = 0.5.15;
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;
@ -1640,10 +1640,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.14; CURRENT_PROJECT_VERSION = 0.5.15;
DEBUG_INFORMATION_FORMAT = dwarf; DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.5; DYLIB_COMPATIBILITY_VERSION = 0.5;
DYLIB_CURRENT_VERSION = 0.5.14; DYLIB_CURRENT_VERSION = 0.5.15;
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;