From e383d5061b0a045d5b85081916910462d3704b55 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Thu, 9 Jul 2015 20:58:54 +0100
Subject: [PATCH] Redesign of home screen

---
 1080i/Font.xml                               |   2 +-
 1080i/Home.xml                               | 121 ++++++++++---------
 1080i/Includes_homeBackground.xml            |  10 --
 1080i/Includes_hubMenu.xml                   |  60 +++++++--
 1080i/View_MusicRecentItems.xml              |   2 +-
 1080i/View_VideoRecentItems.xml              |   2 +-
 1080i/script-Rom_Collection_Browser-main.xml |  26 ++--
 colors/colors                                |   0
 colors/defaults.xml                          |   1 +
 language/English/strings.po                  |  16 ++-
 10 files changed, 136 insertions(+), 104 deletions(-)
 delete mode 100755 colors/colors

diff --git a/1080i/Font.xml b/1080i/Font.xml
index 9a24d50..44323f1 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -186,7 +186,7 @@
         <font>
             <name>symbolVeryLarge</name>
             <filename>symbol.ttf</filename>
-            <size>96</size>
+            <size>72</size>
             <style/>
         </font>
         <font>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 2f70a0d..9411d57 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -11,78 +11,75 @@
         <include>homeBackground</include>
         <!--browse controls-->
         <control type="group">
+            <animation type="windowopen">
+                <effect type="fade" start="0" end="100" delay="500" time="300"/>
+                <effect type="slide" start="-200" end="0" tween="sine" easing="out" delay="500" time="400"/>
+            </animation>
+            <animation type="windowclose">
+                <effect type="fade" start="100" end="0" time="300"/>
+                <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
+            </animation>
+
             <posx>0</posx>
-            <posy>row-1-begin</posy>
-            <control type="list" id="9000">
+            <posy>0</posy>
+            <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>2000</width>
+                <width>col-5-begin</width>
                 <height>fullscreenHeight</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <!--logo-->
+            <control type="image">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <width>1-col</width>
+                <height>1-col</height>
+                <texture>kodilogo.png</texture>
+                <colordiffuse>textActive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="list" id="9000">
+                <posx>0</posx>
+                <posy>row-4-begin</posy>
+                <width>col-5-begin</width>
+                <height>24-row</height>
                 <orientation>vertical</orientation>
-                <onleft>ActivateWindow(systeminfo)</onleft>
-                <itemlayout width="2-row" height="2-row">
+                <itemlayout width="col-7-begin" height="2-row">
+                    <control type="label">
+                        <posx>col-1-begin</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="col-7-begin" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>textboxInactive</colordiffuse>
+                        <width>col-7-begin</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>textActive</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
                     </control>
                     <control type="label">
-                        <posx>0</posx>
+                        <posx>col-1-begin</posx>
                         <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>1-col-textbox</height>
-                        <align>center</align>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <font>menuTitle</font>
                         <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>highlight</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="2-col" height="2-col">
-                    <control type="group">
-                        <animation type="focus" loop="false" reversible="false">
-                            <effect type="rotatey" start="0" end="-15" center="70" tween="back" easing="out" time="300"/>
-                            <effect type="rotatey" start="0" end="15" center="70" tween="back" easing="out" delay="300" time="300"/>
-                        </animation>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>2-col-textbox</width>
-                            <height>2-col-textbox</height>
-                            <aspectratio scalediffuse="false">scale</aspectratio>
-                            <texture border="0">colors/white.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>highlight</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>0</posx>
-                            <posy>-2</posy>
-                            <width>2-col-textbox</width>
-                            <height>2-col-textbox</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>symbolVeryLarge</font>
-                            <textcolor>textActive</textcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.label2]</label>
-                        </control>
-                    </control>
-                    <control type="label">
-                        <posx>col-2-begin</posx>
-                        <posy>0</posy>
-                        <width>8-col-gutter</width>
-                        <height>2-col</height>
-                        <aligny>center</aligny>
-                        <font>large</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Label]</label>
+                        <label>$INFO[ListItem.label]</label>
                     </control>
                 </focusedlayout>
                 <content>
@@ -141,6 +138,12 @@
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(settings)</onclick>
                     </item>
+                    <item id="9">
+                        <label>31007</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>ActivateWindow(systeminfo)</onclick>
+                    </item>
                     <item id="8">
                         <label>31004</label>
                         <label2></label2>
diff --git a/1080i/Includes_homeBackground.xml b/1080i/Includes_homeBackground.xml
index 7dec1a5..b56cd4e 100644
--- a/1080i/Includes_homeBackground.xml
+++ b/1080i/Includes_homeBackground.xml
@@ -126,15 +126,5 @@
                 </animation>
             </control>
         </control>
-        <!--overlay-->
-        <control type="image">
-            <animation type="windowopen">
-                <effect type="fade" start="0" end="100" time="200" delay="500" tween="linear"/>
-            </animation>
-            <include>dimensionsFullscreen</include>
-            <texture>logoOverlay.png</texture>
-            <colordiffuse>ffffffff</colordiffuse>
-            <aspectratio>stretch</aspectratio>
-        </control>
     </include>
 </includes>
\ No newline at end of file
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 9494655..418fb6b 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -3,6 +3,10 @@
     <!--main hub menu-->
     <include name="hubMenu">
         <control type="group" id="9000">
