hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-09 04:26:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
eegorov 2016-05-12 09:09:10 +06:00
commit 8963bff56c
10 changed files with 42 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View file

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,47,0 FILEVERSION 0,9,48,0
PRODUCTVERSION 0,9,47,0 PRODUCTVERSION 0,9,48,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.9.47.0" VALUE "FileVersion", "0.9.48.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.47.0" VALUE "ProductVersion", "0.9.48.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View file

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,9,47,0 FILEVERSION 0,9,48,0
PRODUCTVERSION 0,9,47,0 PRODUCTVERSION 0,9,48,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.9.47.0" VALUE "FileVersion", "0.9.48.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.9.47.0" VALUE "ProductVersion", "0.9.48.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

6
Telegram/SourceFiles/core/version.h
View file

@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 9047; constexpr int AppVersion = 9048;
constexpr str_const AppVersionStr = "0.9.47"; constexpr str_const AppVersionStr = "0.9.48";
constexpr bool AppAlphaVersion = true; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

16
Telegram/SourceFiles/localstorage.cpp
View file

@ -2301,8 +2301,10 @@ namespace Local {
EncryptedDescriptor data(sizeof(quint64) + Serialize::stringSize(msgDraft.text) + 2 * sizeof(qint32) + Serialize::stringSize(editDraft.text) + 2 * sizeof(qint32)); EncryptedDescriptor data(sizeof(quint64) + Serialize::stringSize(msgDraft.text) + 2 * sizeof(qint32) + Serialize::stringSize(editDraft.text) + 2 * sizeof(qint32));
data.stream << quint64(peer); data.stream << quint64(peer);
data.stream << msgDraft.text << qint32(msgDraft.msgId) << qint32(msgDraft.previewCancelled ? 1 : 0); data.stream << msgDraft.text << QByteArray();
data.stream << editDraft.text << qint32(editDraft.msgId) << qint32(editDraft.previewCancelled ? 1 : 0); data.stream << qint32(msgDraft.msgId) << qint32(msgDraft.previewCancelled ? 1 : 0);
data.stream << editDraft.text << QByteArray();
data.stream << qint32(editDraft.msgId) << qint32(editDraft.previewCancelled ? 1 : 0);
FileWriteDescriptor file(i.value()); FileWriteDescriptor file(i.value());
file.writeEncrypted(data); file.writeEncrypted(data);
@ -2371,14 +2373,22 @@ namespace Local {
quint64 draftPeer = 0; quint64 draftPeer = 0;
QString msgText, editText; QString msgText, editText;
QByteArray msgTagsSerialized, editTagsSerialized;
qint32 msgReplyTo = 0, msgPreviewCancelled = 0, editMsgId = 0, editPreviewCancelled = 0; qint32 msgReplyTo = 0, msgPreviewCancelled = 0, editMsgId = 0, editPreviewCancelled = 0;
draft.stream >> draftPeer >> msgText; draft.stream >> draftPeer >> msgText;
if (draft.version >= 9048) {
draft.stream >> msgTagsSerialized;
}
if (draft.version >= 7021) { if (draft.version >= 7021) {
draft.stream >> msgReplyTo; draft.stream >> msgReplyTo;
if (draft.version >= 8001) { if (draft.version >= 8001) {
draft.stream >> msgPreviewCancelled; draft.stream >> msgPreviewCancelled;
if (!draft.stream.atEnd()) { if (!draft.stream.atEnd()) {
draft.stream >> editText >> editMsgId >> editPreviewCancelled; draft.stream >> editText;
if (draft.version >= 9048) {
draft.stream >> editTagsSerialized;
}
draft.stream >> editMsgId >> editPreviewCancelled;
} }
} }
} }

4
Telegram/SourceFiles/ui/text/text_block.h
View file

@ -140,9 +140,9 @@ public:
TextWord() = default; TextWord() = default;
TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0) TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0)
: _from(from) : _from(from)
, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value()))
, _width(width) , _width(width)
, _rpadding(rpadding) { , _rpadding(rpadding)
, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) {
} }
uint16 from() const { uint16 from() const {
return _from; return _from;

4
Telegram/Telegram.xcodeproj/project.pbxproj
View file

@ -2023,7 +2023,7 @@
SDKROOT = macosx; SDKROOT = macosx;
SYMROOT = ./../Mac; SYMROOT = ./../Mac;
TDESKTOP_MAJOR_VERSION = 0.9; TDESKTOP_MAJOR_VERSION = 0.9;
TDESKTOP_VERSION = 0.9.47; TDESKTOP_VERSION = 0.9.48;
}; };
name = Release; name = Release;
}; };
@ -2164,7 +2164,7 @@
SDKROOT = macosx; SDKROOT = macosx;
SYMROOT = ./../Mac; SYMROOT = ./../Mac;
TDESKTOP_MAJOR_VERSION = 0.9; TDESKTOP_MAJOR_VERSION = 0.9;
TDESKTOP_VERSION = 0.9.47; TDESKTOP_VERSION = 0.9.48;
}; };
name = Debug; name = Debug;
}; };

