diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
new file mode 100644
index 0000000..fd79d43
Binary files /dev/null and b/fonts/OpenSans-Bold.ttf differ
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000..db43334
Binary files /dev/null and b/fonts/OpenSans-Regular.ttf differ
diff --git a/fonts/OpenSans-Semibold.ttf b/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 0000000..1a7679e
Binary files /dev/null and b/fonts/OpenSans-Semibold.ttf differ
diff --git a/fonts/fonts.qrc b/fonts/fonts.qrc
new file mode 100644
index 0000000..1e965c5
--- /dev/null
+++ b/fonts/fonts.qrc
@@ -0,0 +1,7 @@
+
+
+ OpenSans-Regular.ttf
+ OpenSans-Bold.ttf
+ OpenSans-Semibold.ttf
+
+
diff --git a/gyp/qrc_rule.gypi b/gyp/qrc_rule.gypi
index 7b1e594..eb4654c 100644
--- a/gyp/qrc_rule.gypi
+++ b/gyp/qrc_rule.gypi
@@ -5,6 +5,34 @@
# https://github.com/desktop-app/legal/blob/master/LEGAL
{
+ 'variables': {
+ 'qrc_files': [
+ '<(submodules_loc)/lib_ui/fonts/fonts.qrc',
+ ],
+ },
+ 'conditions': [
+ [ 'build_linux', {
+ 'variables': {
+ 'qrc_files': [
+ '<(submodules_loc)/lib_ui/qt_conf/linux.qrc',
+ ],
+ }
+ }],
+ [ 'build_mac', {
+ 'variables': {
+ 'qrc_files': [
+ '<(submodules_loc)/lib_ui/qt_conf/mac.qrc',
+ ],
+ },
+ }],
+ [ 'build_win', {
+ 'variables': {
+ 'qrc_files': [
+ '<(submodules_loc)/lib_ui/qt_conf/win.qrc',
+ ],
+ }
+ }],
+ ],
'actions': [{
'action_name': 'update_dependent_qrc',
'inputs': [
diff --git a/gyp/update_dependent.py b/gyp/update_dependent.py
index 4ea5e0b..2d0f451 100644
--- a/gyp/update_dependent.py
+++ b/gyp/update_dependent.py
@@ -35,7 +35,6 @@ def list_qrc_dependencies(file_path):
dependencies = get_qrc_dependencies(file_path)
for path in dependencies:
print(path)
- sys.exit(0)
one_modified = 0
def handle_qrc_dependencies(file_path):
@@ -160,6 +159,7 @@ elif request == 'qrc':
elif request == 'qrc_list':
for file_path in file_paths:
list_qrc_dependencies(file_path)
+ sys.exit(0)
else:
eprint('Request required.')
diff --git a/qt_conf/fc-custom.conf b/qt_conf/fc-custom.conf
new file mode 100644
index 0000000..ab5c183
--- /dev/null
+++ b/qt_conf/fc-custom.conf
@@ -0,0 +1,57 @@
+
+
+
+ /usr/share/fonts
+ /usr/local/share/fonts
+ ~/.fonts
+ ~/.local/share/fonts
+ /usr/X11R6/lib/X11/fonts
+ fonts
+
+
+ mono
+
+
+ monospace
+
+
+
+
+ sans serif
+
+
+ sans-serif
+
+
+
+
+ sans
+
+
+ sans-serif
+
+
+ /var/cache/fontconfig_11
+ fontconfig_11
+ ~/.fontconfig_11
+
+
+ true
+
+
+ false
+
+
+ true
+
+
+ hintslight
+
+
+ lcddefault
+
+
+ rgb
+
+
+
diff --git a/qt_conf/linux.qrc b/qt_conf/linux.qrc
new file mode 100644
index 0000000..b9f5692
--- /dev/null
+++ b/qt_conf/linux.qrc
@@ -0,0 +1,8 @@
+
+
+ qt_linux.conf
+
+
+ fc-custom.conf
+
+
diff --git a/qt_conf/mac.qrc b/qt_conf/mac.qrc
new file mode 100644
index 0000000..03585ec
--- /dev/null
+++ b/qt_conf/mac.qrc
@@ -0,0 +1,2 @@
+
+
diff --git a/qt_conf/qt_linux.conf b/qt_conf/qt_linux.conf
new file mode 100644
index 0000000..6d80862
--- /dev/null
+++ b/qt_conf/qt_linux.conf
@@ -0,0 +1,2 @@
+[Paths]
+Libraries=:/gui/art
diff --git a/qt_conf/qt_win.conf b/qt_conf/qt_win.conf
new file mode 100644
index 0000000..f26ffe7
--- /dev/null
+++ b/qt_conf/qt_win.conf
@@ -0,0 +1,2 @@
+[Platforms]
+WindowsArguments = nomousefromtouch
diff --git a/qt_conf/win.qrc b/qt_conf/win.qrc
new file mode 100644
index 0000000..df8db39
--- /dev/null
+++ b/qt_conf/win.qrc
@@ -0,0 +1,5 @@
+
+
+ qt_win.conf
+
+
diff --git a/ui/basic.style b/ui/basic.style
index 3b08e57..a43d42c 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -249,15 +249,6 @@ radialSize: size(50px, 50px);
radialLine: 3px;
radialDuration: 350;
radialPeriod: 3000;
-
-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) },
-};
locationSize: size(320px, 240px);
mediaPlayerSuppressDuration: 150;