Merge remote-tracking branch 'plex-skin/master' into frodo

plexinc · Jun 13, 2014 · c2cde8c · c2cde8c
2 parents e0d9a6c + 0e07c68
commit c2cde8c
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 9 deletions.
diff --git a/addons/skin.plex/720p/Backgrounds.xml b/addons/skin.plex/720p/Backgrounds.xml
@@ -9,6 +9,7 @@
 		</control>
 	</include>
 	<include name="BGFanart">
+		<control type="group">
 		<!-- generic global fanart for when the container is empty -->
 		<control type="multiimage">
 			<include>FullScreenScaled</include>
@@ -37,6 +38,7 @@
 			<animation effect="fade" start="100" end="0" time="600">WindowClose</animation>
 			<visible>!IsEmpty(Container.Property(primaryFilterActivated))</visible>
 		</control>
+		</control>
 		<!-- Clip backgrounds use item thumb, not as pretty so we'll hide them a bit more -->
 		<control type="group">
 			<visible>Container.PlexContent(Clips)</visible>
@@ -126,6 +128,7 @@
 		<control type="group">
 			<!-- generic autopopulated fanart slideshow -->
 			<control type="multiimage" id="10101">
+				<visible>!Skin.HasSetting(HideFanart)</visible>
 				<include>FullScreenScaled</include>
 				<timeperimage>8000</timeperimage>
 				<fadetime>1000</fadetime>
@@ -202,6 +205,7 @@
 	</include>
 	<include name="SlideshowDimmed">
 		<control type="multiimage">
+			<visible>!Skin.HasSetting(HideFanart)</visible>
 			<include>FullScreenScaled</include>
 			<timeperimage>8000</timeperimage>
 			<fadetime>1000</fadetime>

diff --git a/addons/skin.plex/720p/LeftSideMenu.xml b/addons/skin.plex/720p/LeftSideMenu.xml
@@ -368,7 +368,7 @@
 						<description>Control Global Caching</description>
 						<label> $LOCALIZE[41001] </label>
 						<onclick>Dialog.Close(4998)</onclick>
-                        <onclick>XBMC.ActivateWindow(10208)</onclick>
+            <onclick>XBMC.ActivateWindow(10208)</onclick>
 						<visible>System.isSystem(rasplex)</visible>
 					</item>
 					<item id="111">

diff --git a/addons/skin.plex/720p/SkinSettings.xml b/addons/skin.plex/720p/SkinSettings.xml
@@ -135,28 +135,28 @@
 				<control type="radiobutton" id="211">
 					<description>Show Big Posters View in Sections</description>
 					<width>625</width>
-					<label>Show Big Posters View in Sections</label>
+					<label>$LOCALIZE[32113]</label>
 					<onclick>Skin.ToggleSetting(ShowBigPostersLibraryView)</onclick>
 					<selected>Skin.HasSetting(ShowBigPostersLibraryView)</selected>
 				</control>
 				<control type="radiobutton" id="212">
 					<description>Hide plot for Unwatched/In Progress</description>
 					<width>625</width>
-					<label>Hide plot for Unwatched/In Progress Episodes</label>
+					<label>$LOCALIZE[32114]</label>
 					<onclick>Skin.ToggleSetting(HidePlotForUnwatched)</onclick>
 					<selected>Skin.HasSetting(HidePlotForUnwatched)</selected>
 				</control>
 				<control type="radiobutton" id="213">
 					<description>Hide Unwatched indicators for Movies</description>
 					<width>625</width>
-					<label>Hide Unwatched indicators for Movies in Library</label>
+					<label>$LOCALIZE[32115]</label>
 					<onclick>Skin.ToggleSetting(HideUnwatchedIconsMovies)</onclick>
 					<selected>Skin.HasSetting(HideUnwatchedIconsMovies)</selected>
 				</control>
 				<control type="radiobutton" id="214">
 					<description>Hide Unwatched indicators for TV</description>
 					<width>625</width>
