Merge pull request #9208 from jjd-uk/settings_layout_pr

Settings layout changes improvements
xbmc · May 1, 2016 · 8203843 · 8203843
2 parents 9693db6 + 44ea2e0
commit 8203843
Show file tree

Hide file tree

Showing 17 changed files with 2,721 additions and 2,396 deletions.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
diff --git a/addons/skin.estouchy/language/resource.language.en_gb/strings.po b/addons/skin.estouchy/language/resource.language.en_gb/strings.po
@@ -242,18 +242,30 @@ msgid "Set three cities to collect weather information"
 msgstr ""
 
 msgctxt "#31405"
-msgid "Setup control of Kodi via UPnP and HTTP · Configure file sharing · Set internet access options"
+msgid "Configure & manage media sharing services · Configure & manage the weather service"
 msgstr ""
 
 msgctxt "#31406"
-msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
+msgid "Configure display · Configure audio · Configure internet access · Configure power saving· Configure logging"
 msgstr ""
 
 msgctxt "#31407"
 msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
 msgstr ""
 
-#empty strings from id 31408 to 31420
+msgctxt "#31408"
+msgid "Configure actions that can be used during playback · Configure how media content is played"
+msgstr ""
+
+msgctxt "#31409"
+msgid "Configure how the library/file views display media content ·  Configure how library lists/views are navigated · Configure the media database options"
+msgstr ""
+
+msgctxt "#31410"
+msgid "Configure skin · Configure region · Configure control · Configure screensaver · Configure master lock"
+msgstr ""
+
+#empty strings from id 31411 to 31420
 
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"

diff --git a/addons/skin.estouchy/xml/Settings.xml b/addons/skin.estouchy/xml/Settings.xml
@@ -135,54 +135,42 @@
 			</focusedlayout>
 			<content>
 				<item id="1">
-					<label>480</label>
-					<label2>31400</label2>
-					<onclick>ActivateWindow(AppearanceSettings)</onclick>
-					<icon>icon_settings_appearance.png</icon>
+					<label>14200</label>
+					<label2>31408</label2>
+					<onclick>ActivateWindow(PlayerSettings)</onclick>
+					<icon>icon_menu_videos.png</icon>
 				</item>
 				<item id="2">
-					<label>157</label>
-					<label2>31401</label2>
-					<onclick>ActivateWindow(VideosSettings)</onclick>
-					<icon>icon_settings_video.png</icon>
-				</item>
-				<item id="3">
-					<label>2</label>
-					<label2>31402</label2>
-					<onclick>ActivateWindow(MusicSettings)</onclick>
-					<icon>icon_settings_music.png</icon>
-				</item>
-				<item id="4">
-					<label>1</label>
-					<label2>31403</label2>
-					<onclick>ActivateWindow(PicturesSettings)</onclick>
+					<label>14202</label>
+					<label2>31409</label2>
+					<onclick>ActivateWindow(LibrarySettings)</onclick>
 					<icon>icon_settings_pictures.png</icon>
 				</item>
-				<item id="5">
-					<label>8</label>
-					<label2>31404</label2>
-					<onclick>ActivateWindow(WeatherSettings)</onclick>
-					<icon>icon_settings_weather.png</icon>
-				</item>
-				<item id="6">
+				<item id="3">
 					<label>31556</label>
 					<label2>31555</label2>
 					<onclick>ActivateWindow(PVRSettings)</onclick>
 					<icon>icon_settings_tv.png</icon>
 				</item>
-				<item id="7">
+				<item id="4">
 					<label>14036</label>
 					<label2>31405</label2>
 					<onclick>ActivateWindow(ServiceSettings)</onclick>
-					<icon>icon_settings_network.png</icon>
+					<icon>icons/settings/network.png</icon>
+				</item>
+				<item id="5">
+					<label>14206</label>
+					<label2>31410</label2>
+					<onclick>ActivateWindow(InterfaceSettings)</onclick>
+					<icon>icon_settings_appearance.png</icon>
 				</item>
-				<item id="8">
+				<item id="6">
 					<label>13000</label>
 					<label2>31406</label2>
 					<onclick>ActivateWindow(SystemSettings)</onclick>
 					<icon>icon_settings_system.png</icon>
 				</item>
-				<item id="9">
+				<item id="7">
 					<label>24001</label>
 					<label2>31407</label2>
 					<onclick>ActivateWindow(AddonBrowser)</onclick>

