linespacing roboto plotbox and set as default

jurialmunkey · Jun 23, 2019 · fbc7428 · fbc7428
1 parent e49650c
commit fbc7428
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml
@@ -246,22 +246,21 @@
         <!-- Plot Font -->
         <font>
             <name>font_plotbox</name>
-            <filename>Roboto-Regular.ttf</filename>
-            <linespacing>1.17</linespacing>
+            <filename>Roboto-Regular-Linespacing.ttf</filename>
+            <linespacing>1</linespacing>
             <size>29</size>
             <aspect>0.9</aspect>
         </font>
         <font>
             <name>font_weather_small</name>
-            <filename>Roboto-Regular.ttf</filename>
-            <linespacing>1.15</linespacing>
+            <filename>Roboto-Regular-Linespacing.ttf</filename>
             <size>26</size>
             <aspect>0.9</aspect>
         </font>
         <font>
             <name>font_overlay_plotbox</name>
-            <filename>Roboto-Regular.ttf</filename>
-            <linespacing>1.6</linespacing>
+            <filename>Roboto-Regular-Linespacing.ttf</filename>
+            <linespacing>1.4</linespacing>
             <aspect>0.9</aspect>
             <size>48</size>
         </font>

diff --git a/1080i/Font.xml b/1080i/Font.xml
@@ -3,8 +3,8 @@
 <fonts>
     <fontset id="Default" unicode="true">
 
-        <include condition="!Skin.HasSetting(RobotoFonts)">Defaults_FauneFonts</include>
-        <include condition="Skin.HasSetting(RobotoFonts)">Defaults_RobotoFonts</include>
+        <include condition="Skin.HasSetting(FauneFonts)">Defaults_FauneFonts</include>
+        <include condition="!Skin.HasSetting(FauneFonts)">Defaults_RobotoFonts</include>
 
         <!-- Standard Fonts -->
         <font>

diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
@@ -489,8 +489,8 @@
                         <visible>Integer.IsEqual(Window.Property(CurrentFocus),9004)</visible>
                         <include>Defs_Settings_Button</include>
                         <label>$LOCALIZE[31092]</label>
-                        <selected>Skin.HasSetting(RobotoFonts)</selected>
-                        <onclick>Skin.ToggleSetting(RobotoFonts)</onclick>
+                        <selected>Skin.HasSetting(FauneFonts)</selected>
+                        <onclick>Skin.ToggleSetting(FauneFonts)</onclick>
                         <onclick>ReloadSkin()</onclick>
                     </control>
 

diff --git a/addon.xml b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.36-alpha4">
+<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.36-alpha5">
     <requires>
         <import addon="xbmc.gui" version="5.14.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,8 @@
 - Fix for long season numbers
 - Add 8 row simple list for pvr
 - Add button id 10 for pvr info
+- Set Roboto as default plotbox font
+- Add linespacing variant for Roboto plot
 
 0.9.35
 - Theme switcher between light and dark depending on time of day (Light 6am - Dark 6pm)

diff --git a/fonts/Roboto-Regular-Linespacing.ttf b/fonts/Roboto-Regular-Linespacing.ttf
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
@@ -472,7 +472,7 @@ msgstr ""
 
 #: /1080i/SkinSettings.xml
 msgctxt "#31092"
-msgid "Plot boxes use Roboto font"
+msgid "Plot boxes use Faune font"
 msgstr ""
 
 #: /1080i/SkinSettings.xml