9
Telegram/build/build.sh
View file

@ -124,6 +124,9 @@ fi
if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
DropboxSymbolsPath="/media/psf/Dropbox/Telegram/symbols" DropboxSymbolsPath="/media/psf/Dropbox/Telegram/symbols"
if [ ! -d "$DropboxSymbolsPath" ]; then
Error "Dropbox path not found!"
fi
mkdir -p "$WorkPath/ReleaseIntermediateUpdater" mkdir -p "$WorkPath/ReleaseIntermediateUpdater"
cd "$WorkPath/ReleaseIntermediateUpdater" cd "$WorkPath/ReleaseIntermediateUpdater"
@ -206,6 +209,9 @@ fi
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
DropboxSymbolsPath="/Volumes/Storage/Dropbox/Telegram/symbols" DropboxSymbolsPath="/Volumes/Storage/Dropbox/Telegram/symbols"
if [ ! -d "$DropboxSymbolsPath" ]; then
Error "Dropbox path not found!"
fi
if [ "$FastParam" != "fast" ]; then if [ "$FastParam" != "fast" ]; then
touch "./Resources/telegram.qrc" touch "./Resources/telegram.qrc"
@ -279,7 +285,8 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BetaVersion" == "0" ]; then if [ "$BetaVersion" == "0" ]; then
cd "$ReleasePath" cd "$ReleasePath"
temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'` cp -f tsetup_blank.dmg tsetup.dmg
temppath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'`
cp -R "./$BinaryName.app" "$temppath/" cp -R "./$BinaryName.app" "$temppath/"
bless --folder "$temppath/" --openfolder "$temppath/" bless --folder "$temppath/" --openfolder "$temppath/"
hdiutil detach "$temppath" hdiutil detach "$temppath"

8
Telegram/build/version
View file

@ -1,6 +1,6 @@
AppVersion 9047 AppVersion 9048
AppVersionStrMajor 0.9 AppVersionStrMajor 0.9
AppVersionStrSmall 0.9.47 AppVersionStrSmall 0.9.48
AppVersionStr 0.9.47 AppVersionStr 0.9.48
AlphaChannel 1 AlphaChannel 0
BetaVersion 0 BetaVersion 0

1
doc/building-msvc.md
View file

@ -86,6 +86,7 @@ or download in ZIP and extract to **D:\TBuild\Libraries\**, rename **libexif-0.6
Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > Programs > Visual Studio 2015** menu folder), go to **D:\\TBuild\\Libraries** and run Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > Programs > Visual Studio 2015** menu folder), go to **D:\\TBuild\\Libraries** and run
git clone git://repo.or.cz/openal-soft.git git clone git://repo.or.cz/openal-soft.git
cd openal-soft
git checkout 90349b38 git checkout 90349b38
git apply ./../../tdesktop/Telegram/Patches/openal.diff git apply ./../../tdesktop/Telegram/Patches/openal.diff

2
lib/xdg/telegramdesktop.desktop
View file

@ -9,4 +9,4 @@ Terminal=false
StartupWMClass=Telegram StartupWMClass=Telegram
Type=Application Type=Application
Categories=Network; Categories=Network;
MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg; MimeType=x-scheme-handler/tg;