MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use some resources from lib_ui.

Browse Source
This commit is contained in:
John Preston 2019-09-18 16:01:58 +03:00
parent a6c84c36c0
commit a6b96662c4
15 changed files with 12 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/etc/qt_linux.conf
View File

@ -1,2 +0,0 @@
[Paths]
Libraries=:/gui/art

2
Telegram/Resources/etc/qt_win.conf
View File

@ -1,2 +0,0 @@
[Platforms]
WindowsArguments = nomousefromtouch

57
Telegram/Resources/fc-custom.conf
View File

@ -1,57 +0,0 @@
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<fontconfig>
<dir>/usr/share/fonts</dir>
<dir>/usr/local/share/fonts</dir>
<dir>~/.fonts</dir>
<dir>~/.local/share/fonts</dir>
<dir>/usr/X11R6/lib/X11/fonts</dir>
<dir prefix="xdg">fonts</dir>
<match target="pattern">
<test qual="any" name="family">
<string>mono</string>
</test>
<edit name="family" mode="assign" binding="same">
<string>monospace</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family">
<string>sans serif</string>
</test>
<edit name="family" mode="assign" binding="same">
<string>sans-serif</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family">
<string>sans</string>
</test>
<edit name="family" mode="assign" binding="same">
<string>sans-serif</string>
</edit>
</match>
<cachedir>/var/cache/fontconfig_11</cachedir>
<cachedir prefix="xdg">fontconfig_11</cachedir>
<cachedir>~/.fontconfig_11</cachedir>
<match target="font">
<edit mode="assign" name="antialias">
<bool>true</bool>
</edit>
<edit mode="assign" name="embeddedbitmap">
<bool>false</bool>
</edit>
<edit mode="assign" name="hinting">
<bool>true</bool>
</edit>
<edit mode="assign" name="hintstyle">
<const>hintslight</const>
</edit>
<edit mode="assign" name="lcdfilter">
<const>lcddefault</const>
</edit>
<edit mode="assign" name="rgba">
<const>rgb</const>
</edit>
</match>
</fontconfig>

BIN
Telegram/Resources/fonts/OpenSans-Bold.ttf
View File

Binary file not shown.

BIN
Telegram/Resources/fonts/OpenSans-Regular.ttf
View File

Binary file not shown.

BIN
Telegram/Resources/fonts/OpenSans-Semibold.ttf
View File

Binary file not shown.

7
Telegram/Resources/qrc/fonts.qrc
View File

@ -1,7 +0,0 @@
<RCC>
<qresource prefix="/gui">
<file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
<file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
<file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file>
</qresource>
</RCC>

8
Telegram/Resources/qrc/linux.qrc
View File

@ -1,8 +0,0 @@
<RCC>
<qresource prefix="/qt">
<file alias="etc/qt.conf">../etc/qt_linux.conf</file>
</qresource>
<qresource prefix="/fc">
<file alias="fc-custom.conf">../fc-custom.conf</file>
</qresource>
</RCC>

2
Telegram/Resources/qrc/mac.qrc
View File

@ -1,2 +0,0 @@
<RCC>
</RCC>

5
Telegram/Resources/qrc/wnd.qrc
View File

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/qt">
<file alias="etc/qt.conf">../etc/qt_win.conf</file>
</qresource>
</RCC>

9
Telegram/SourceFiles/history/history.style
View File

@ -639,3 +639,12 @@ scheduleTimeSeparator: FlatLabel(defaultFlatLabel) {
}
}
scheduleTimeSeparatorPadding: margins(2px, 0px, 2px, 0px);
youtubeIcon: icon {
{ "media_youtube_play_bg", youtubePlayIconBg },
{ "media_youtube_play", youtubePlayIconFg, point(24px, 12px) },
};
videoIcon: icon {
{ "media_video_play_bg", videoPlayIconBg },
{ "media_video_play", videoPlayIconFg, point(12px, 12px) },
};

2
Telegram/gyp/helpers

@ -1 +1 @@
Subproject commit 85d6a5afc029d398411aac27c02970f00132bc42
Subproject commit 14890fb48acb3ee8151f98589847ffcfd3aa7826

2
Telegram/gyp/telegram/mac.gypi
View File

@ -14,7 +14,7 @@
],
'xcode_settings': {
'INFOPLIST_FILE': '../Telegram.plist',
'CURRENT_PROJECT_VERSION': '<!(./print_version.sh)',
'CURRENT_PROJECT_VERSION': '<!(helpers/common/print_version.sh <(DEPTH)/../build/version)',
'ASSETCATALOG_COMPILER_APPICON_NAME': 'AppIcon',
'ENABLE_HARDENED_RUNTIME': 'YES',
'OTHER_LDFLAGS': [

24
Telegram/gyp/telegram/qrc.gypi
View File

@ -7,7 +7,6 @@
{
'variables': {
'qrc_files': [
'<(res_loc)/qrc/fonts.qrc',
'<(res_loc)/qrc/emoji_1.qrc',
'<(res_loc)/qrc/emoji_2.qrc',
'<(res_loc)/qrc/emoji_3.qrc',
@ -18,27 +17,4 @@
'<(res_loc)/qrc/telegram/sounds.qrc',
],
},
'conditions': [
[ 'build_linux', {
'variables': {
'qrc_files': [
'<(res_loc)/qrc/linux.qrc',
],
}
}],
[ 'build_mac', {
'variables': {
'qrc_files': [
'<(res_loc)/qrc/mac.qrc',
],
},
}],
[ 'build_win', {
'variables': {
'qrc_files': [
'<(res_loc)/qrc/wnd.qrc',
],
}
}],
],
}

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit f4904e5ec4f6596c445fbec295cedcdb69dd90b7
Subproject commit 5b7ca43baf8c5ff3b1a65a09a458c599ac03e68d