corner icon choices

jurialmunkey · Aug 31, 2019 · 798a7f7 · 798a7f7
1 parent 10e5fdf
commit 798a7f7
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 28 deletions.
diff --git a/1080i/Includes_Home.xml b/1080i/Includes_Home.xml
@@ -164,7 +164,8 @@
         <onfocus>SetProperty(ListItemHelper.WidgetContainerId,5600,Home)</onfocus>
         <onfocus>ClearProperty(WidgetFocus)</onfocus>
 
-        <onleft condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth)">9999</onleft>
+        <onleft condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + Control.IsVisible(9999)">9999</onleft>
+        <onleft condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + !Control.IsVisible(9999)">301</onleft>
         <onright condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + Control.IsVisible(9999)">9999</onright>
         <onright condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + !Control.IsVisible(9999)">301</onright>
     </include>
@@ -722,6 +723,59 @@
         </control>
     </include>
 
+    <include name="Home_CornerIcon_Template">
+        <control type="button" id="9999">
+            <left>-18</left>
+            <height>70</height>
+            <width>70</width>
+            <onleft>SetFocus(301,9999,absolute)</onleft>
+            <onright>SetFocus(301,0,absolute)</onright>
+            <aspectratio>keep</aspectratio>
+            <texturenofocus colordiffuse="main_fg_30">$PARAM[icon]</texturenofocus>
+            <texturefocus colordiffuse="main_fg_100">$PARAM[icon]</texturefocus>
+            <onfocus>ClearProperty(WidgetFocus,Home)</onfocus>
+            <visible>![[!Control.HasFocus(302) + Container(301).HasPrevious] | [Control.HasFocus(302) + Container(302).HasPrevious]]</visible>
+            <visible>!Control.HasFocus(302)</visible>
+            <nested />
+        </control>
+    </include>
+
+    <include name="Home_CornerIcon">
+        <include content="Home_CornerIcon_Template" condition="String.IsEmpty(Skin.String(CornerIcon))">
+            <param name="icon" value="special://skin/extras/icons/search.png" />
+            <onclick>Skin.Reset(SearchTerm)</onclick>
+            <onclick>Skin.SetString(SearchTerm)</onclick>
+            <onclick>ActivateWindow(1138)</onclick>
+        </include>
+        <include content="Home_CornerIcon_Template" condition="String.IsEqual(Skin.String(CornerIcon),Settings)">
+            <param name="icon" value="special://skin/extras/icons/settings.png" />
+            <onclick>ActivateWindow(settings)</onclick>
+        </include>
+        <include content="Home_CornerIcon_Template" condition="String.IsEqual(Skin.String(CornerIcon),Power)">
+            <param name="icon" value="special://skin/extras/icons/power.png" />
+            <onclick>ActivateWindow(shutdownmenu)</onclick>
+        </include>
+        <control type="image">
+            <left>-18</left>
+            <height>70</height>
+            <width>70</width>
+            <aspectratio>keep</aspectratio>
+            <texture colordiffuse="main_fg_30">special://skin/extras/icons/home.png</texture>
+            <visible>![[!Control.HasFocus(302) + Container(301).HasPrevious] | [Control.HasFocus(302) + Container(302).HasPrevious]]</visible>
+            <visible>!Control.HasFocus(302)</visible>
+            <visible>String.IsEqual(Skin.String(CornerIcon),Home)</visible>
+        </control>
+        <control type="image">
+            <left>-18</left>
+            <height>70</height>
+            <width>70</width>
+            <aspectratio>keep</aspectratio>
+            <texture colordiffuse="main_fg_30">$INFO[Container(301).ListItem.Icon]</texture>
+            <visible>![[!Control.HasFocus(302) + Container(301).HasPrevious] | [Control.HasFocus(302) + Container(302).HasPrevious]]</visible>
+            <visible>Control.HasFocus(302)</visible>
+        </control>
+    </include>
+
     <include name="Home_Horizontal_Fixed">
         <control type="group">
             <top>55</top>
@@ -730,31 +784,7 @@
                 <height>70</height>
                 <width>1200</width>
                 <visible>!$EXP[Exp_InfoVisible]</visible>
