RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflicts fixed, moved to open sans font

This commit is contained in:
John Preston 2014-06-17 10:12:18 +04:00
parent 2b61046a75 404489dbbc
commit bdfdd32f75
18 changed files with 81 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -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 (**not** RT)
* Windows 8.1 (**not** RT) * Windows 8.1 (**not** RT)
###Third-party libraries ###Third-party
* Qt 5.3.0, slightly patched * Qt 5.3.0, slightly patched ([GPL](http://qt-project.org/doc/qt-5/gpl.html))
* OpenSSL 1.0.1g * OpenSSL 1.0.1g ([OpenSSL License](https://www.openssl.org/source/license.html))
* zlib 1.2.8 * zlib 1.2.8 ([zlib License](http://www.zlib.net/zlib_license.html))
* libexif 0.6.20 * libexif 0.6.20 ([LGPL](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html))
* LZMA SDK 9.20 * 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 ##Build instructions for Visual Studio 2013

120
Telegram/Resources/style.txt
View File

@ -15,9 +15,10 @@ GNU General Public License for more details.
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
Copyright (c) 2014 John Preston, https://tdesktop.com Copyright (c) 2014 John Preston, https://tdesktop.com
*/ */
defaultFontFamily: 'Segoe UI'; defaultFontFamily: 'Open Sans';
//defaultFontFamily: 'ThoolikaTraditionalUnicode'; semibold: 'Open Sans Semibold';
semibold: 'Segoe WP 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 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 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; titleStatusColor: #999;
titleTypingColor: #0080c0; titleTypingColor: #0080c0;
statusFont: font(14px); statusFont: font(fsize);
versionColor: #777; versionColor: #777;
sysBtnDelta: 6px; sysBtnDelta: 6px;
@ -106,7 +107,7 @@ btnDefIconed: iconedButton {
color: white; color: white;
bgColor: white; bgColor: white;
overBgColor: white; overBgColor: white;
font: font(14px); font: font(fsize);
opacity: 0.78; opacity: 0.78;
overOpacity: 1; overOpacity: 1;
@ -169,8 +170,8 @@ btnDefBack: flatButton(btnDefFlat) {
downBgColor: #b9b9b9; downBgColor: #b9b9b9;
} }
linkFont: font(14px); linkFont: font(fsize);
linkOverFont: font(14px underline); linkOverFont: font(fsize underline);
btnDefLink: linkButton { btnDefLink: linkButton {
color: btnYesColor; color: btnYesColor;
overColor: btnYesColor; overColor: btnYesColor;
@ -185,9 +186,9 @@ cbDefFlat: flatCheckbox {
disColor: #999; disColor: #999;
height: 22px; height: 22px;
textTop: 0px; textTop: 1px;
textLeft: 34px; textLeft: 34px;
font: font(14px); font: font(fsize);
duration: 200; duration: 200;
bgFunc: transition(easeOutCirc); bgFunc: transition(easeOutCirc);
cursor: cursor(pointer); cursor: cursor(pointer);
@ -293,7 +294,7 @@ scrollCountries: flatScroll(scrollDef) {
lnkText: #0f7dc7; lnkText: #0f7dc7;
labelDefFlat: flatLabel { labelDefFlat: flatLabel {
font: font(14px); font: font(fsize);
minWidth: 100px; minWidth: 100px;
width: 0px; width: 0px;
align: align(left); align: align(left);
@ -476,23 +477,23 @@ introErrLabel: flatLabel(labelDefFlat) {
setWidth: 356px; setWidth: 356px;
setTop: 26px; setTop: 26px;
setNameLeft: 3px; setNameLeft: 3px;
setNameTop: 0px; setNameTop: 1px;
setNameFont: font(23px); setNameFont: font(22px);
setPhoneFont: font(16px); setPhoneFont: font(16px);
setPhoneColor: #999; setPhoneColor: #999;
setPhoneTop: 38px; setPhoneTop: 39px;
setPhoneLeft: 1px; setPhoneLeft: 1px;
setPhotoSize: 120px; setPhotoSize: 120px;
setHeaderFont: font(20px); setHeaderFont: font(20px);
setHeaderColor: black; setHeaderColor: black;
setHeaderSkip: 59px; setHeaderSkip: 59px;
setHeaderLeft: -1px; setHeaderLeft: -1px;
setHeaderTop: 21px; setHeaderTop: 22px;
setLittleSkip: 9px; setLittleSkip: 9px;
setSectionSkip: 25px; setSectionSkip: 25px;
setVersionHeight: 41px; setVersionHeight: 41px;
setVersionLeft: 36px; setVersionLeft: 36px;
setVersionTop: 2px; setVersionTop: 3px;
setVersionColor: #999; setVersionColor: #999;
setBottom: 130px; setBottom: 130px;
setScroll: flatScroll(scrollDef) { setScroll: flatScroll(scrollDef) {
@ -520,7 +521,7 @@ setTitleFrom: point(20px, 20px);
setTitleFont: font(24px); setTitleFont: font(24px);
setTitleColor: #000; setTitleColor: #000;
setNameInput: flatInput(inpDefFlat) { setNameInput: flatInput(inpDefFlat) {
font: font(14px); font: font(fsize);
height: 25px; height: 25px;
width: 170px; width: 170px;
textMrg: margins(3px, 3px, 3px, 3px); textMrg: margins(3px, 3px, 3px, 3px);
@ -528,7 +529,7 @@ setNameInput: flatInput(inpDefFlat) {
setErrBG: #ffa5a5; setErrBG: #ffa5a5;
setErrColor: #800000; setErrColor: #800000;
setErrHeight: 30px; setErrHeight: 30px;
setErrFont: font(14px); setErrFont: font(fsize);
btnSetUpload: flatButton(btnDefNext, btnDefBig) { btnSetUpload: flatButton(btnDefNext, btnDefBig) {
width: 206px; width: 206px;
@ -592,7 +593,7 @@ dlgPaddingVer: 8px;
dlgHeight: 62px; dlgHeight: 62px;
dlgPhotoPadding: 12px; dlgPhotoPadding: 12px;
dlgSep: 6px; dlgSep: 8px;
dlgShadowColor: rgba(0, 0, 0, 24);//#ebebeb dlgShadowColor: rgba(0, 0, 0, 24);//#ebebeb
dlgShadow: 1px; dlgShadow: 1px;
@ -601,7 +602,7 @@ dlgMinWidth: 260px;
dlgRichMinWidth: 150px; dlgRichMinWidth: 150px;
dlgMaxWidth: 540px; dlgMaxWidth: 540px;
dlgFilter: flatInput(inpDefGray) { dlgFilter: flatInput(inpDefGray) {
font: font(14px); font: font(fsize);
height: 34px; height: 34px;
bgColor: #f2f2f2; bgColor: #f2f2f2;
phColor: #949494; phColor: #949494;
@ -620,7 +621,7 @@ dlgScroll: flatScroll(scrollDef) {
topsh: 0px; topsh: 0px;
bottomsh: 0px; bottomsh: 0px;
} }
dlgFont: font(14px); dlgFont: font(fsize);
dlgDblCheckImg: sprite(302px, 23px, 17px, 11px); dlgDblCheckImg: sprite(302px, 23px, 17px, 11px);
dlgCheckImg: sprite(320px, 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); dlgActiveChatImg: sprite(322px, 51px, 16px, 11px);
dlgChatImgLeft: 1px; dlgChatImgLeft: 1px;
dlgChatImgTop: 5px; dlgChatImgTop: 4px;
dlgChatImgSkip: 22px; dlgChatImgSkip: 22px;
dlgCheckLeft: 5px; dlgCheckLeft: 5px;
dlgCheckTop: 5px; dlgCheckTop: 4px;
dlgCheckSkip: 3px; dlgCheckSkip: 3px;
dlgFromFont: font(12px bold); dlgHistFont: font(fsize);
dlgFromColor: #4981af;
dlgHistFont: font(14px);
dlgNameColor: #000; dlgNameColor: #000;
dlgNameTop: 1px; dlgNameTop: 2px;
dlgSystemColor: #4981af; dlgSystemColor: #4981af;
dlgTextColor: #888888; dlgTextColor: #888888;
@ -670,7 +668,7 @@ dlgActiveDateColor: #d3e2ee;
topBarHeight: 54px; topBarHeight: 54px;
topBarBG: white; topBarBG: white;
topBarDuration: 200; topBarDuration: 200;
topBarForwardPadding: margins(17px, 7px, 40px, 8px); topBarForwardPadding: margins(17px, 8px, 40px, 8px);
topBarForwardAlpha: 0.6; topBarForwardAlpha: 0.6;
topBarForwardImg: sprite(45px, 112px, 9px, 16px); topBarForwardImg: sprite(45px, 112px, 9px, 16px);
topBarBackPadding: margins(15px, 7px, 9px, 7px); topBarBackPadding: margins(15px, 7px, 9px, 7px);
@ -690,20 +688,20 @@ topBarButton: flatButton(btnDefFlat) {
width: -40px; width: -40px;
height: 54px; height: 54px;
textTop: 18px; textTop: 19px;
overTextTop: 18px; overTextTop: 19px;
downTextTop: 19px; downTextTop: 20px;
font: font(14px); font: font(fsize);
overFont: font(14px underline); overFont: font(fsize underline);
} }
topBarActionButton: flatButton(btnDefNext, btnDefBig) { topBarActionButton: flatButton(btnDefNext, btnDefBig) {
textTop: 8px; textTop: 8px;
overTextTop: 8px; overTextTop: 8px;
downTextTop: 9px; downTextTop: 9px;
font: font(14px); font: font(fsize);
overFont: font(14px); overFont: font(fsize);
width: 101px; width: 101px;
height: 34px; height: 34px;
} }
@ -712,10 +710,10 @@ topBarSelectedPos: point(18px, 18px);
historyBG: #dfe4e8; historyBG: #dfe4e8;
msgMaxWidth: 550px; msgMaxWidth: 550px;
msgFont: font(14px); msgFont: font(fsize);
msgNameFont: font(14px semibold); msgNameFont: font(fsize semibold);
msgServiceFont: font(14px semibold); msgServiceFont: font(fsize semibold);
msgServiceNameFont: font(14px semibold); msgServiceNameFont: font(fsize semibold);
msgDateFont: font(13px); msgDateFont: font(13px);
msgMinWidth: 190px; msgMinWidth: 190px;
msgPhotoSize: 30px; msgPhotoSize: 30px;
@ -780,8 +778,8 @@ msgDogImg: sprite(213px, 93px, 126px, 126px);
historyPadding: 10px; historyPadding: 10px;
defaultTextStyle: textStyle { defaultTextStyle: textStyle {
lnkFlags: font(14px); lnkFlags: font(fsize);
lnkOverFlags: font(14px underline); lnkOverFlags: font(fsize underline);
lnkColor: btnYesColor; lnkColor: btnYesColor;
lnkDownColor: btnYesHover; lnkDownColor: btnYesHover;
selectBG: msgInSelectBG; selectBG: msgInSelectBG;
@ -806,16 +804,16 @@ outTextStyle: textStyle(defaultTextStyle) {
dlgTextStyle: textStyle(defaultTextStyle) { dlgTextStyle: textStyle(defaultTextStyle) {
lnkColor: dlgSystemColor; lnkColor: dlgSystemColor;
lnkDownColor: dlgSystemColor; lnkDownColor: dlgSystemColor;
lnkOverFlags: font(14px); lnkOverFlags: font(fsize);
} }
dlgActiveTextStyle: textStyle(defaultTextStyle) { dlgActiveTextStyle: textStyle(defaultTextStyle) {
lnkColor: dlgActiveColor; lnkColor: dlgActiveColor;
lnkDownColor: dlgActiveColor; lnkDownColor: dlgActiveColor;
lnkOverFlags: font(14px); lnkOverFlags: font(fsize);
} }
mediaMaxWidth: 250px; mediaMaxWidth: 250px;
mediaFont: font(14px); mediaFont: font(fsize);
mediaPadding: margins(7px, 6px, 11px, 6px); mediaPadding: margins(7px, 6px, 11px, 6px);
mediaThumbSize: 48px; mediaThumbSize: 48px;
mediaDocOutImg: sprite(6px, 146px, 48px, 48px); mediaDocOutImg: sprite(6px, 146px, 48px, 48px);
@ -843,11 +841,11 @@ mediaSaveButton: flatButton(btnDefFlat) {
overTextTop: 7px; overTextTop: 7px;
downTextTop: 8px; downTextTop: 8px;
font: font(14px); font: font(fsize);
overFont: font(14px); overFont: font(fsize);
} }
sendPadding: 8px; sendPadding: 9px;
btnSend: flatButton(btnDefFlat) { btnSend: flatButton(btnDefFlat) {
color: btnYesColor; color: btnYesColor;
overColor: btnYesHover; overColor: btnYesHover;
@ -912,12 +910,12 @@ taMsgField: flatTextarea(taDefFlat) {
font: msgFont; font: msgFont;
} }
maxFieldHeight: 250px; maxFieldHeight: 250px;
minFieldHeight: 30px; minFieldHeight: 28px;
newMsgSound: ':/gui/art/newmsg.wav'; newMsgSound: ':/gui/art/newmsg.wav';
unreadBarHeight: 32px; unreadBarHeight: 32px;
unreadBarFont: font(14px semibold); unreadBarFont: font(fsize semibold);
unreadBarBG: #fcfbfa; unreadBarBG: #fcfbfa;
unreadBarBorder: titleShadowColor; unreadBarBorder: titleShadowColor;
unreadBarColor: #538bb4; unreadBarColor: #538bb4;
@ -996,11 +994,11 @@ profileMaxWidth: 410px;
profilePadding: margins(28px, 30px, 28px, 0px); profilePadding: margins(28px, 30px, 28px, 0px);
profilePhotoSize: 120px; profilePhotoSize: 120px;
profileNameLeft: 21px; profileNameLeft: 21px;
profileNameTop: -2px; profileNameTop: -1px;
profileNameFont: font(20px); profileNameFont: font(20px);
profileStatusLeft: 22px; profileStatusLeft: 22px;
profileStatusTop: 30px; profileStatusTop: 31px;
profileStatusFont: font(14px); profileStatusFont: font(fsize);
profilePhoneLeft: 20px; profilePhoneLeft: 20px;
profilePhoneTop: 62px; profilePhoneTop: 62px;
profilePhoneFont: font(16px); profilePhoneFont: font(16px);
@ -1010,20 +1008,20 @@ profileHeaderFont: font(20px);
profileHeaderColor: black; profileHeaderColor: black;
profileHeaderSkip: 59px; profileHeaderSkip: 59px;
profileHeaderLeft: -1px; profileHeaderLeft: -1px;
profileHeaderTop: 21px; profileHeaderTop: 22px;
profileListPhotoSize: 46px; profileListPhotoSize: 46px;
profileListPadding: size(12px, 6px); profileListPadding: size(12px, 6px);
profileListNameTop: 7px; profileListNameTop: 8px;
profileListStatusBottom: 6px; profileListStatusBottom: 6px;
profileHoverBG: #f1f1f1; profileHoverBG: #f1f1f1;
profileActiveBG: #6294b9; profileActiveBG: #6294b9;
profileSubFont: font(14px); profileSubFont: font(fsize);
profileCheckRect: sprite(88px, 108px, 24px, 24px); profileCheckRect: sprite(88px, 108px, 24px, 24px);
profileCheckActiveRect: sprite(128px, 108px, 24px, 24px); profileCheckActiveRect: sprite(128px, 108px, 24px, 24px);
profileCheckDeltaX: 18px; profileCheckDeltaX: 18px;
profileCheckDeltaY: 1px; profileCheckDeltaY: 1px;
profileListNameFont: font(14px semibold); profileListNameFont: font(fsize semibold);
profileListNameColor: #000; profileListNameColor: #000;
profileOnlineColor: titleTypingColor; profileOnlineColor: titleTypingColor;
profileOfflineColor: titleStatusColor; profileOfflineColor: titleStatusColor;
@ -1137,7 +1135,7 @@ newGroupNamePadding: margins(12px, 15px, 12px, 13px);
connectionSkip: 20px; connectionSkip: 20px;
inpConnectionHost: flatInput(inpDefGray) { inpConnectionHost: flatInput(inpDefGray) {
font: font(14px); font: font(fsize);
height: 34px; height: 34px;
bgColor: #f2f2f2; bgColor: #f2f2f2;
phColor: #949494; phColor: #949494;
@ -1261,13 +1259,13 @@ dragPadding: margins(20px, 10px, 20px, 10px);
dragHeight: 72px; dragHeight: 72px;
selectedFont: font(14px); selectedFont: font(fsize);
selectedColor: #777; selectedColor: #777;
selectedTop: 14px; selectedTop: 14px;
downloadSkip: 20px; downloadSkip: 20px;
inpDownloadDir: flatInput(inpDefGray) { inpDownloadDir: flatInput(inpDefGray) {
font: font(14px); font: font(fsize);
height: 34px; height: 34px;
bgColor: #fff; bgColor: #fff;
textMrg: margins(5px, 2px, 5px, 4px); textMrg: margins(5px, 2px, 5px, 4px);
@ -1323,7 +1321,7 @@ rbEmoji: flatCheckbox {
textTop: 0px; textTop: 0px;
textLeft: 0px; textLeft: 0px;
font: font(14px); font: font(fsize);
duration: 200; duration: 200;
bgFunc: transition(easeOutCirc); bgFunc: transition(easeOutCirc);
cursor: cursor(pointer); cursor: cursor(pointer);
@ -1381,7 +1379,7 @@ rbEmojiSymbols: flatCheckbox(rbEmoji) {
} }
emojiPanPadding: margins(10px, 5px, 0px, 5px); emojiPanPadding: margins(10px, 5px, 0px, 5px);
emojiPanSize: size(28px, 28px); emojiPanSize: size(28px, 28px);
emojiPanFont: font(14px); emojiPanFont: font(fsize);
emojiPanText: #999; emojiPanText: #999;
emojiPanSub: 0px; emojiPanSub: 0px;
emojiPanDuration: 200; emojiPanDuration: 200;

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.2" #define MyAppVersion "0.5.4"
#define MyAppVersionZero "0.5.2" #define MyAppVersionZero "0.5.4"
#define MyAppFullVersion "0.5.2.0" #define MyAppFullVersion "0.5.4.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"

8
Telegram/SourceFiles/application.cpp
View File

@ -81,11 +81,9 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
installEventFilter(new _DebugWaiter(this)); installEventFilter(new _DebugWaiter(this));
QFontDatabase::addApplicationFont(qsl(":/gui/art/segoe_ui.ttf")); QFontDatabase::addApplicationFont(qsl(":/gui/art/OpenSans-Regular.ttf"));
QFontDatabase::addApplicationFont(qsl(":/gui/art/segoeuib.ttf")); QFontDatabase::addApplicationFont(qsl(":/gui/art/OpenSans-Bold.ttf"));
QFontDatabase::addApplicationFont(qsl(":/gui/art/segoe_ui_semibold.ttf")); QFontDatabase::addApplicationFont(qsl(":/gui/art/OpenSans-Semibold.ttf"));
QFontDatabase::addApplicationFont(qsl(":/gui/art/segoe_wp_semibold.ttf"));
// QFontDatabase::addApplicationFont(qsl(":/gui/art/ThoolikaTrditionalUnicode.ttf"));
float64 dpi = primaryScreen()->logicalDotsPerInch(); float64 dpi = primaryScreen()->logicalDotsPerInch();
if (dpi <= 108) { // 0-96-108 if (dpi <= 108) { // 0-96-108

BIN
Telegram/SourceFiles/art/OpenSans-Bold.ttf Normal file
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/OpenSans-Regular.ttf Normal file
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/OpenSans-Semibold.ttf Normal file
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/ThoolikaTrditionalUnicode.ttf
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/segoe_ui.ttf
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/segoe_ui_semibold.ttf
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/segoe_wp_semibold.ttf
View File

Binary file not shown.

BIN
Telegram/SourceFiles/art/segoeuib.ttf
View File

Binary file not shown.

1
Telegram/SourceFiles/boxes/contactsbox.cpp
View File

@ -24,7 +24,6 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
#include "window.h" #include "window.h"
ContactsInner::ContactsInner() : _contacts(&App::main()->contactsList()), _sel(0), _filteredSel(-1), _mouseSel(false) { ContactsInner::ContactsInner() : _contacts(&App::main()->contactsList()), _sel(0), _filteredSel(-1), _mouseSel(false) {
_filter = qsl("a"); _filter = qsl("a");
updateFilter(); updateFilter();

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 = 5002; static const int32 AppVersion = 5004;
static const wchar_t *AppVersionStr = L"0.5.2"; static const wchar_t *AppVersionStr = L"0.5.4";
static const wchar_t *AppName = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Win (Unofficial)";
static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}";

4
Telegram/SourceFiles/historywidget.cpp
View File

@ -2394,7 +2394,9 @@ void HistoryWidget::updateOnlineDisplay(int32 x, int32 w) {
if (titlePeerText != text) { if (titlePeerText != text) {
titlePeerText = text; titlePeerText = text;
titlePeerTextWidth = st::dlgHistFont->m.width(titlePeerText); titlePeerTextWidth = st::dlgHistFont->m.width(titlePeerText);
App::main()->topBar()->update(); if (App::main()) {
App::main()->topBar()->update();
}
} }
updateOnlineDisplayTimer(); updateOnlineDisplayTimer();
} }

2
Telegram/SourceFiles/settingswidget.cpp
View File

@ -451,7 +451,7 @@ void SettingsInner::resizeEvent(QResizeEvent *e) {
// general // general
top += st::setHeaderSkip; top += st::setHeaderSkip;
_autoUpdate.move(_left, top); _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); _restartNow.move(_left + st::setWidth - _restartNow.width(), top + st::setVersionTop);
top += st::setVersionHeight; top += st::setVersionHeight;

8
Telegram/SourceFiles/telegram.qrc
View File

@ -1,9 +1,8 @@
<RCC> <RCC>
<qresource prefix="/gui"> <qresource prefix="/gui">
<file>art/segoe_ui.ttf</file> <file>art/OpenSans-Regular.ttf</file>
<file>art/segoeuib.ttf</file> <file>art/OpenSans-Bold.ttf</file>
<file>art/segoe_ui_semibold.ttf</file> <file>art/OpenSans-Semibold.ttf</file>
<file>art/segoe_wp_semibold.ttf</file>
<file>art/newmsg.wav</file> <file>art/newmsg.wav</file>
<file>art/bg.png</file> <file>art/bg.png</file>
<file>art/bg_125x.png</file> <file>art/bg_125x.png</file>
@ -19,7 +18,6 @@
<file>art/emoji_200x.png</file> <file>art/emoji_200x.png</file>
<file>art/blank.gif</file> <file>art/blank.gif</file>
<file>art/iconround256.png</file> <file>art/iconround256.png</file>
<file>art/ThoolikaTrditionalUnicode.ttf</file>
</qresource> </qresource>
<qresource prefix="/ava"> <qresource prefix="/ava">
<file>art/chatcolor1.png</file> <file>art/chatcolor1.png</file>

BIN
Telegram/Telegram.rc
View File

Binary file not shown.