Skip to content

Commit 070ea58

Browse files
john-prestonjohn-preston
committed
many small fixes: multi windows users running, touchscreen fix, esc for photo hide, etc + send to menu integration on windows + hide text in notifies
1 parent dd4b0f0 commit 070ea58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+561
-209
lines changed

‎MSVC.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ or download in ZIP and extract to **D:\TBuild\**, rename **tdesktop-master** to
1414

1515
###Prepare libraries
1616

17-
####OpenSSL 1.0.1g
17+
####OpenSSL 1.0.1h
1818

19-
https://www.openssl.org/related/binaries.html > **OpenSSL for Windows** > Download [**Win32 OpenSSL v1.0.1g** (16 Mb)](http://slproweb.com/download/Win32OpenSSL-1_0_1g.exe)
19+
https://www.openssl.org/related/binaries.html > **OpenSSL for Windows** > Download [**Win32 OpenSSL v1.0.1h** (16 Mb)](http://slproweb.com/download/Win32OpenSSL-1_0_1h.exe)
2020

2121
Install to **D:\TBuild\Libraries\OpenSSL-Win32**, while installing **Copy OpenSSL DLLs to** choose **The OpenSSL binaries (/bin) directory**
2222

‎QTCREATOR.md‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ In Terminal go to **/home/user/TBuild/Libraries/QtStatic** and there run
5555

5656
building (**make** command) will take really long time.
5757

58-
#####Building pulseaudio plugin
59-
60-
In Terminal go to **/home/user/TBuild/Libraries/QtStatic/qtmultimedia/src/plugins/pulseaudio** and run
61-
62-
qmake pulseaudio.pro
63-
make
64-
6558
###Building Telegram Desktop
6659

