From 695b8413d48fdc6401110ab85f7aa4b6858503a4 Mon Sep 17 00:00:00 2001 From: akshayaurora Date: Fri, 29 Jan 2016 15:00:57 +0530 Subject: [PATCH] kivy: move data/fonts into gui/kivy/data/fonts --- {data => gui/kivy/data}/fonts/Roboto-Bold.ttf | Bin {data => gui/kivy/data}/fonts/Roboto-Condensed.ttf | Bin {data => gui/kivy/data}/fonts/Roboto-Medium.ttf | Bin {data => gui/kivy/data}/fonts/Roboto.ttf | Bin {data => gui/kivy/data}/fonts/tron/License.txt | 0 {data => gui/kivy/data}/fonts/tron/Readme.txt | 0 {data => gui/kivy/data}/fonts/tron/Tr2n.ttf | Bin gui/kivy/main_window.py | 8 ++++---- 8 files changed, 4 insertions(+), 4 deletions(-) rename {data => gui/kivy/data}/fonts/Roboto-Bold.ttf (100%) rename {data => gui/kivy/data}/fonts/Roboto-Condensed.ttf (100%) rename {data => gui/kivy/data}/fonts/Roboto-Medium.ttf (100%) rename {data => gui/kivy/data}/fonts/Roboto.ttf (100%) rename {data => gui/kivy/data}/fonts/tron/License.txt (100%) rename {data => gui/kivy/data}/fonts/tron/Readme.txt (100%) rename {data => gui/kivy/data}/fonts/tron/Tr2n.ttf (100%) diff --git a/data/fonts/Roboto-Bold.ttf b/gui/kivy/data/fonts/Roboto-Bold.ttf similarity index 100% rename from data/fonts/Roboto-Bold.ttf rename to gui/kivy/data/fonts/Roboto-Bold.ttf diff --git a/data/fonts/Roboto-Condensed.ttf b/gui/kivy/data/fonts/Roboto-Condensed.ttf similarity index 100% rename from data/fonts/Roboto-Condensed.ttf rename to gui/kivy/data/fonts/Roboto-Condensed.ttf diff --git a/data/fonts/Roboto-Medium.ttf b/gui/kivy/data/fonts/Roboto-Medium.ttf similarity index 100% rename from data/fonts/Roboto-Medium.ttf rename to gui/kivy/data/fonts/Roboto-Medium.ttf diff --git a/data/fonts/Roboto.ttf b/gui/kivy/data/fonts/Roboto.ttf similarity index 100% rename from data/fonts/Roboto.ttf rename to gui/kivy/data/fonts/Roboto.ttf diff --git a/data/fonts/tron/License.txt b/gui/kivy/data/fonts/tron/License.txt similarity index 100% rename from data/fonts/tron/License.txt rename to gui/kivy/data/fonts/tron/License.txt diff --git a/data/fonts/tron/Readme.txt b/gui/kivy/data/fonts/tron/Readme.txt similarity index 100% rename from data/fonts/tron/Readme.txt rename to gui/kivy/data/fonts/tron/Readme.txt diff --git a/data/fonts/tron/Tr2n.ttf b/gui/kivy/data/fonts/tron/Tr2n.ttf similarity index 100% rename from data/fonts/tron/Tr2n.ttf rename to gui/kivy/data/fonts/tron/Tr2n.ttf diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py index ac628b45..a09d4a52 100644 --- a/gui/kivy/main_window.py +++ b/gui/kivy/main_window.py @@ -296,10 +296,10 @@ class ElectrumWindow(App): # inside markup. from kivy.core.text import Label Label.register('Roboto', - 'data/fonts/Roboto.ttf', - 'data/fonts/Roboto.ttf', - 'data/fonts/Roboto-Bold.ttf', - 'data/fonts/Roboto-Bold.ttf') + 'gui/kivy/data/fonts/Roboto.ttf', + 'gui/kivy/data/fonts/Roboto.ttf', + 'gui/kivy/data/fonts/Roboto-Bold.ttf', + 'gui/kivy/data/fonts/Roboto-Bold.ttf') win.softinput_mode = 'below_target'