Merge pull request #27 from karandras/Gotham

Gotham
kib · Feb 12, 2014 · c815efb · c815efb
2 parents 9e0a0cb + 4773ec1
commit c815efb
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 57 deletions.
diff --git a/720p/DialogFullScreenInfo.xml b/720p/DialogFullScreenInfo.xml
@@ -76,7 +76,7 @@
           <righttexture>osd/slidernibfo1.png</righttexture>
 				<info>Player.Progress</info><left>130</left><top>135</top><width>400</width><height>20</height><visible>!Skin.HasSetting(no_global_clock)</visible></control>
         <control type="label">
-          <left>125</left>
+          <left>-180</left>
           <top>125</top>
           <width>300</width>
           <height>25</height>

diff --git a/720p/DialogOk.xml b/720p/DialogOk.xml
@@ -43,41 +43,17 @@
         <aligny>center</aligny>
         <textcolor>white</textcolor>
       </control>
-      <control type="label" id="2">
-        <description>dialog line 1</description>
+		<control type="textbox" id="9">
+		<description>text</description>
         <left>20</left>
         <top>60</top>
         <width>560</width>
         <height>30</height>
         <align>center</align>
-        <aligny>center</aligny>
-        <label>-</label>
-        <textcolor>white</textcolor>
-        <font>Font_Neon_20</font>
-      </control>
-      <control type="label" id="3">
-        <description>dialog line 2</description>
-        <left>20</left>
-        <top>85</top>
-        <width>560</width>
-        <height>30</height>
-        <align>center</align>
-        <aligny>center</aligny>
-        <label>-</label>
-        <font>Font_Neon_20</font>
-        <textcolor>white</textcolor>
-      </control>
-      <control type="label" id="4">
-        <description>dialog line 3</description>
-        <left>20</left>
-        <top>110</top>
-        <width>560</width>
-        <height>30</height>
-        <align>center</align>
-        <aligny>center</aligny>
         <label>-</label>
         <font>Font_Neon_20</font>
         <textcolor>white</textcolor>
+		<autoscroll time="3000" delay="4000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
       </control>
       <control type="button" id="10">
         <description>OK button</description>
@@ -100,4 +76,4 @@
       </control>
     </control>
   </controls>
-</window>
+</window>
diff --git a/720p/DialogSeekBar.xml b/720p/DialogSeekBar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--Alaska-->
 <window id="115">
   <visible>Window.IsActive(2005) + !Window.IsActive(SubtitleSearch) + !Window.IsActive(2901) + !Window.IsActive(142) + !Control.IsVisible(10) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
@@ -16,10 +16,10 @@
     </control>
     <control type="label" id="24">
       <description>buffering label</description>
-      <left>465</left>
+      <left>65</left>
       <top>15</top>
       <label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
-      <width>300</width>
+      <width>30</width>
       <align>center</align>
       <aligny>center</aligny>
       <textcolor>red</textcolor>
@@ -152,11 +152,11 @@
       <control type="group">
         <visible>VideoPlayer.Content(episodes)+ ![[Player.Paused + Player.Caching] + !Player.Seeking]</visible>
         <control type="label">
-          <left>140</left>
+          <left>80</left>
           <top>120</top>
           <width>300</width>
           <height>25</height>
-          <align>right</align>
+          <align>left</align>
           <font>Font_RSS_Unicode</font>
           <textcolor>mainblue</textcolor>
           <label>$INFO[VideoPlayer.Time]</label>
@@ -176,11 +176,11 @@
       <control type="group">
         <visible>!VideoPlayer.Content(episodes)+ ![[Player.Paused + Player.Caching] + !Player.Seeking]</visible>
         <control type="label">
-          <left>130</left>
+          <left>20</left>
           <top>121</top>
           <width>300</width>
           <height>25</height>
-          <align>right</align>
+          <align>left</align>
           <font>Font_RSS_Unicode</font>
           <textcolor>mainblue</textcolor>
           <label>$INFO[VideoPlayer.Time]</label>