+            <animation type="windowopen">
+                <effect type="fade" start="0" end="100" delay="500" time="300"/>
+                <effect type="slide" start="-200" end="0" tween="sine" easing="out" delay="500" time="400"/>
+            </animation>
             <animation type="Conditional" condition="controlgroup(9000).hasfocus">
                 <effect type="fade" start="0" end="100" time="300"/>
                 <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
@@ -20,20 +24,50 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <!--logo-->
-            <control type="image">
-                <posx>col-1-begin</posx>
-                <posy>row-1-begin</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <texture>kodilogo.png</texture>
-                <colordiffuse>textActive</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-                <animation type="Conditional" condition="controlgroup(9000).hasfocus">
-                    <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" delay="600" time="300"/>
-                    <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="900" time="300"/>
-                </animation>
+
+            <!--section logo-->
+            <control type="group">
+                <!--videos-->
+                <control type="label">
+                    <visible>Window.isactive(videolibrary) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)</visible>
+                    <posx>col-1-begin</posx>
+                    <posy>row-1-begin</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <font>symbolVeryLarge</font>
+                    <aligny>center</aligny>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label></label>
+                </control>
+                <!--music-->
+                <control type="label">
+                    <visible>window.isactive(musiclibrary) | window.isactive(musicfiles) | window.isactive(musicplaylist) | window.isactive(radiochannels)</visible>
+                    <posx>col-1-begin</posx>
+                    <posy>row-1-begin</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <font>symbolVeryLarge</font>
+                    <aligny>center</aligny>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label></label>
+                </control>
+                <!--pictures-->
+                <control type="label">
+                    <visible>window.isactive(pictures)</visible>
+                    <posx>col-1-begin</posx>
+                    <posy>row-1-begin</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <font>symbolVeryLarge</font>
+                    <aligny>center</aligny>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label></label>
+                </control>
             </control>
+
             <control type="list" id="9001">
                 <posx>0</posx>
                 <posy>row-4-begin</posy>
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index 552391c..5bb0048 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -87,7 +87,7 @@
                 <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
                     <effect type="fade" start="100" end="0" time="200"/>
                 </animation>
-                <posx>col-1-begin</posx>
+                <posx>72</posx>
                 <posy>row-18-begin</posy>
                 <width>24-col</width>
                 <height>78</height>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index e5df4d1..59ec218 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -125,7 +125,7 @@
                 <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
                     <effect type="fade" start="100" end="0" time="200"/>
                 </animation>
-                <posx>col-1-begin</posx>
+                <posx>72</posx>
                 <posy>row-18-begin</posy>
                 <width>24-col</width>
                 <height>84</height>
diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml
index fb13237..4a4bfe6 100644
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@@ -179,19 +179,19 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <!--logo-->
-            <control type="image">
-                <posx>col-1-begin</posx>
-                <posy>row-1-begin</posy>
-                <width>1-col</width>
-                <height>1-col</height>
-                <texture>kodilogo.png</texture>
-                <colordiffuse>textActive</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-                <animation type="Conditional" condition="controlgroup(9000).hasfocus">
-                    <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" delay="600" time="300"/>
-                    <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="900" time="300"/>
-                </animation>
+            <!--section logo-->
+            <control type="group">
+                <control type="label">
+                    <posx>col-1-begin</posx>
+                    <posy>row-1-begin</posy>
+                    <width>1-col</width>
+                    <height>1-col</height>
+                    <font>symbolVeryLarge</font>
+                    <aligny>center</aligny>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label></label>
+                </control>
             </control>
             <control type="list" id="500">
                 <posx>0</posx>
diff --git a/colors/colors b/colors/colors
deleted file mode 100755
index e69de29..0000000
diff --git a/colors/defaults.xml b/colors/defaults.xml
index 7d2f359..7d75da2 100644
--- a/colors/defaults.xml
+++ b/colors/defaults.xml
@@ -7,6 +7,7 @@
 
     <!--new scheme-->
     <color name="background">ff222222</color>
+    <!--<color name="highlight">ffee3343</color>-->
     <color name="highlight">ffee3343</color>
     <color name="overlay">44ffffff</color>
     <color name="textActive">fff0f0f0</color>
diff --git a/language/English/strings.po b/language/English/strings.po
index 5b47f74..0faa471 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -26,15 +26,15 @@ msgid ""
 msgstr ""
 
 msgctxt "#31000"
-msgid "Watch Videos"
+msgid "Videos"
 msgstr ""
 
 msgctxt "#31001"
-msgid "Listen to Music"
+msgid "Music"
 msgstr ""
 
 msgctxt "#31002"
-msgid "View Photos"
+msgid "Photos"
 msgstr ""
 
 msgctxt "#31003"
@@ -42,7 +42,7 @@ msgid "Program Addons"
 msgstr ""
 
 msgctxt "#31004"
-msgid "Power Off"
+msgid "Power"
 msgstr ""
 
 msgctxt "#31005"
@@ -53,6 +53,10 @@ msgctxt "#31006"
 msgid "Live TV"
 msgstr ""
 
+msgctxt "#31007"
+msgid "System Info"
+msgstr ""
+
 msgctxt "#31010"
 msgid "Add-ons"
 msgstr ""
@@ -414,7 +418,7 @@ msgid "Search for Subtitles"
 msgstr ""
 
 msgctxt "#31156"
-msgid "Play Games"
+msgid "Games"
 msgstr ""
 
 msgctxt "#31157"
@@ -514,7 +518,7 @@ msgid "Hide watched items"
 msgstr ""
 
 msgctxt "#31197"
-msgid "Weather Forecasts"
+msgid "Weather"
 msgstr ""
 
 msgctxt "#31198"