6760
* Launch Qt Creator, all projects will be taken from **/home/user/TBuild/tdesktop/Telegram**
@@ -70,6 +63,6 @@ In Terminal go to **/home/user/TBuild/Libraries/QtStatic/qtmultimedia/src/plugin
7063
* Open MetaStyle.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateStyle** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateStyle** and build for Debug
7164
* Open MetaEmoji.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateEmoji** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateEmoji** and build for Debug
7265
* Open MetaLang.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateLang** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateLang** and build for Debug
73-
* Open Telegram.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediate** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediate** and build for Debug
66+
* Open Telegram.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediate** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediate** and build for Debug, if GeneratedFiles are not found click **Run qmake** from **Build** menu and try again
7467
* Open Updater.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateUpdater** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateUpdater** and build for Debug
75-
* Release Telegram build will require removing **CUSTOM_API_ID** definition in Telegram.pro project and may require changing paths in **/home/user/TBuild/tdesktop/Telegram/FixMake.sh** or **/home/user/TBuild/tdesktop/Telegram/FixMake32.sh** for static library linking fix
68+
* Release Telegram build will require removing **CUSTOM_API_ID** definition in Telegram.pro project and may require changing paths in **/home/user/TBuild/tdesktop/Telegram/FixMake.sh** or **/home/user/TBuild/tdesktop/Telegram/FixMake32.sh** for static library linking fix, static linking applies only on second Release build (first uses old Makefile)

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@ Source code is published under GPL v3, license is available [here](https://githu
66

77
###Supported systems
88

9-
Only Windows and OS X systems are supported at this moment, Linux builds are on their way.
10-
119
* Windows XP
1210
* Windows Vista
1311
* Windows 7
1412
* Windows 8 (**not** RT)
1513
* Windows 8.1 (**not** RT)
14+
* OS X 10.7
15+
* OS X 10.8
1616
* OS X 10.9
17-
* OS X 10.7-10.8 (not tested)
17+
* Ubuntu 12.04
1818
* Ubuntu 13.04
1919
* Ubuntu 14.04
20-
* Fedora (not tested)
2120

2221
###Third-party
2322

@@ -34,7 +33,7 @@ Only Windows and OS X systems are supported at this moment, Linux builds are on
3433

3534
###[Build instructions for XCode 5.1.1](https://github.com/telegramdesktop/tdesktop/blob/master/XCODE.md)
3635

37-
###[Build instructions for Qt Creator 2.7 Ubuntu](https://github.com/telegramdesktop/tdesktop/blob/master/QTCREATOR.md)
36+
###[Build instructions for Qt Creator 3.1.2 Ubuntu](https://github.com/telegramdesktop/tdesktop/blob/master/QTCREATOR.md)
3837

3938
##Projects in Telegram solution
4039

‎Telegram/FixMake32.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/libxcb\-render\-util\.a/g' Makefile
1+
sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\-util\.a/g' Makefile
22
sed -i 's/\-lxcb\-render/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\.a/g' Makefile
33
sed -i 's/\-lxcb\-sync/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-sync\.a/g' Makefile
4-
sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/libxcb\-keysyms\.a/g' Makefile
5-
sed -i 's/\-lxcb\-icccm/\/usr\/lib\/libxcb\-icccm\.a/g' Makefile
4+
sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-keysyms\.a/g' Makefile
5+
sed -i 's/\-lxcb\-icccm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-icccm\.a/g' Makefile
66
sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-xfixes\.a/g' Makefile
77
sed -i 's/\-lxcb\-shm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
88
sed -i 's/\-lxcb\-randr/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
99
sed -i 's/\-lxcb\-shape/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
10-
sed -i 's/\-lxcb\-image/\/usr\/lib\/libxcb\-image\.a \/usr\/lib\/i386\-linux\-gnu\/libxcb\-util\.a/g' Makefile
10+
sed -i 's/\-lxcb\-image/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-image\.a \/usr\/lib\/i386\-linux\-gnu\/libxcb\-util\.a/g' Makefile
1111
sed -i 's/\-llzma/\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a/g' Makefile
1212
sed -i 's/\-lz/\/usr\/lib\/i386\-linux\-gnu\/libz\.a/g' Makefile
1313
sed -i 's/\-lssl/\/usr\/lib\/i386\-linux\-gnu\/libssl\.a/g' Makefile

‎Telegram/PrepareLinux.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AppVersionStr=0.5.8
2-
AppVersion=5008
1+
AppVersionStr=0.5.9
2+
AppVersion=5009
33

44
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
55
echo "Deploy folder for version $AppVersionStr already exists!"

‎Telegram/PrepareLinux32.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AppVersionStr=0.5.8
2-
AppVersion=5008
1+
AppVersionStr=0.5.9
2+
AppVersion=5009
33

44
if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
55
echo "Deploy folder for version $AppVersionStr already exists!"

‎Telegram/PrepareMac.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AppVersionStr=0.5.8
2-
AppVersion=5008
1+
AppVersionStr=0.5.9
2+
AppVersion=5009
33

44
if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
55
echo "Deploy folder for version $AppVersionStr already exists!"
@@ -27,7 +27,7 @@ if [ ! -f "./../Mac/Release/Telegram.app/Contents/MacOS/Telegram" ]; then
2727
fi
2828

2929
if [ ! -f "./../Mac/Release/Telegram.app/Contents/Frameworks/Updater" ]; then
30-
echo "Icon.icns not found in Resources!"
30+
echo "Updater not found in Frameworks!"
3131
exit 1
3232
fi
3333

‎Telegram/Resources/lang.txt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ lng_status_lastseen_hours: "%1 hours ago";
7171
lng_status_lastseen_today: "today at {time}";
7272
lng_status_lastseen_yesterday: "yesterday at {time}";
7373
lng_status_lastseen_date: "{date}";
74+
lng_status_lastseen_date_time: "{date} at {time}";
7475
lng_status_online: "online";
7576

7677
lng_chat_no_members: "Group is unaccessible";
@@ -138,7 +139,12 @@ lng_settings_uploading_photo: "Uploading photo...";
138139

139140
lng_settings_section_notify: "Notifications";
140141
lng_settings_desktop_notify: "Desktop notifications";
141-
lng_settings_sound_notify: "Sound";
142+
lng_settings_show_name: "Show sender's name";
143+
lng_settings_show_preview: "Show message preview";
144+
lng_settings_sound_notify: "Sound notification";
145+
146+
lng_notification_title: "Telegram Desktop";
147+
lng_notification_preview: "You have a new message";
142148

143149
lng_settings_section_general: "General";
144150
lng_settings_auto_update: "Update automatically";
@@ -154,6 +160,7 @@ lng_settings_workmode_tray: "Show tray icon";
154160
lng_settings_workmode_window: "Show taskbar icon";
155161
lng_settings_auto_start: "Launch Telegram when system starts";
156162
lng_settings_start_min: "Launch minimized";
163+
lng_settings_add_sendto: "Place Telegram in «Send to» menu";
157164
lng_settings_scale_label: "Interface scale";
158165
lng_settings_scale_auto: "Auto ({cur})";
159166

@@ -338,7 +345,10 @@ lng_really_send_image: "Do you want to send this image?";
338345
lng_forward_choose: "Choose recipient...";
339346
lng_forward_confirm: "Forward to {recipient}?";
340347
lng_forward_share_contact: "Share contact to {recipient}?";
348+
lng_forward_send_file_confirm: "Send «{name}» to {recipient}?";
349+
lng_forward_send_files_confirm: "Send selected files to {recipient}?";
341350
lng_forward: "Forward";
351+
lng_forward_send: "Send";
342352

343353
lng_contact_phone: "Phone number";
344354
lng_enter_contact_data: "New Contact";

‎Telegram/Resources/style.txt‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,19 +198,20 @@ cbDefFlat: flatCheckbox {
198198

199199
disabledCursor: cursor(default);
200200

201-
imageRect: sprite(144px, 68px, 22px, 22px);
202-
chkImageRect: sprite(119px, 68px, 22px, 22px);
203-
overImageRect: sprite(144px, 68px, 22px, 22px);
204-
chkOverImageRect: sprite(119px, 68px, 22px, 22px);
205-
disImageRect: sprite(193px, 68px, 22px, 22px);
206-
chkDisImageRect: sprite(193px, 68px, 22px, 22px);
201+
imageRect: sprite(140px, 68px, 22px, 22px);
202+
chkImageRect: sprite(115px, 68px, 22px, 22px);
203+
overImageRect: sprite(140px, 68px, 22px, 22px);
204+
chkOverImageRect: sprite(115px, 68px, 22px, 22px);
205+
disImageRect: sprite(140px, 43px, 22px, 22px);
206+
chkDisImageRect: sprite(115px, 43px, 22px, 22px);
207207

208208
imagePos: point(0px, 0px);
209209
}
210210

211211
rbDefFlat: flatCheckbox(cbDefFlat) {
212-
chkImageRect: sprite(169px, 68px, 22px, 22px);
213-
chkOverImageRect: sprite(169px, 68px, 22px, 22px);
212+
chkImageRect: sprite(165px, 68px, 22px, 22px);
213+
chkOverImageRect: sprite(165px, 68px, 22px, 22px);
214+
chkDisImageRect: sprite(165px, 43px, 22px, 22px);
214215
}
215216

216217
inpDefFont: font(17px);
@@ -1243,8 +1244,11 @@ aboutHeight: 441px;
12431244
aboutHeaderFont: font(24px semibold);
12441245
aboutSubheaderFont: font(24px);
12451246
aboutHeaderTop: 139px;
1246-
aboutVersionFont: font(16px);
1247-
aboutVersionColor: #999;
1247+
aboutVersion: flatLabel(labelDefFlat) {
1248+
font: font(16px);
1249+
width: aboutWidth;
1250+
align: align(center);
1251+
}
12481252
aboutVersionTop: 178px;
12491253
aboutTextFont: font(15px);
12501254
aboutTextTop: 221px;

‎Telegram/Setup.iss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#define MyAppShortName "Telegram"
55
#define MyAppName "Telegram Win (Unofficial)"
6-
#define MyAppVersion "0.5.8"
7-
#define MyAppVersionZero "0.5.8"
8-
#define MyAppFullVersion "0.5.8.0"
6+
#define MyAppVersion "0.5.9"
7+
#define MyAppVersionZero "0.5.9"
8+
#define MyAppFullVersion "0.5.9.0"
99
#define MyAppPublisher "Telegram (Unofficial)"
1010
#define MyAppURL "https://tdesktop.com"
1111
#define MyAppExeName "Telegram.exe"

0 commit comments

Comments
 (0)