diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 435e40e9d..68c80c0a7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,10 +73,8 @@ For more info, see [GitHub Help][help_change_commit_message].
## Build instructions
-* [Visual Studio 2013][msvc]
-* [XCode 6.4][xcode]
-* [XCode 6.4 for OS X 10.6 and 10.7][xcode_old]
-* [Qt Creator 3.2.0 Ubuntu][qtcreator]
+See the [readme][README.md#build-instructions] for details on the various build
+environments.
## Pull upstream changes into your fork regularly
diff --git a/README.md b/README.md
index be9a15977..4f9b406f7 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
* [XCode 7][xcode]
* [XCode 7 for OS X 10.6 and 10.7][xcode_old]
* [Qt Creator 3.5.1 Ubuntu][qtcreator]
+* [Using qmake on GNU/Linux][qmake]
## Projects in Telegram solution
@@ -89,7 +90,8 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
[telegram_api]: https://core.telegram.org
[telegram_proto]: https://core.telegram.org/mtproto
[license]: LICENSE
-[msvc]: MSVC.md
-[xcode]: XCODE.md
-[xcode_old]: XCODEold.md
-[qtcreator]: QTCREATOR.md
+[msvc]: doc/building-msvc.md
+[xcode]: doc/building-xcode.md
+[xcode_old]: doc/building-xcode-old.md
+[qtcreator]: doc/building-qtcreator.md
+[qmake]: doc/building-qmake.md
diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt
index a8f7e3c32..563827866 100644
--- a/Telegram/Resources/style.txt
+++ b/Telegram/Resources/style.txt
@@ -53,6 +53,7 @@ color8: #ce671b; // orange
wndMinWidth: 380px;
adaptiveNormalWidth: 640px;
+adaptiveWideWidth: 1366px;
wndMinHeight: 480px;
wndDefWidth: 800px;
@@ -1016,8 +1017,6 @@ historyToEndSkip: 10px;
activeFadeInDuration: 500;
activeFadeOutDuration: 3000;
-historyMaxWidth: 720px;
-
msgRadius: 3px;
msgMaxWidth: 430px;
diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp
index b48c2b436..2d3a4c4cb 100644
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -1053,7 +1053,7 @@ void AppClass::checkMapVersion() {
QString versionFeatures;
if ((cDevVersion() || cBetaVersion()) && Local::oldMapVersion() < 9025) {
versionFeatures = QString::fromUtf8("\xe2\x80\x94 Adaptive layout for wide screens switch added to Settings\n\xe2\x80\x94 Linux version crash fix");// .replace('@', qsl("@") + QChar(0x200D));
- } else if (Local::oldMapVersion() < 9024) {
+ } else if (Local::oldMapVersion() < 9026) {
versionFeatures = lang(lng_new_version_text).trimmed();
} else {
versionFeatures = lang(lng_new_version_minor).trimmed();
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index 1f6fd6588..acd3cd83f 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -20,9 +20,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/
#pragma once
-static const int32 AppVersion = 9025;
-static const wchar_t *AppVersionStr = L"0.9.25";
-static const bool DevVersion = true;
+static const int32 AppVersion = 9026;
+static const wchar_t *AppVersionStr = L"0.9.26";
+static const bool DevVersion = false;
//#define BETA_VERSION (9019002ULL) // just comment this line to build public version
static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
diff --git a/Telegram/SourceFiles/gui/popupmenu.cpp b/Telegram/SourceFiles/gui/popupmenu.cpp
index 8fb99d7d5..cad98ebe0 100644
--- a/Telegram/SourceFiles/gui/popupmenu.cpp
+++ b/Telegram/SourceFiles/gui/popupmenu.cpp
@@ -539,6 +539,8 @@ PopupTooltip::PopupTooltip() : TWidget(0)
_showTimer.setSingleShot(true);
connect(&_showTimer, SIGNAL(timeout()), this, SLOT(onShow()));
+
+ connect(App::wnd()->windowHandle(), SIGNAL(activeChanged()), this, SLOT(onWndActiveChanged()));
}
void PopupTooltip::onShow() {
@@ -552,6 +554,12 @@ void PopupTooltip::onShow() {
}
}
+void PopupTooltip::onWndActiveChanged() {
+ if (!App::wnd()->windowHandle()->isActive()) {
+ PopupTooltip::Hide();
+ }
+}
+
bool PopupTooltip::eventFilter(QObject *o, QEvent *e) {
if (e->type() == QEvent::Leave) {
_hideByLeaveTimer.start(10);
diff --git a/Telegram/SourceFiles/gui/popupmenu.h b/Telegram/SourceFiles/gui/popupmenu.h
index caf65492d..4d7968bfc 100644
--- a/Telegram/SourceFiles/gui/popupmenu.h
+++ b/Telegram/SourceFiles/gui/popupmenu.h
@@ -133,6 +133,7 @@ public:
public slots:
void onShow();
+ void onWndActiveChanged();
void onHideByLeave();
protected:
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index ffa79820b..d87fc5b03 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -6339,16 +6339,12 @@ void HistoryMessage::initDimensions() {
}
void HistoryMessage::countPositionAndSize(int32 &left, int32 &width) const {
- int32 maxwidth = qMin(int(st::msgMaxWidth), _maxw), hwidth = _history->width, hmaxwidth = st::historyMaxWidth;
+ int32 maxwidth = qMin(int(st::msgMaxWidth), _maxw), hwidth = _history->width;
if (_media && _media->currentWidth() < maxwidth) {
maxwidth = qMax(_media->currentWidth(), qMin(maxwidth, plainMaxWidth()));
}
- left = 0;
- if (Adaptive::Wide()) {
- hwidth = hmaxwidth;
- }
- left += (!isPost() && out() && !Adaptive::Wide()) ? st::msgMargin.right() : st::msgMargin.left();
+ left = (!isPost() && out() && !Adaptive::Wide()) ? st::msgMargin.right() : st::msgMargin.left();
if (displayFromPhoto()) {
left += st::msgPhotoSkip;
// } else if (!Adaptive::Wide() && !out() && !fromChannel() && st::msgPhotoSkip - (hmaxwidth - hwidth) > 0) {
diff --git a/Telegram/SourceFiles/langs/lang_de.strings b/Telegram/SourceFiles/langs/lang_de.strings
index f9ea8f55e..145671347 100644
--- a/Telegram/SourceFiles/langs/lang_de.strings
+++ b/Telegram/SourceFiles/langs/lang_de.strings
@@ -262,6 +262,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_bg_from_gallery" = "Aus der Galerie";
"lng_settings_bg_from_file" = "Durchsuchen";
"lng_settings_bg_tile" = "Nebeneinander";
+"lng_settings_adaptive_wide" = "Flexibles Layout für breite Bildschirme";
"lng_backgrounds_header" = "Neuen Chat-Hintergrund wählen";
@@ -836,7 +837,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop wurde aktualisiert auf Version {version}\n\n{changes}\n\nGesamter Versionsverlauf:\n{link}";
"lng_new_version_minor" = "— Fehlerbehebungen und Softwareoptimierungen";
-"lng_new_version_text" = "— Neue Optik für Sprachnachrichten\n— Sticker werden nach Emoji-Eingabe vorgeschlagen";
+"lng_new_version_text" = "— Neue Option in den Einstellungen hinzugefügt (\"Flexibles Layout für breite Bildschirme\"), um das Layout bei besonders breiten Bildschirmen zu ändern\n— Abstürze in der Linux-Version behoben";
"lng_menu_insert_unicode" = "Unicode-Steuerzeichen einfügen";
diff --git a/Telegram/SourceFiles/langs/lang_es.strings b/Telegram/SourceFiles/langs/lang_es.strings
index 2c0e037f9..4370b950b 100644
--- a/Telegram/SourceFiles/langs/lang_es.strings
+++ b/Telegram/SourceFiles/langs/lang_es.strings
@@ -262,6 +262,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_bg_from_gallery" = "Elegir desde la galería";
"lng_settings_bg_from_file" = "Elegir desde archivos";
"lng_settings_bg_tile" = "Fondo con mosaico";
+"lng_settings_adaptive_wide" = "Diseño adaptable para pantallas anchas";
"lng_backgrounds_header" = "Elige tu nuevo fondo de chat";
@@ -836,7 +837,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop ha sido actualizada a la versión {version}\n\n{changes}\n\nEl historial completo está disponible aquí:\n{link}";
"lng_new_version_minor" = "— Corrección de errores y otras mejoras menores";
-"lng_new_version_text" = "– Nueva visualización de ondas para los mensajes de voz\n– Sugerencias de stickers cuando escribes un emoji";
+"lng_new_version_text" = "— Ajuste para activar o desactivar el diseño adaptable para pantallas anchas \n— Arreglado el cierre inesperado en la versión para Linux";
"lng_menu_insert_unicode" = "Insertar caracteres de control Unicode";
diff --git a/Telegram/SourceFiles/langs/lang_it.strings b/Telegram/SourceFiles/langs/lang_it.strings
index fac88aef7..9babab03f 100644
--- a/Telegram/SourceFiles/langs/lang_it.strings
+++ b/Telegram/SourceFiles/langs/lang_it.strings
@@ -262,6 +262,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_bg_from_gallery" = "Scegli dalla galleria";
"lng_settings_bg_from_file" = "Scegli da file";
"lng_settings_bg_tile" = "Affianca sfondo";
+"lng_settings_adaptive_wide" = "Layout adattivo per grandi schermi";
"lng_backgrounds_header" = "Scegli un nuovo sfondo per la chat";
@@ -836,7 +837,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop si è aggiornato alla versione {version}\n\n{changes}\n\nLa cronologia degli aggiornamenti è disponibile qui:\n{link}";
"lng_new_version_minor" = "— Risoluzione di problemi e altri miglioramenti minori";
-"lng_new_version_text" = "— Nuova visualizzazione delle onde sonore per i messaggi vocali\n— Suggerimento per gli sticker quando digiti un'emoji";
+"lng_new_version_text" = "— Interruttore per il layout adattivo per grandi schermi aggiunto nelle Impostazioni\n— Risoluzione dei crash su Linux";
"lng_menu_insert_unicode" = "Inserisci carattere di controllo Unicode";
diff --git a/Telegram/SourceFiles/langs/lang_ko.strings b/Telegram/SourceFiles/langs/lang_ko.strings
index 1d401e7e3..416441353 100644
--- a/Telegram/SourceFiles/langs/lang_ko.strings
+++ b/Telegram/SourceFiles/langs/lang_ko.strings
@@ -262,6 +262,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_bg_from_gallery" = "이미지 선택";
"lng_settings_bg_from_file" = "파일 선택";
"lng_settings_bg_tile" = "타일형 배경화면";
+"lng_settings_adaptive_wide" = "와이드 스크린 레이아웃 적용";
"lng_backgrounds_header" = "새로운 대화창 배경화면을 선택";
@@ -836,7 +837,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다.\n\n{changes}\n\n전체 버전 히스토리는 아래에서 확인 가능합니다:\n{link}";
"lng_new_version_minor" = "— 버그 수정 및 일부 기능 향상";
-"lng_new_version_text" = "— 음성 메시지에 웨이브 시각 효과 추가\n— 이모티콘 입력시 스티커 추천";
+"lng_new_version_text" = "— 와이드 스크린 레이아웃 설정 적용\n— 리눅스 버전 크래시 수정";
"lng_menu_insert_unicode" = "유니코드 문자를 입력하세요.";
diff --git a/Telegram/SourceFiles/langs/lang_nl.strings b/Telegram/SourceFiles/langs/lang_nl.strings
index 6f6d5dca0..5d5e5d0cf 100644
--- a/Telegram/SourceFiles/langs/lang_nl.strings
+++ b/Telegram/SourceFiles/langs/lang_nl.strings
@@ -262,6 +262,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_bg_from_gallery" = "Uit galerij kiezen";
"lng_settings_bg_from_file" = "Bestand kiezen";
"lng_settings_bg_tile" = "Naast elkaar";
+"lng_settings_adaptive_wide" = "Adaptieve layout voor brede schermen";
"lng_backgrounds_header" = "Kies je nieuwe achtergrond";
@@ -836,7 +837,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram is bijgewerkt naar versie {version}\n\n{changes} \n\nVolledige versiegeschiedenis is hier te vinden:\n{link}";
"lng_new_version_minor" = "— Probleemoplossing en andere kleine verbeteringen";
-"lng_new_version_text" = "— Nieuwe visualisatie voor spraakberichten\n— Stickersuggesties als een emoji typt";
+"lng_new_version_text" = "— Adaptieve layout voor brede schermen toegevoegd aan instellingen\n— Crashes in de Linuxversie opgelost";
"lng_menu_insert_unicode" = "Unicode-besturingsteken invoegen";
diff --git a/Telegram/SourceFiles/langs/lang_pt_BR.strings b/Telegram/SourceFiles/langs/lang_pt_BR.strings
index bc77b4a31..fb36ee618 100644
--- a/Telegram/SourceFiles/langs/lang_pt_BR.strings
+++ b/Telegram/SourceFiles/langs/lang_pt_BR.strings
@@ -262,6 +262,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_settings_bg_from_gallery" = "Escolher da galeria";
"lng_settings_bg_from_file" = "Escolher dos arquivos";
"lng_settings_bg_tile" = "Lado-a-lado";
+"lng_settings_adaptive_wide" = "Layout adaptativo para wide screens";
"lng_backgrounds_header" = "Escolha o seu novo papel de parede";
@@ -836,7 +837,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_new_version_wrap" = "Telegram Desktop foi atualizado para a versão {version}\n\n{changes}\n\nHistórico completo de mudanças disponível aqui:\n{link}";
"lng_new_version_minor" = "— Resolução de bugs e outras melhorias menores";
-"lng_new_version_text" = "— Nova visualização em ondas para mensagens de voz\n— Sugestões de sticker quando você inicia com emoji";
+"lng_new_version_text" = "— Layout adaptativo para wide screens adicionado em Configurações\n— Resolvido crash nas versões Linux";
"lng_menu_insert_unicode" = "Inserir caractere de controle Unicode";
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 0ca9a5d82..cead63ab7 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -1260,12 +1260,10 @@ void Window::resizeEvent(QResizeEvent *e) {
if (!title) return;
Adaptive::Layout layout = Adaptive::OneColumnLayout;
- if (width() >= st::adaptiveNormalWidth) {
- if (width() - chatsListWidth(width()) >= st::historyMaxWidth) {
- layout = Adaptive::WideLayout;
- } else {
- layout = Adaptive::NormalLayout;
- }
+ if (width() > st::adaptiveWideWidth) {
+ layout = Adaptive::WideLayout;
+ } else if (width() >= st::adaptiveNormalWidth) {
+ layout = Adaptive::NormalLayout;
}
if (layout != Global::AdaptiveLayout()) {
Global::SetAdaptiveLayout(layout);
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 789cf2585..733bd0e84 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.9.25
+ 0.9.26
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index 04b48ea03..af8188834 100644
--- a/Telegram/Telegram.rc
+++ b/Telegram/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "SourceFiles\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,25,0
- PRODUCTVERSION 0,9,25,0
+ FILEVERSION 0,9,26,0
+ PRODUCTVERSION 0,9,26,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
- VALUE "FileVersion", "0.9.25.0"
+ VALUE "FileVersion", "0.9.26.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "0.9.25.0"
+ VALUE "ProductVersion", "0.9.26.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index ba4d36601..30dc689c9 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1720,7 +1720,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.25;
+ CURRENT_PROJECT_VERSION = 0.9.26;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
diff --git a/Telegram/Version b/Telegram/Version
index ba8449dac..bc8bffbaf 100644
--- a/Telegram/Version
+++ b/Telegram/Version
@@ -1,6 +1,6 @@
-AppVersion 9025
+AppVersion 9026
AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.25
-AppVersionStr 0.9.25
-DevChannel 1
+AppVersionStrSmall 0.9.26
+AppVersionStr 0.9.26
+DevChannel 0
BetaVersion 0 9019002
diff --git a/MSVC.md b/doc/building-msvc.md
similarity index 100%
rename from MSVC.md
rename to doc/building-msvc.md
diff --git a/doc/building-qmake.md b/doc/building-qmake.md
new file mode 100644
index 000000000..37f091331
--- /dev/null
+++ b/doc/building-qmake.md
@@ -0,0 +1,130 @@
+Building via qmake
+==================
+
+The following commands assume the following environment variables are set:
+
+ * `$srcdir`: The directory into which the source has been downloaded and
+ unpacked.
+ * `_qtver`: The Qt version being used (eg: `5.5.1`).
+ * `$pkgdir`: The directory into which installable files are places. This is
+ `/` for local installations, or can be different directory when preparing a
+ redistributable package.
+
+Either set them accordingly, or replace them in the below commands as desired.
+
+The following sources should be downloaded and unpacked into `$srcdir`:
+
+ * This repository (either `master` or a specific tag).
+ * The Qt sources: `http://download.qt-project.org/official_releases/qt/${_qtver%.*}/$_qtver/single/qt-everywhere-opensource-src-$_qtver.tar.xz`
+ * `git clone git+https://chromium.googlesource.com/breakpad/breakpad breakpad`
+ * `git clone git+https://chromium.googlesource.com/linux-syscall-support breakpad-lss`
+ * telegramdesktop.desktop (The intention is to include this file inside the
+ source package at some point):
+ `https://aur.archlinux.org/cgit/aur.git/plain/telegramdesktop.desktop?h=telegram-desktop`
+ * tg.protocol: `https://aur.archlinux.org/cgit/aur.git/plain/tg.protocol?h=telegram-desktop`
+
+Preparation
+-----------
+
+ cd "$srcdir/tdesktop"
+
+ mkdir -p "$srcdir/Libraries"
+
+ local qt_patch_file="$srcdir/tdesktop/Telegram/_qtbase_${_qtver//./_}_patch.diff"
+ if [ "$qt_patch_file" -nt "$srcdir/Libraries/QtStatic" ]; then
+ rm -rf "$srcdir/Libraries/QtStatic"
+ mv "$srcdir/qt-everywhere-opensource-src-$_qtver" "$srcdir/Libraries/QtStatic"
+ cd "$srcdir/Libraries/QtStatic/qtbase"
+ patch -p1 -i "$qt_patch_file"
+ fi
+
+ if [ ! -h "$srcdir/Libraries/breakpad" ]; then
+ ln -s "$srcdir/breakpad" "$srcdir/Libraries/breakpad"
+ ln -s "$srcdir/breakpad-lss" "$srcdir/Libraries/breakpad/src/third_party/lss"
+ fi
+
+ sed -i 's/CUSTOM_API_ID//g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+ sed -i 's,LIBS += /usr/local/lib/libxkbcommon.a,,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+ sed -i 's,LIBS += /usr/local/lib/libz.a,LIBS += -lz,g' "$srcdir/tdesktop/Telegram/Telegram.pro"
+
+ (
+ echo "DEFINES += TDESKTOP_DISABLE_AUTOUPDATE"
+ echo "DEFINES += TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
+ echo 'INCLUDEPATH += "/usr/lib/glib-2.0/include"'
+ echo 'INCLUDEPATH += "/usr/lib/gtk-2.0/include"'
+ echo 'INCLUDEPATH += "/usr/include/opus"'
+ ) >> "$srcdir/tdesktop/Telegram/Telegram.pro"
+
+Building
+--------
+
+
+ # Build patched Qt
+ cd "$srcdir/Libraries/QtStatic"
+ ./configure -prefix "$srcdir/qt" -release -opensource -confirm-license -qt-zlib \
+ -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb \
+ -qt-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests
+ make module-qtbase module-qtimageformats
+ make module-qtbase-install_subtargets module-qtimageformats-install_subtargets
+
+ export PATH="$srcdir/qt/bin:$PATH"
+
+ # Build breakpad
+ cd "$srcdir/Libraries/breakpad"
+ ./configure
+ make
+
+ # Build MetaStyle
+ mkdir -p "$srcdir/tdesktop/Linux/DebugIntermediateStyle"
+ cd "$srcdir/tdesktop/Linux/DebugIntermediateStyle"
+ qmake CONFIG+=debug "../../Telegram/MetaStyle.pro"
+ make
+
+ # Build MetaLang
+ mkdir -p "$srcdir/tdesktop/Linux/DebugIntermediateLang"
+ cd "$srcdir/tdesktop/Linux/DebugIntermediateLang"
+ qmake CONFIG+=debug "../../Telegram/MetaLang.pro"
+ make
+
+ # Build Telegram Desktop
+ mkdir -p "$srcdir/tdesktop/Linux/ReleaseIntermediate"
+ cd "$srcdir/tdesktop/Linux/ReleaseIntermediate"
+
+ qmake CONFIG+=release "../../Telegram/Telegram.pro"
+ local pattern="^PRE_TARGETDEPS +="
+ grep "$pattern" "$srcdir/tdesktop/Telegram/Telegram.pro" | sed "s/$pattern//g" | xargs make
+
+ qmake CONFIG+=release "../../Telegram/Telegram.pro"
+ make
+
+Installation
+------------
+
+
+ install -dm755 "$pkgdir/usr/bin"
+ install -m755 "$srcdir/tdesktop/Linux/Release/Telegram" "$pkgdir/usr/bin/telegram-desktop"
+
+ install -d "$pkgdir/usr/share/applications"
+ install -m644 "$srcdir/telegramdesktop.desktop" "$pkgdir/usr/share/applications/telegramdesktop.desktop"
+
+ install -d "$pkgdir/usr/share/kde4/services"
+ install -m644 "$srcdir/tg.protocol" "$pkgdir/usr/share/kde4/services/tg.protocol"
+
+ local icon_size icon_dir
+ for icon_size in 16 32 48 64 128 256 512; do
+ icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
+
+ install -d "$icon_dir"
+ install -m644 "$srcdir/tdesktop/Telegram/SourceFiles/art/icon${icon_size}.png" "$icon_dir/telegram-desktop.png"
+ done
+
+Notes
+-----
+
+These instructions are based on the [ArchLinux package][arch-package] for
+telegram-desktop.
+
+In case these instructions are at some point out of date, the above may serve
+as an update reference.
+
+[arch-package]: https://aur.archlinux.org/packages/telegram-desktop/
diff --git a/QTCREATOR.md b/doc/building-qtcreator.md
similarity index 100%
rename from QTCREATOR.md
rename to doc/building-qtcreator.md
diff --git a/XCODEold.md b/doc/building-xcode-old.md
similarity index 100%
rename from XCODEold.md
rename to doc/building-xcode-old.md
diff --git a/XCODE.md b/doc/building-xcode.md
similarity index 100%
rename from XCODE.md
rename to doc/building-xcode.md