diff --git a/addons/skin.estuary/1080i/Settings.xml b/addons/skin.estuary/1080i/Settings.xml
@@ -99,60 +99,50 @@
 					<icon>icons/settings/filemanager.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[480]</label>
-					<onclick>ActivateWindow(AppearanceSettings)</onclick>
-					<icon>icons/settings/appearance.png</icon>
-				</item>^
-				<item>
-					<label>$LOCALIZE[157]</label>
-					<onclick>ActivateWindow(VideosSettings)</onclick>
+					<label>$LOCALIZE[14201]</label>
+					<onclick>ActivateWindow(PlayerSettings)</onclick>
 					<icon>icons/settings/video.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[2]</label>
-					<onclick>ActivateWindow(MusicSettings)</onclick>
-					<icon>icons/settings/music.png</icon>
-				</item>
-				<item>
-					<label>$LOCALIZE[1]</label>
-					<onclick>ActivateWindow(PicturesSettings)</onclick>
-					<icon>icons/settings/pictures.png</icon>
+					<label>$LOCALIZE[14203]</label>
+					<onclick>ActivateWindow(LibrarySettings)</onclick>
+					<icon>icons/settings/video.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[8]</label>
-					<onclick>ActivateWindow(WeatherSettings)</onclick>
-					<icon>icons/settings/weather.png</icon>
+					<label>$LOCALIZE[14205]</label>
+					<onclick>ActivateWindow(PVRSettings)</onclick>
+					<icon>icons/settings/livetv.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[14036]</label>
+					<label>$LOCALIZE[14208]</label>
 					<onclick>ActivateWindow(ServiceSettings)</onclick>
 					<icon>icons/settings/network.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[13000]</label>
-					<onclick>ActivateWindow(SystemSettings)</onclick>
-					<icon>icons/settings/system.png</icon>
+					<label>$LOCALIZE[14207]</label>
+					<onclick>ActivateWindow(InterfaceSettings)</onclick>
+					<icon>icons/settings/appearance.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[19020]</label>
-					<onclick>ActivateWindow(PVRSettings)</onclick>
-					<icon>icons/settings/livetv.png</icon>
+					<label>$LOCALIZE[20077]</label>
+					<onclick>ActivateWindow(SkinSettings)</onclick>
+					<icon>icons/settings/skin.png</icon>
 				</item>
 				<item>
-					<label>$LOCALIZE[13200]</label>
+					<label>$LOCALIZE[14210]</label>
 					<onclick>ActivateWindow(Profiles)</onclick>
 					<icon>icons/settings/profiles.png</icon>
 				</item>
+				<item>
+					<label>$LOCALIZE[14209]</label>
+					<onclick>ActivateWindow(SystemSettings)</onclick>
+					<icon>icons/settings/system.png</icon>
+				</item>
 				<item>
 					<label>$LOCALIZE[138]</label>
 					<onclick>ActivateWindow(systeminfo)</onclick>
 					<icon>icons/settings/sysinfo.png</icon>
 				</item>
-				<item>
-					<label>$LOCALIZE[20077]</label>
-					<onclick>ActivateWindow(SkinSettings)</onclick>
-					<icon>icons/settings/skin.png</icon>
-				</item>
 			</content>
 		</control>
 		<include content="TopBar">

diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
   <section id="system">
-    <category id="videoscreen">
+    <category id="display">
       <group id="1">
         <setting id="videoscreen.resolution" label="131" />
       </group>
     </category>
-    <category id="audiooutput">
-      <group id="1">
+    <category id="audio">
+      <group id="1">        
         <setting id="audiooutput.channels" help="36367" />
       </group>
       <group id="3">
@@ -22,8 +22,10 @@
         </setting>
       </group>
     </category>
-    <category id="input">
-      <group id="1">
+  </section>
+  <section id="interface">
+    <category id="control">
+      <group id="2">
         <setting id="input.appleremotemode" type="integer" label="13600" help="36416">
           <level>1</level>
           <default>1</default> <!-- APPLE_REMOTE_STANDARD -->
@@ -63,4 +65,4 @@
       </group>
     </category>
   </section>
-</settings>
+</settings>
diff --git a/system/settings/darwin_ios.xml b/system/settings/darwin_ios.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
-  <section id="videos">
+  <section id="player" label="14200" help="">
     <category id="videoplayer">
