diff --git a/README.md b/README.md index 2aa026e0a..548046310 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,14 @@ Only Windows systems are supported at this moment, OS X and Linux builds are on * Windows 8 (**not** RT) * Windows 8.1 (**not** RT) -###Third-party libraries +###Third-party -* Qt 5.3.0, slightly patched -* OpenSSL 1.0.1g -* zlib 1.2.8 -* libexif 0.6.20 -* LZMA SDK 9.20 +* Qt 5.3.0, slightly patched ([GPL](http://qt-project.org/doc/qt-5/gpl.html)) +* OpenSSL 1.0.1g ([OpenSSL License](https://www.openssl.org/source/license.html)) +* zlib 1.2.8 ([zlib License](http://www.zlib.net/zlib_license.html)) +* libexif 0.6.20 ([LGPL](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)) +* LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html)) +* Open Sans font ([Apache License](http://www.apache.org/licenses/LICENSE-2.0.html)) ##Build instructions for Visual Studio 2013 diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt index 5da0ec3f3..ea2129b82 100644 --- a/Telegram/Resources/style.txt +++ b/Telegram/Resources/style.txt @@ -15,9 +15,10 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014 John Preston, https://tdesktop.com */ -defaultFontFamily: 'Segoe UI'; -//defaultFontFamily: 'ThoolikaTraditionalUnicode'; -semibold: 'Segoe WP Semibold'; +defaultFontFamily: 'Open Sans'; +semibold: 'Open Sans Semibold'; + +fsize: 13px; spriteFile: ':/gui/art/sprite.png' / 2:':/gui/art/sprite_125x.png' / 3:':/gui/art/sprite_150x.png' / 4:':/gui/art/sprite_200x.png'; // exceptional value for retina emojisFile: ':/gui/art/emoji.png' / 2:':/gui/art/emoji_125x.png' / 3:':/gui/art/emoji_150x.png' / 4:':/gui/art/emoji_200x.png'; // exceptional value for retina @@ -71,7 +72,7 @@ titleGreen: #41a903; titleStatusColor: #999; titleTypingColor: #0080c0; -statusFont: font(14px); +statusFont: font(fsize); versionColor: #777; sysBtnDelta: 6px; @@ -106,7 +107,7 @@ btnDefIconed: iconedButton { color: white; bgColor: white; overBgColor: white; - font: font(14px); + font: font(fsize); opacity: 0.78; overOpacity: 1; @@ -169,8 +170,8 @@ btnDefBack: flatButton(btnDefFlat) { downBgColor: #b9b9b9; } -linkFont: font(14px); -linkOverFont: font(14px underline); +linkFont: font(fsize); +linkOverFont: font(fsize underline); btnDefLink: linkButton { color: btnYesColor; overColor: btnYesColor; @@ -185,9 +186,9 @@ cbDefFlat: flatCheckbox { disColor: #999; height: 22px; - textTop: 0px; + textTop: 1px; textLeft: 34px; - font: font(14px); + font: font(fsize); duration: 200; bgFunc: transition(easeOutCirc); cursor: cursor(pointer); @@ -293,7 +294,7 @@ scrollCountries: flatScroll(scrollDef) { lnkText: #0f7dc7; labelDefFlat: flatLabel { - font: font(14px); + font: font(fsize); minWidth: 100px; width: 0px; align: align(left); @@ -476,23 +477,23 @@ introErrLabel: flatLabel(labelDefFlat) { setWidth: 356px; setTop: 26px; setNameLeft: 3px; -setNameTop: 0px; -setNameFont: font(23px); +setNameTop: 1px; +setNameFont: font(22px); setPhoneFont: font(16px); setPhoneColor: #999; -setPhoneTop: 38px; +setPhoneTop: 39px; setPhoneLeft: 1px; setPhotoSize: 120px; setHeaderFont: font(20px); setHeaderColor: black; setHeaderSkip: 59px; setHeaderLeft: -1px; -setHeaderTop: 21px; +setHeaderTop: 22px; setLittleSkip: 9px; setSectionSkip: 25px; setVersionHeight: 41px; setVersionLeft: 36px; -setVersionTop: 2px; +setVersionTop: 3px; setVersionColor: #999; setBottom: 130px; setScroll: flatScroll(scrollDef) { @@ -520,7 +521,7 @@ setTitleFrom: point(20px, 20px); setTitleFont: font(24px); setTitleColor: #000; setNameInput: flatInput(inpDefFlat) { - font: font(14px); + font: font(fsize); height: 25px; width: 170px; textMrg: margins(3px, 3px, 3px, 3px); @@ -528,7 +529,7 @@ setNameInput: flatInput(inpDefFlat) { setErrBG: #ffa5a5; setErrColor: #800000; setErrHeight: 30px; -setErrFont: font(14px); +setErrFont: font(fsize); btnSetUpload: flatButton(btnDefNext, btnDefBig) { width: 206px; @@ -592,7 +593,7 @@ dlgPaddingVer: 8px; dlgHeight: 62px; dlgPhotoPadding: 12px; -dlgSep: 6px; +dlgSep: 8px; dlgShadowColor: rgba(0, 0, 0, 24);//#ebebeb dlgShadow: 1px; @@ -601,7 +602,7 @@ dlgMinWidth: 260px; dlgRichMinWidth: 150px; dlgMaxWidth: 540px; dlgFilter: flatInput(inpDefGray) { - font: font(14px); + font: font(fsize); height: 34px; bgColor: #f2f2f2; phColor: #949494; @@ -620,7 +621,7 @@ dlgScroll: flatScroll(scrollDef) { topsh: 0px; bottomsh: 0px; } -dlgFont: font(14px); +dlgFont: font(fsize); dlgDblCheckImg: sprite(302px, 23px, 17px, 11px); dlgCheckImg: sprite(320px, 23px, 17px, 11px); @@ -632,19 +633,16 @@ dlgChatImg: sprite(302px, 51px, 16px, 11px); dlgActiveChatImg: sprite(322px, 51px, 16px, 11px); dlgChatImgLeft: 1px; -dlgChatImgTop: 5px; +dlgChatImgTop: 4px; dlgChatImgSkip: 22px; dlgCheckLeft: 5px; -dlgCheckTop: 5px; +dlgCheckTop: 4px; dlgCheckSkip: 3px; -dlgFromFont: font(12px bold); -dlgFromColor: #4981af; - -dlgHistFont: font(14px); +dlgHistFont: font(fsize); dlgNameColor: #000; -dlgNameTop: 1px; +dlgNameTop: 2px; dlgSystemColor: #4981af; dlgTextColor: #888888; @@ -670,7 +668,7 @@ dlgActiveDateColor: #d3e2ee; topBarHeight: 54px; topBarBG: white; topBarDuration: 200; -topBarForwardPadding: margins(17px, 7px, 40px, 8px); +topBarForwardPadding: margins(17px, 8px, 40px, 8px); topBarForwardAlpha: 0.6; topBarForwardImg: sprite(45px, 112px, 9px, 16px); topBarBackPadding: margins(15px, 7px, 9px, 7px); @@ -690,20 +688,20 @@ topBarButton: flatButton(btnDefFlat) { width: -40px; height: 54px; - textTop: 18px; - overTextTop: 18px; - downTextTop: 19px; + textTop: 19px; + overTextTop: 19px; + downTextTop: 20px; - font: font(14px); - overFont: font(14px underline); + font: font(fsize); + overFont: font(fsize underline); } topBarActionButton: flatButton(btnDefNext, btnDefBig) { textTop: 8px; overTextTop: 8px; downTextTop: 9px; - font: font(14px); - overFont: font(14px); + font: font(fsize); + overFont: font(fsize); width: 101px; height: 34px; } @@ -712,10 +710,10 @@ topBarSelectedPos: point(18px, 18px); historyBG: #dfe4e8; msgMaxWidth: 550px; -msgFont: font(14px); -msgNameFont: font(14px semibold); -msgServiceFont: font(14px semibold); -msgServiceNameFont: font(14px semibold); +msgFont: font(fsize); +msgNameFont: font(fsize semibold); +msgServiceFont: font(fsize semibold); +msgServiceNameFont: font(fsize semibold); msgDateFont: font(13px); msgMinWidth: 190px; msgPhotoSize: 30px; @@ -780,8 +778,8 @@ msgDogImg: sprite(213px, 93px, 126px, 126px); historyPadding: 10px; defaultTextStyle: textStyle { - lnkFlags: font(14px); - lnkOverFlags: font(14px underline); + lnkFlags: font(fsize); + lnkOverFlags: font(fsize underline); lnkColor: btnYesColor; lnkDownColor: btnYesHover; selectBG: msgInSelectBG; @@ -806,16 +804,16 @@ outTextStyle: textStyle(defaultTextStyle) { dlgTextStyle: textStyle(defaultTextStyle) { lnkColor: dlgSystemColor; lnkDownColor: dlgSystemColor; - lnkOverFlags: font(14px); + lnkOverFlags: font(fsize); } dlgActiveTextStyle: textStyle(defaultTextStyle) { lnkColor: dlgActiveColor; lnkDownColor: dlgActiveColor; - lnkOverFlags: font(14px); + lnkOverFlags: font(fsize); } mediaMaxWidth: 250px; -mediaFont: font(14px); +mediaFont: font(fsize); mediaPadding: margins(7px, 6px, 11px, 6px); mediaThumbSize: 48px; mediaDocOutImg: sprite(6px, 146px, 48px, 48px); @@ -843,11 +841,11 @@ mediaSaveButton: flatButton(btnDefFlat) { overTextTop: 7px; downTextTop: 8px; - font: font(14px); - overFont: font(14px); + font: font(fsize); + overFont: font(fsize); } -sendPadding: 8px; +sendPadding: 9px; btnSend: flatButton(btnDefFlat) { color: btnYesColor; overColor: btnYesHover; @@ -912,12 +910,12 @@ taMsgField: flatTextarea(taDefFlat) { font: msgFont; } maxFieldHeight: 250px; -minFieldHeight: 30px; +minFieldHeight: 28px; newMsgSound: ':/gui/art/newmsg.wav'; unreadBarHeight: 32px; -unreadBarFont: font(14px semibold); +unreadBarFont: font(fsize semibold); unreadBarBG: #fcfbfa; unreadBarBorder: titleShadowColor; unreadBarColor: #538bb4; @@ -996,11 +994,11 @@ profileMaxWidth: 410px; profilePadding: margins(28px, 30px, 28px, 0px); profilePhotoSize: 120px; profileNameLeft: 21px; -profileNameTop: -2px; +profileNameTop: -1px; profileNameFont: font(20px); profileStatusLeft: 22px; -profileStatusTop: 30px; -profileStatusFont: font(14px); +profileStatusTop: 31px; +profileStatusFont: font(fsize); profilePhoneLeft: 20px; profilePhoneTop: 62px; profilePhoneFont: font(16px); @@ -1010,20 +1008,20 @@ profileHeaderFont: font(20px); profileHeaderColor: black; profileHeaderSkip: 59px; profileHeaderLeft: -1px; -profileHeaderTop: 21px; +profileHeaderTop: 22px; profileListPhotoSize: 46px; profileListPadding: size(12px, 6px); -profileListNameTop: 7px; +profileListNameTop: 8px; profileListStatusBottom: 6px; profileHoverBG: #f1f1f1; profileActiveBG: #6294b9; -profileSubFont: font(14px); +profileSubFont: font(fsize); profileCheckRect: sprite(88px, 108px, 24px, 24px); profileCheckActiveRect: sprite(128px, 108px, 24px, 24px); profileCheckDeltaX: 18px; profileCheckDeltaY: 1px; -profileListNameFont: font(14px semibold); +profileListNameFont: font(fsize semibold); profileListNameColor: #000; profileOnlineColor: titleTypingColor; profileOfflineColor: titleStatusColor; @@ -1137,7 +1135,7 @@ newGroupNamePadding: margins(12px, 15px, 12px, 13px); connectionSkip: 20px; inpConnectionHost: flatInput(inpDefGray) { - font: font(14px); + font: font(fsize); height: 34px; bgColor: #f2f2f2; phColor: #949494; @@ -1261,13 +1259,13 @@ dragPadding: margins(20px, 10px, 20px, 10px); dragHeight: 72px; -selectedFont: font(14px); +selectedFont: font(fsize); selectedColor: #777; selectedTop: 14px; downloadSkip: 20px; inpDownloadDir: flatInput(inpDefGray) { - font: font(14px); + font: font(fsize); height: 34px; bgColor: #fff; textMrg: margins(5px, 2px, 5px, 4px); @@ -1323,7 +1321,7 @@ rbEmoji: flatCheckbox { textTop: 0px; textLeft: 0px; - font: font(14px); + font: font(fsize); duration: 200; bgFunc: transition(easeOutCirc); cursor: cursor(pointer); @@ -1381,7 +1379,7 @@ rbEmojiSymbols: flatCheckbox(rbEmoji) { } emojiPanPadding: margins(10px, 5px, 0px, 5px); emojiPanSize: size(28px, 28px); -emojiPanFont: font(14px); +emojiPanFont: font(fsize); emojiPanText: #999; emojiPanSub: 0px; emojiPanDuration: 200; diff --git a/Telegram/Setup.iss b/Telegram/Setup.iss index 77f48f59f..bc6015c83 100644 --- a/Telegram/Setup.iss +++ b/Telegram/Setup.iss @@ -3,9 +3,9 @@ #define MyAppShortName "Telegram" #define MyAppName "Telegram Win (Unofficial)" -#define MyAppVersion "0.5.2" -#define MyAppVersionZero "0.5.2" -#define MyAppFullVersion "0.5.2.0" +#define MyAppVersion "0.5.4" +#define MyAppVersionZero "0.5.4" +#define MyAppFullVersion "0.5.4.0" #define MyAppPublisher "Telegram (Unofficial)" #define MyAppURL "https://tdesktop.com" #define MyAppExeName "Telegram.exe" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index f9e54fa3c..4a71418d8 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -81,11 +81,9 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv), installEventFilter(new _DebugWaiter(this)); - QFontDatabase::addApplicationFont(qsl(":/gui/art/segoe_ui.ttf")); - QFontDatabase::addApplicationFont(qsl(":/gui/art/segoeuib.ttf")); - QFontDatabase::addApplicationFont(qsl(":/gui/art/segoe_ui_semibold.ttf")); - QFontDatabase::addApplicationFont(qsl(":/gui/art/segoe_wp_semibold.ttf")); -// QFontDatabase::addApplicationFont(qsl(":/gui/art/ThoolikaTrditionalUnicode.ttf")); + QFontDatabase::addApplicationFont(qsl(":/gui/art/OpenSans-Regular.ttf")); + QFontDatabase::addApplicationFont(qsl(":/gui/art/OpenSans-Bold.ttf")); + QFontDatabase::addApplicationFont(qsl(":/gui/art/OpenSans-Semibold.ttf")); float64 dpi = primaryScreen()->logicalDotsPerInch(); if (dpi <= 108) { // 0-96-108 diff --git a/Telegram/SourceFiles/art/OpenSans-Bold.ttf b/Telegram/SourceFiles/art/OpenSans-Bold.ttf new file mode 100644 index 000000000..fd79d43be Binary files /dev/null and b/Telegram/SourceFiles/art/OpenSans-Bold.ttf differ diff --git a/Telegram/SourceFiles/art/OpenSans-Regular.ttf b/Telegram/SourceFiles/art/OpenSans-Regular.ttf new file mode 100644 index 000000000..db433349b Binary files /dev/null and b/Telegram/SourceFiles/art/OpenSans-Regular.ttf differ diff --git a/Telegram/SourceFiles/art/OpenSans-Semibold.ttf b/Telegram/SourceFiles/art/OpenSans-Semibold.ttf new file mode 100644 index 000000000..1a7679e39 Binary files /dev/null and b/Telegram/SourceFiles/art/OpenSans-Semibold.ttf differ diff --git a/Telegram/SourceFiles/art/ThoolikaTrditionalUnicode.ttf b/Telegram/SourceFiles/art/ThoolikaTrditionalUnicode.ttf deleted file mode 100644 index 00394ae16..000000000 Binary files a/Telegram/SourceFiles/art/ThoolikaTrditionalUnicode.ttf and /dev/null differ diff --git a/Telegram/SourceFiles/art/segoe_ui.ttf b/Telegram/SourceFiles/art/segoe_ui.ttf deleted file mode 100644 index ed52fc683..000000000 Binary files a/Telegram/SourceFiles/art/segoe_ui.ttf and /dev/null differ diff --git a/Telegram/SourceFiles/art/segoe_ui_semibold.ttf b/Telegram/SourceFiles/art/segoe_ui_semibold.ttf deleted file mode 100644 index 82cafee64..000000000 Binary files a/Telegram/SourceFiles/art/segoe_ui_semibold.ttf and /dev/null differ diff --git a/Telegram/SourceFiles/art/segoe_wp_semibold.ttf b/Telegram/SourceFiles/art/segoe_wp_semibold.ttf deleted file mode 100644 index 2d067e4a8..000000000 Binary files a/Telegram/SourceFiles/art/segoe_wp_semibold.ttf and /dev/null differ diff --git a/Telegram/SourceFiles/art/segoeuib.ttf b/Telegram/SourceFiles/art/segoeuib.ttf deleted file mode 100644 index aea25424d..000000000 Binary files a/Telegram/SourceFiles/art/segoeuib.ttf and /dev/null differ diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp index 4f4e5c9a4..1009be8eb 100644 --- a/Telegram/SourceFiles/boxes/contactsbox.cpp +++ b/Telegram/SourceFiles/boxes/contactsbox.cpp @@ -24,7 +24,6 @@ Copyright (c) 2014 John Preston, https://tdesktop.com #include "window.h" ContactsInner::ContactsInner() : _contacts(&App::main()->contactsList()), _sel(0), _filteredSel(-1), _mouseSel(false) { - _filter = qsl("a"); updateFilter(); diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index 845ea10e7..ce996a5c8 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -17,8 +17,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com */ #pragma once -static const int32 AppVersion = 5002; -static const wchar_t *AppVersionStr = L"0.5.2"; +static const int32 AppVersion = 5004; +static const wchar_t *AppVersionStr = L"0.5.4"; static const wchar_t *AppName = L"Telegram Win (Unofficial)"; static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index 065dcc8a7..7e72ab93e 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -2394,7 +2394,9 @@ void HistoryWidget::updateOnlineDisplay(int32 x, int32 w) { if (titlePeerText != text) { titlePeerText = text; titlePeerTextWidth = st::dlgHistFont->m.width(titlePeerText); - App::main()->topBar()->update(); + if (App::main()) { + App::main()->topBar()->update(); + } } updateOnlineDisplayTimer(); } diff --git a/Telegram/SourceFiles/settingswidget.cpp b/Telegram/SourceFiles/settingswidget.cpp index ea88ff967..5fced5e7b 100644 --- a/Telegram/SourceFiles/settingswidget.cpp +++ b/Telegram/SourceFiles/settingswidget.cpp @@ -451,7 +451,7 @@ void SettingsInner::resizeEvent(QResizeEvent *e) { // general top += st::setHeaderSkip; _autoUpdate.move(_left, top); - _checkNow.move(_left + st::setWidth - _checkNow.width(), top); top += _autoUpdate.height(); + _checkNow.move(_left + st::setWidth - _checkNow.width(), top + st::cbDefFlat.textTop); top += _autoUpdate.height(); _restartNow.move(_left + st::setWidth - _restartNow.width(), top + st::setVersionTop); top += st::setVersionHeight; diff --git a/Telegram/SourceFiles/telegram.qrc b/Telegram/SourceFiles/telegram.qrc index c58227517..a255b114c 100644 --- a/Telegram/SourceFiles/telegram.qrc +++ b/Telegram/SourceFiles/telegram.qrc @@ -1,9 +1,8 @@ - art/segoe_ui.ttf - art/segoeuib.ttf - art/segoe_ui_semibold.ttf - art/segoe_wp_semibold.ttf + art/OpenSans-Regular.ttf + art/OpenSans-Bold.ttf + art/OpenSans-Semibold.ttf art/newmsg.wav art/bg.png art/bg_125x.png @@ -19,7 +18,6 @@ art/emoji_200x.png art/blank.gif art/iconround256.png - art/ThoolikaTrditionalUnicode.ttf art/chatcolor1.png diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc index 29ecc6916..f817ae7c4 100644 Binary files a/Telegram/Telegram.rc and b/Telegram/Telegram.rc differ