Merge pull request #1658 from akshayaurora/move_fonts

kivy: move data/fonts into gui/kivy/data/fonts
2016-01-29 11:08:50 +01:00 · 2016-01-29 11:08:50 +01:00 · d5479b8dfc
parent 307ec36d34 695b8413d4
commit d5479b8dfc
8 changed files with 4 additions and 4 deletions
--- a/gui/kivy/data/fonts/Roboto-Bold.ttf
+++ b/gui/kivy/data/fonts/Roboto-Bold.ttf
--- a/gui/kivy/data/fonts/Roboto-Condensed.ttf
+++ b/gui/kivy/data/fonts/Roboto-Condensed.ttf
--- a/gui/kivy/data/fonts/Roboto-Medium.ttf
+++ b/gui/kivy/data/fonts/Roboto-Medium.ttf
--- a/gui/kivy/data/fonts/Roboto.ttf
+++ b/gui/kivy/data/fonts/Roboto.ttf
--- a/gui/kivy/data/fonts/tron/License.txt
+++ b/gui/kivy/data/fonts/tron/License.txt
--- a/gui/kivy/data/fonts/tron/Readme.txt
+++ b/gui/kivy/data/fonts/tron/Readme.txt
--- a/gui/kivy/data/fonts/tron/Tr2n.ttf
+++ b/gui/kivy/data/fonts/tron/Tr2n.ttf
--- 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'