-                <control type="button" id="9999">
-                    <left>-18</left>
-                    <height>70</height>
-                    <width>70</width>
-                    <onleft>SetFocus(301,9999,absolute)</onleft>
-                    <onright>SetFocus(301,0,absolute)</onright>
-                    <aspectratio>keep</aspectratio>
-                    <texturenofocus colordiffuse="main_fg_30">special://skin/extras/icons/search.png</texturenofocus>
-                    <texturefocus colordiffuse="main_fg_100">special://skin/extras/icons/search.png</texturefocus>
-                    <onfocus>ClearProperty(WidgetFocus,Home)</onfocus>
-                    <onclick>Skin.Reset(SearchTerm)</onclick>
-                    <onclick>Skin.SetString(SearchTerm)</onclick>
-                    <onclick>ActivateWindow(1138)</onclick>
-                    <visible>![[!Control.HasFocus(302) + Container(301).HasPrevious] | [Control.HasFocus(302) + Container(302).HasPrevious]]</visible>
-                    <visible>!Control.HasFocus(302)</visible>
-                </control>
-                <control type="image">
-                    <left>-18</left>
-                    <height>70</height>
-                    <width>70</width>
-                    <aspectratio>keep</aspectratio>
-                    <texture colordiffuse="main_fg_30">$INFO[Container(301).ListItem.Icon]</texture>
-                    <visible>![[!Control.HasFocus(302) + Container(301).HasPrevious] | [Control.HasFocus(302) + Container(302).HasPrevious]]</visible>
-                    <visible>Control.HasFocus(302)</visible>
-                </control>
+                <include>Home_CornerIcon</include>
                 <control type="image">
                     <left>3</left>
                     <visible>[!Control.HasFocus(302) + Container(301).HasPrevious] | [Control.HasFocus(302) + Container(302).HasPrevious]</visible>
@@ -875,7 +905,8 @@
         <ondown condition="String.IsEqual(Container(9989).ListItemAbsolute(0).Property(list),Weather)">6000</ondown>
         <onfocus>ClearProperty(WidgetFocus,Home)</onfocus>
 
-        <onleft condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth)">9999</onleft>
+        <onleft condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + Control.IsVisible(9999)">9999</onleft>
+        <onleft condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + !Control.IsVisible(9999)">301</onleft>
         <onright condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + Control.IsVisible(9999)">9999</onright>
         <onright condition="!Skin.HasSetting(HomeIcons) + !Skin.HasSetting(HomeTextAutoWidth) + !Control.IsVisible(9999)">301</onright>
     </include>

diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 
+    <variable name="Image_Home_CornerIcon">
+        <value condition="String.IsEqual(Skin.String(CornerIcon),Settings)">special://skin/extras/icons/settings.png</value>
+        <value condition="String.IsEqual(Skin.String(CornerIcon),Power)">special://skin/extras/icons/power.png</value>
+        <value condition="String.IsEqual(Skin.String(CornerIcon),Home)">special://skin/extras/icons/home.png</value>
+        <value>special://skin/extras/icons/search.png</value>
+    </variable>
+
     <variable name="Image_UpNext">
         <value condition="!String.IsEmpty(Window.Property(landscape))">$INFO[Window.Property(landscape)]</value>
         <value condition="!String.IsEmpty(Window.Property(fanart))">$INFO[Window.Property(fanart)]</value>

diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
@@ -35,6 +35,11 @@
         <value>Basic</value>
     </variable>
 
+    <variable name="Label_SkinSettings_CornerIcon">
+        <value condition="!String.IsEmpty(Skin.String(CornerIcon))">$INFO[Skin.String(CornerIcon)]</value>
+        <value>Search</value>
+    </variable>
+
     <variable name="Label_SkinSettings_MenuStyle">
         <value condition="Skin.HasSetting(HomeMulti) + !Skin.HasSetting(HomeMultiHorizontal) + Skin.HasSetting(HomeIcons)">Icons + Text</value>
         <value condition="Skin.HasSetting(HomeMulti) + !Skin.HasSetting(HomeMultiHorizontal) + !Skin.HasSetting(HomeIcons)">Text</value>

diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
@@ -171,6 +171,18 @@
                         <onclick condition="[!Skin.HasSetting(HomeMulti) | Skin.HasSetting(HomeMultiHorizontal)] + Skin.HasSetting(HomeIcons)">Skin.Reset(HomeIcons)</onclick>
                     </control>
 
+                    <control type="button" id="19108" description="Corner Icon">
+                        <visible>Integer.IsEqual(Window.Property(CurrentFocus),9001)</visible>
+                        <include>Defs_Settings_Button</include>
+                        <label>Corner icon</label>
+                        <label2>$VAR[Label_SkinSettings_CornerIcon]</label2>
+                        <onclick condition="String.IsEmpty(Skin.String(CornerIcon))">Skin.SetString(CornerIcon,Settings)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(CornerIcon),Settings)">Skin.SetString(CornerIcon,Power)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(CornerIcon),Power)">Skin.SetString(CornerIcon,Home)</onclick>
+                        <onclick condition="String.IsEqual(Skin.String(CornerIcon),Home)">Skin.Reset(CornerIcon)</onclick>
+                        <visible>!Skin.HasSetting(HomeTextAutoWidth) + [Skin.HasSetting(HomeMultiHorizontal) | !Skin.HasSetting(HomeMulti)] + !Skin.HasSetting(HomeIcons)</visible>
+                    </control>
+
                     <control type="radiobutton" id="19104" description="Submenu Only">
                         <visible>Integer.IsEqual(Window.Property(CurrentFocus),9001)</visible>
                         <include>Defs_Settings_Button</include>

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.46-alpha4">
+<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.46-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,7 @@
 - Add blur effect settings
 - Add Up Next support
 - Add Next Aired 7.0.1 support
+- Corner icon choices for fixed width horizontal menus
 
 0.9.45
 - Updates to Sets info