-      <group id="3">
+      <group id="2">
         <setting id="videoplayer.adjustrefreshrate">
           <visible>false</visible>
         </setting>
       </group>
-    </category>
-    <category id="videoacceleration">
-      <group id="1">
+      <group id="4">  
         <setting id="videoplayer.hqscalers">
           <visible>false</visible>
         </setting>
       </group>
     </category>
-  </section>
-  <section id="music">
-    <category id="audiocds">
+    <category id="discs">
+      <group id="3">
       <visible>false</visible>
+      </group>
     </category>
   </section>
   <section id="system">
-    <category id="videoscreen">
+    <category id="display">
       <group id="1">
         <setting id="videoscreen.fakefullscreen">
           <visible>false</visible>
@@ -34,8 +32,8 @@
           <visible>false</visible>
         </setting>
       </group>
-    </category>
-    <category id="audiooutput">
+	</category>
+    <category id="audio">
       <group id="1">
         <setting id="audiooutput.audiodevice" type="string">
           <default>Default</default>
@@ -49,32 +47,33 @@
         </setting>
       </group>
     </category>
-    <category id="input">
+  </section>
+  <section id="interface">
+    <category id="skin">
+      <group id="1">
+        <setting id="lookandfeel.skin" type="addon">
+          <default>skin.estouchy</default>
+        </setting>
+      </group>
+    </category>
+    <category id="control">
       <group id="1">
         <setting id="input.peripherals">
           <visible>false</visible>
         </setting>
-        <setting id="input.appleremotemode">
+      </group>
+      <group id="2">
+        <setting id="input.appleremotemode" type="integer" label="13600" help="36416">
           <visible>false</visible>
         </setting>
-        <setting id="input.appleremotesequencetime">
+        <setting id="input.appleremotesequencetime" type="integer" label="13603" help="36418">
           <visible>false</visible>
         </setting>
-      </group>
-      <group id="2">
         <setting id="input.enablemouse">
           <visible>false</visible>
         </setting>
       </group>
     </category>
   </section>
-  <section id="appearance">
-    <category id="lookandfeel">
-      <group id="1">
-        <setting id="lookandfeel.skin" type="addon">
-          <default>skin.estouchy</default>
-        </setting>
-      </group>
-    </category>
-  </section>
 </settings>
+
diff --git a/system/settings/darwin_osx.xml b/system/settings/darwin_osx.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
   <section id="system">
-    <category id="input">
+    <category id="display">
       <group id="1">
-        <setting id="input.appleremotealwayson">
-          <level>1</level>
+        <setting id="videoscreen.fakefullscreen" type="boolean" parent="videoscreen.screen" label="14083" help="36354">
+          <requirement>OsxIsSnowLeopard</requirement>
         </setting>
       </group>
     </category>
-    <category id="videoscreen" label="21373" help="36603">
-      <group id="1">
-        <setting id="videoscreen.fakefullscreen" type="boolean" parent="videoscreen.screen" label="14083" help="36354">
-          <requirement>OsxIsSnowLeopard</requirement>
+  </section>
+  <section id="interface">
+    <category id="control">
+      <group id="2">
+        <setting id="input.appleremotealwayson">
+          <level>1</level>
         </setting>
       </group>
     </category>

diff --git a/system/settings/imx6.xml b/system/settings/imx6.xml
@@ -1,17 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
-  <section id="system">
-    <category id="videoscreen">
-      <group id="1">
-        <setting id="videoscreen.fakefullscreen">
-          <visible>false</visible>
-        </setting>
-      </group>
-    </category>
-  </section>
-  <section id="videos">
-    <category id="videoacceleration">
-      <group id="3">
+  <section id="player">
+    <category id="videoplayer">
+      <group id="4">
         <setting id="videoplayer.limitguiupdate" type="integer" label="38013" help="38014">
           <level>2</level>
           <default>10</default>
@@ -28,4 +19,13 @@
       </group>
     </category>
   </section>
+  <section id="system">
+    <category id="display">
+      <group id="1">
+        <setting id="videoscreen.fakefullscreen">
+          <visible>false</visible>
+        </setting>
+      </group>
+    </category>
+  </section>
 </settings>
diff --git a/system/settings/linux.xml b/system/settings/linux.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<settings>
   <section id="system">
-    <category id="videoscreen">
+    <category id="display">
       <group id="1">
         <setting id="videoscreen.fakefullscreen">
           <visible>false</visible>