various

1080i/DialogAddonInfo.xml

@@ -39,7 +39,7 @@
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <--addon details-->
+            <!--addon details-->
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>

1080i/DialogExtendedProgressBar.xml

@@ -4,8 +4,8 @@
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
-            <include condition="!window.isactive(infodialog)">progressPosition1</include>
-            <include condition="window.isactive(infodialog)">progressPosition2</include>
+            <include condition="!window.isactive(Notification)">progressPosition1</include>
+            <include condition="window.isactive(Notification)">progressPosition2</include>
             <!--animations-->
             <animation type="Windowclose">
                 <effect type="fade" start="100" end="0" time="400" tween="sine"/>

1080i/DialogKeyboard.xml

@@ -774,7 +774,7 @@
                         <height>1-col</height>
                         <texturenofocus colordiffuse="keyboardInactive">colors/white.png</texturenofocus>
                         <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-                        <label>IP</label>
+                        <label>31093</label>
                         <textoffsetx>0</textoffsetx>
                         <onleft>304</onleft>
                         <onright>160</onright>

1080i/DialogPlayerProcessInfo.xml

@@ -58,10 +58,6 @@
                 <width>24-col</width>
                 <label>$INFO[PVR.ActStreamSNR,$LOCALIZE[19009]: ]</label>
             </control> 
-            <control type="label">
-                <width>24-col</width>
-                <label>$INFO[Player.Process(videodecoder),$LOCALIZE[31115]: ]$VAR[VideoHWDecoder, (,)]</label>
-            </control>
             <control type="label">
                 <width>24-col</width>
                 <label>$INFO[Player.Process(pixformat),$LOCALIZE[31114]: ]</label>

1080i/DialogSeekBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <visible>!window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
+    <visible>!window.isactive(videoosd) + !window.isactive(osdvideosettings) + !window.isactive(osdaudiosettings) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
     <controls>
         <control type="image">
             <include>dimensionsFullscreen</include>

1080i/DialogSlider.xml

@@ -5,8 +5,8 @@
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
-            <include condition="!window.isactive(infodialog)">progressPosition1</include>
-            <include condition="window.isactive(infodialog)">progressPosition2</include>
+            <include condition="!window.isactive(Notification)">progressPosition1</include>
+            <include condition="window.isactive(Notification)">progressPosition2</include>
             <!--animations-->
             <animation type="Windowclose">
                 <effect type="fade" start="100" end="0" time="400" tween="sine"/>

1080i/DialogVolumeBar.xml

@@ -5,8 +5,8 @@
     <controls>
         <control type="group">
             <posx>col-19-begin</posx>
-            <include condition="!window.isactive(infodialog)">progressPosition1</include>
-            <include condition="window.isactive(infodialog)">progressPosition2</include>
+            <include condition="!window.isactive(Notification)">progressPosition1</include>
+            <include condition="window.isactive(Notification)">progressPosition2</include>
             <visible>!player.passthrough</visible>
             <animation type="Windowclose">
                 <effect type="fade" start="100" end="0" time="400" tween="sine"/>

1080i/EventLog.xml

@@ -48,7 +48,7 @@
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
-            <--view options-->
+            <!--view options-->
             <control type="grouplist" id="9000">
                 <posx>0</posx>
                 <posy>2-row</posy>

1080i/Font.xml

@@ -69,12 +69,6 @@
             <size>36</size>
             <linespacing>0.9</linespacing>
         </font>
-        <font>
-            <name>regularSemibold</name>
-            <filename>roboto/semibold.ttf</filename>
-            <size>36</size>
-            <linespacing>0.9</linespacing>
-        </font>
         <font>
             <name>regularLight</name>
             <filename>roboto/light.ttf</filename>

1080i/Includes_animations.xml

@@ -8,11 +8,6 @@
             <effect type="fade" start="100" end="0" time="300"/>
         </animation>
     </include>
-    <include name="fadeIn">
-        <animation type="focus">
-            <effect type="fade" start="0" end="100" time="500"/>
-        </animation>
-    </include>
     <include name="listSlideIn">
         <effect type="fade" start="0" end="100" time="300" delay="600"/>
         <effect type="slide" start="3-col" end="0" center="auto" tween="cubic" easing="out" time="400" delay="500"/>

1080i/Includes_hubOptions.xml

@@ -2,7 +2,7 @@
 <includes>
     <!--Hub options menu (sort order etc)-->
     <include name="hubOptions">