-					<label>Hide Unwatched indicators for TV Shows and Seasons in Library</label>
+					<label>$LOCALIZE[32116]</label>
 					<onclick>Skin.ToggleSetting(HideUnwatchedIconsTVShows)</onclick>
 					<selected>Skin.HasSetting(HideUnwatchedIconsTVShows)</selected>
 				</control>
@@ -170,17 +170,24 @@
 				<control type="radiobutton" id="216">
 					<description>Show Extended Media flags in preplays</description>
 					<width>625</width>
-					<label>Show all media flags in details view</label>
+					<label>$LOCALIZE[32117]</label>
 					<onclick>Skin.ToggleSetting(ShowAllMediaFlags)</onclick>
 					<selected>Skin.HasSetting(ShowAllMediaFlags)</selected>
 				</control>
 				<control type="radiobutton" id="217">
 					<description>Hide Quit and Shutdown from Home menu</description>
 					<width>625</width>
-					<label>Hide Quit and Shutdown from Home menu</label>
+					<label>$LOCALIZE[32118]</label>
 					<onclick>Skin.ToggleSetting(HideQuitShutdown)</onclick>
 					<selected>Skin.HasSetting(HideQuitShutdown)</selected>
 				</control>
+				<control type="radiobutton" id="218">
+					<description>Hide Slideshows</description>
+					<width>625</width>
+					<label>$LOCALIZE[32119]</label>
+					<onclick>Skin.ToggleSetting(HideFanart)</onclick>
+					<selected>Skin.HasSetting(HideFanart)</selected>
+				</control>
 			</control>
 			<!-- Scrollbar -->
 			<control type="scrollbar" id="61">

diff --git a/addons/skin.plex/720p/VideoOSD.xml b/addons/skin.plex/720p/VideoOSD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <window id="2901">
-	<defaultcontrol>200</defaultcontrol>
+	<defaultcontrol always="true">711</defaultcontrol>
 	<controls>
 		<!-- ViewsOSD.xml -->
 		<include>VideoOSD</include>

diff --git a/addons/skin.plex/720p/ViewsOSD.xml b/addons/skin.plex/720p/ViewsOSD.xml
@@ -503,7 +503,6 @@
 			<control type="group" id="200">
 				<posx>270</posx>
 				<posy>5</posy>
-				<defaultcontrol always="true">19101</defaultcontrol>
 				<visible allowhiddenfocus="true">ControlGroup(200).HasFocus</visible>
 				<!-- play/pause -->
 				<control type="image">

diff --git a/addons/skin.plex/language/English/strings.po b/addons/skin.plex/language/English/strings.po
@@ -1102,3 +1102,63 @@ msgstr ""
 msgctxt "#32112"
 msgid "Actors"
 msgstr ""
+
+msgctxt "#32113"
+msgid "Show Big Posters View in Sections"
+msgstr ""
+
+msgctxt "#32114"
+msgid "Hide plot for Unwatched/In Progress Episodes"
+msgstr ""
+
+msgctxt "#32115"
+msgid "Hide Unwatched indicators for Movies in Library"
+msgstr ""
+
+msgctxt "#32116"
+msgid "Hide Unwatched indicators for TV Shows and Seasons in Library"
+msgstr ""
+
+msgctxt "#32117"
+msgid "Show all media flags in details view"
+msgstr ""
+
+msgctxt "#32118"
+msgid "Hide Quit and Shutdown from Home menu"
+msgstr ""
+
+msgctxt "#32119"
+msgid "Disable all Slideshows"
+msgstr ""
+
+msgctxt "#41000"
+msgid "System Settings"
+msgstr ""
+
+msgctxt "#41001"
+msgid "Control Precaching"
+msgstr ""
+
+msgctxt "#41002"
+msgid "Select Servers to cache"
+msgstr ""
+
+msgctxt "#41003"
+msgid "Precaching Section"
+msgstr ""
+
+msgctxt "#41004"
+msgid "Precaching"
+msgstr ""
+
+msgctxt "#41005"
+msgid "Action : Retrieving content from"
+msgstr ""
+
+msgctxt "#41006"
+msgid "Action : Precaching item"
+msgstr ""
+
+msgctxt "#41007"
+msgid "Progress"
+msgstr ""