From 198a87c327c26a780ebf6333dedc85766f975ee7 Mon Sep 17 00:00:00 2001
From: MassIV <error.unlisted@gmail.com>
Date: Fri, 30 May 2014 00:59:19 +0200
Subject: [PATCH] Changes to force view

---
 720p/AddonBrowser.xml       |  1 -
 720p/Custom_Force_3051.xml  | 13 +++++++------
 720p/Custom_Overlay.xml     |  2 +-
 720p/Includes_MainMenu.xml  |  4 ++--
 720p/Viewtype_List.xml      | 19 +++++++++++++++----
 language/English/strings.po |  4 ++--
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/720p/AddonBrowser.xml b/720p/AddonBrowser.xml
index e244f5a..affb4a9 100644
--- a/720p/AddonBrowser.xml
+++ b/720p/AddonBrowser.xml
@@ -6,7 +6,6 @@
 
 <include>LoadSettings</include>
 <onload condition="IsEmpty(Skin.String(FirstRunTouch))">ActivateWindow(9506)</onload>
-<onload condition="substring(Container.FolderPath,addons://all/)">Container.SetViewMode(603)</onload>
 	
 <views>603,50</views>
   
diff --git a/720p/Custom_Force_3051.xml b/720p/Custom_Force_3051.xml
index 05b5b2d..7581047 100644
--- a/720p/Custom_Force_3051.xml
+++ b/720p/Custom_Force_3051.xml
@@ -2,17 +2,18 @@
 <window type="dialog" id="3051">
 	<defaultcontrol>750</defaultcontrol>
     <allowoverlay>no</allowoverlay>
-	<!-- Metroid's force view -->
 	
-    <visible>!Control.IsVisible(603) + SubString(Container.FolderPath,plugin,left) + Skin.HasSetting(ForceThumbView)</visible>
-    <animation effect="fade" start="100" end="0" time="0" delay="5">WindowClose</animation>
-    <controls>
+	<visible>!Control.IsVisible(603) + [SubString(Container.FolderPath,plugin,left) + Skin.HasSetting(ForceThumbView)] | [substring(Container.FolderPath,addons://all/) + !Skin.HasSetting(AddonInstallHome) + Window.IsVisible(addonbrowser)]</visible>
+    <!-- Metroid's force view -->
+	<controls>
+
 		<control type="button" id="750">
 			<include>HiddenButton</include>
 			<onfocus condition="SubString(Container.FolderPath,plugin,left) + Skin.HasSetting(ForceThumbView) + !Control.IsVisible(603)">Container.SetViewMode(603)</onfocus>
-			<onfocus>Dialog.Close(3051)</onfocus>
+			<onfocus condition="substring(Container.FolderPath,addons://all/) + !Control.IsVisible(603) + !Skin.HasSetting(AddonInstallHome) + Window.IsVisible(addonbrowser)">Container.SetViewMode(603)</onfocus>
 
+			<onfocus>Dialog.Close(3051)</onfocus>
 		</control>
 	
 	</controls>
-</window> 
+</window> 
\ No newline at end of file
diff --git a/720p/Custom_Overlay.xml b/720p/Custom_Overlay.xml
index f7b9786..7aac67a 100644
--- a/720p/Custom_Overlay.xml
+++ b/720p/Custom_Overlay.xml
@@ -918,7 +918,7 @@
 			<shadowcolor>FF000000</shadowcolor>
 			<font>font13</font>
 			<align>right</align>
-			<label>[COLOR=FF00FF00]$INFO[Container.FolderName,, - ][/COLOR]$INFO[Container.FolderPath]$INFO[Container.Viewmode]</label>
+			<label>*[COLOR=FF00FF00]$INFO[Container.FolderName,, - ][/COLOR]$INFO[Container.FolderPath]</label>
 			<visible>Skin.HasSetting(HideDebugInfo)</visible>
 		</control>
 		
diff --git a/720p/Includes_MainMenu.xml b/720p/Includes_MainMenu.xml
index 3833d38..46d74ef 100644
--- a/720p/Includes_MainMenu.xml
+++ b/720p/Includes_MainMenu.xml
@@ -1166,8 +1166,8 @@
 		</item>
 		<item id="6">
 			<description>addons</description>
-			<label>24001</label>
-			<onclick>ActivateWindow(AddonBrowser,root,return)</onclick>
+			<label>31114</label>
+			<onclick>ActivateWindow(addonbrowser.xml,return)</onclick>
 
 			<visible>!IsEmpty(skin.string(SubMenu2)) + Skin.HasSetting(AddonSettingsMenu)</visible>
 			<property name="SubMenuItem">not_empty</property>
diff --git a/720p/Viewtype_List.xml b/720p/Viewtype_List.xml
index ff8dbf7..6a656a4 100644
--- a/720p/Viewtype_List.xml
+++ b/720p/Viewtype_List.xml
@@ -212,9 +212,9 @@
 					
 					<control type="image">
 						<left>108</left>
-						<top>104</top>
+						<top>83</top>
 						<width>400</width>
-						<height>395</height>
+						<height>415</height>
 
 						<aspectratio>stretch</aspectratio>
 						<texture background="true" border="5">DefaultCatch.png</texture>
@@ -225,7 +225,7 @@
 					
 					<control type="image">
 						<left>113</left>
-						<top>109</top>
+						<top>115</top>
 						<width>390</width>
 						<height>330</height>
 						<aspectratio>scale</aspectratio>
@@ -245,9 +245,20 @@
 						<aspectratio>stretch</aspectratio>
 						<texture border="12">white.png</texture>
 						<colordiffuse>FFEBEBEB</colordiffuse>
-						<!-- visible>![Container.Content(movies) | Container.Content(tvshows)]</visible -->
+
 					</control>
+					<control type="image">
+						<description>white image</description>
+						<left>113</left>
+						<top>443</top>
+						<width>390</width>
+						<height>50</height>
+						
+						<aspectratio>stretch</aspectratio>
+						<texture border="12">white.png</texture>
+						<colordiffuse>FFEBEBEB</colordiffuse>
 
+					</control>
 					
 					
 				</control>
diff --git a/language/English/strings.po b/language/English/strings.po
index 040c354..8f18c4c 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#31002"
-msgid "The context menu allows you to set the 2 custom widgets for the Home screen. Just browse your addons, library structure, or playlists and bring up the context menu (c). If it is possible to make your current item into a widget (and you have an empty widget slot) you will see the button there.[CR][CR]In Settings -> Skin Settings you can adjust the name for a better fit or to make it more decriptive. As wel as reset it to make the slot available."
+msgid "The context menu allows you to set the 2 custom widgets for the Home screen. Just browse your add-ons, library structure, or playlists and bring up the context menu (c). If it is possible to make your current item into a widget (and you have an empty widget slot) you will see the button there.[CR][CR]In Settings -> Skin Settings you can adjust the name for a better fit or to make it more decriptive. As wel as reset it to make the slot available."
 msgstr ""
 
 msgctxt "#31003"
@@ -542,7 +542,7 @@ msgid ""
 msgstr ""
 
 msgctxt "#31149"
-msgid "Video addons"
+msgid "Video add-ons"
 msgstr ""
 
 msgctxt "#31151"