-        <--hub options-->
+        <!--hub options-->
         <control type="group">
             <animation type="Conditional" condition="!controlgroup(9002).hasfocus | window.isactive(1100)">
                 <effect type="fade" start="100" end="0" time="300"/>

1080i/Includes_variables.xml

@@ -62,17 +62,6 @@
     <variable name="unwatchedOnly">
         <value condition="System.Setting(hidewatched)">$LOCALIZE[31213]</value>
     </variable>
-    <!--fullscreeninfo titles-->
-    <variable name="nowPlayingTitle">
-        <value condition="!StringCompare(VideoPlayer.title,VideoPlayer.TVShowTitle)">$INFO[videoplayer.tvshowtitle] $INFO[videoplayer.title]</value>
-        <value condition="StringCompare(VideoPlayer.title,VideoPlayer.TVShowTitle)">$INFO[videoplayer.title]</value>
-    </variable>
-    <!--Shift progress dialogs where possible to avoid overlaps-->
-    <variable name="progressDialogPosition">
-        <value condition="window.isactive(infodialog) + !window.isactive(extendedprogressdialog)">209</value>
-        <value condition="window.isactive(infodialog) + window.isactive(extendedprogressdialog)">323</value>
-        <value>95</value>
-    </variable>
     <!--Star rating for music tracks-->
     <variable name="starRating">
         <value condition="SubString(MusicPlayer.Rating,1)"></value>

1080i/MyVideoNav.xml

@@ -71,7 +71,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>MyVideoNav.xml $INFO[container.folderpath]</label>
+            <label>MyVideoNav.xml</label>
         </control>
     </controls>
 </window>

1080i/MyWeather.xml

@@ -29,7 +29,7 @@
                 <posy>row-1-begin</posy>
                 <width>14-col</width>
                 <font>pageTitle</font>
-                <label>Weather</label>
+                <label>31197</label>
                 <textcolor>textActive</textcolor>
             </control>
             <!--source subtitle-->
@@ -115,7 +115,7 @@
                         <width>12-col</width>
                         <height>2-row</height>
                         <font>regular</font>
-                        <label>Wind $INFO[Window.Property(Current.wind)]</label>
+                        <label>$LOCALIZE[31094] $INFO[Window.Property(Current.wind)]</label>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                     </control>

1080i/SmartPlaylistEditor.xml

@@ -266,7 +266,7 @@
                     <content>
                         <item id="1">
                             <description>New Rule</description>
-                            <label>Add</label>
+                            <label>31128</label>
                             <label2></label2>
                             <thumb>-</thumb>
                             <onclick>SendClick(129,13)</onclick>

1080i/VideoOSD.xml

@@ -235,21 +235,21 @@
                         <label>13395</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>ActivateWindow(123)</onclick>
+                        <onclick>ActivateWindow(osdvideosettings)</onclick>
                     </item>
                     <item>
                         <description>Audio Settings</description>
                         <label>13396</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>ActivateWindow(124)</onclick>
+                        <onclick>ActivateWindow(osdaudiosettings)</onclick>
                     </item>
                     <item>
                         <description>Bookmarks</description>
                         <label>298</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>ActivateWindow(125)</onclick>
+                        <onclick>ActivateWindow(videobookmarks)</onclick>
                     </item>
                 </content>
             </control>

1080i/script-Rom_Collection_Browser-main.xml

@@ -5,7 +5,7 @@
     <controls>
         <include>globalBackground</include>
         <control type="image">
-            <include>fullscreenDimensions</include>
+            <include>dimensionsFullscreen</include>
             <aspectratio scalediffuse="false" align="left">scale</aspectratio>
             <texture border="0">$INFO[Listitem.thumb]</texture>
             <colordiffuse>22ffffff</colordiffuse>

1080i/script-globalsearch-main.xml

@@ -27,7 +27,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>auto</width>
-                    <label>Searching for [COLOR highlight]$INFO[Window.Property(GlobalSearch.SearchString)][/COLOR] </label>
+                    <label>$LOCALIZE[31125] [COLOR highlight]$INFO[Window.Property(GlobalSearch.SearchString)][/COLOR] </label>
                     <font>pageSubTitle</font>
                     <textcolor>textActive</textcolor>
                 </control>

changelog.txt

@@ -31,8 +31,6 @@ Recent items video: - check recent episodes
 
 Check all XMLS are present
 
-Lose .DS_Store (need to do this on the windows box)
-
 check all active strings
 
 Screenshots etc