@@ -528,4 +528,4 @@
       </control>
     </control>
   </controls>
-</window>
+</window>
diff --git a/720p/DialogVideoInfo.xml b/720p/DialogVideoInfo.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window id="2003">
+<onload condition="!Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)">XBMC.RunScript(script.tvtunes,backend=True)</onload>
+	<onload condition="System.HasAddon(script.videoextras)">XBMC.RunScript(script.videoextras,check,"$INFO[ListItem.FilenameAndPath]")</onload>
+	<onload condition="System.HasAddon(script.videoextras)"> XBMC.RunScript(script.videoextras,hasExtras,flag,"$INFO[ListItem.FilenameAndPath]")</onload>
   <defaultcontrol always="true">8</defaultcontrol>
   <allowoverlay>no</allowoverlay>
   <controls>
@@ -1255,8 +1258,18 @@
             <onclick>XBMC.RunScript(script.artwork.downloader, mode=custom, mediatype=tvshow, clearart, tvthumb, poster, banner, fanart, clearlogo, dbid=$INFO[ListItem.DBID])</onclick>
             <visible>Container.Content(tvshows) + !Skin.HasSetting(LockViews)</visible>
           </control>
+          <control type="button" id="105">
+    <description>Extras</description>
+    <include>ButtonInfoDialogsCommonValues</include>
+    <label>Extras</label>
+    <onclick>XBMC.RunScript(script.videoextras,display,"$INFO[ListItem.FilenameAndPath]")</onclick>
+    <visible>System.HasAddon(script.videoextras)
+     + [Container.Content(movies) | Container.Content(episodes) | Container.Content(TVShows)]
+     + IsEmpty(Window(movieinformation).Property("HideVideoExtrasButton"))</visible>
+	 <visible>System.HasAddon(script.videoextras) + !IsEmpty(Window(movieinformation).Property(flag)) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(TVShows)]</visible>
+</control>
         </control>
       </control>
     </control>
   </controls>
-</window>
+</window>
diff --git a/720p/MyVideoNav.xml b/720p/MyVideoNav.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--Alaska-->
 <window id="25">
   <onload condition="Skin.HasSetting(TvTunes) + !SubString(Window(Videos).Property(CinemaExperienceRunning),True)">RunScript(script.tvtunes,backend=True&amp;loop=False)</onload>
@@ -392,19 +392,6 @@
           <description>Search</description>
           <label>137</label>
         </control>
-        <!--	<control type="radiobutton" id="7">
-					<description>Stack Toggle</description>
-					<textwidth>170</textwidth>
-					<include>WindowMenuButton_Vertical</include>
-					<label>346</label>
-				</control> -->
-        <control type="radiobutton" id="17">
-          <description>Flatten</description>
-          <textwidth>170</textwidth>
-          <include>WindowMenuButton_Vertical</include>
-          <label>20411</label>
-          <visible>!Skin.HasSetting(LockViews)</visible>
-        </control>
         <control type="radiobutton" id="16">
           <description>PartyMode</description>
           <label>589</label>
@@ -496,4 +483,4 @@
     <include>Time</include>
     <include>Library Totals</include>
   </controls>
-</window>
+</window>
diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <window>
   <defaultcontrol always="true">9000</defaultcontrol>
   <controls>
@@ -55,7 +55,7 @@
           </control>
           <control type="label">
             <left>135</left>
-            <top>25</top>
+            <top>-10</top>
             <width>230</width>
             <!-- <height>25</height> -->
             <font>font24caps_title</font>
@@ -78,7 +78,7 @@
           </control>
           <control type="label">
             <left>135</left>
-            <top>25</top>
+            <top>-10</top>
             <width>230</width>
             <!--<height>25</height> -->
             <!-- <textoffsetx>10</textoffsetx> -->
@@ -3649,4 +3649,4 @@
     </control>
     <include>Time</include>
   </controls>
-</window>
+</window>