Merge pull request #2660 from Montellese/settings_refactor

Settings refactor
xbmc · May 1, 2013 · ba67f98 · ba67f98
2 parents afff098 + d0eba70
commit ba67f98
Show file tree

Hide file tree

Showing 378 changed files with 14,167 additions and 7,559 deletions.
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
diff --git a/addons/skin.confluence/720p/SettingsCategory.xml b/addons/skin.confluence/720p/SettingsCategory.xml
@@ -70,7 +70,7 @@
 				<width>260</width>
 				<height>481</height>
 				<itemgap>-1</itemgap>
-				<onleft>60</onleft>
+				<onleft>9000</onleft>
 				<onright>5</onright>
 				<onup>3</onup>
 				<ondown>3</ondown>
@@ -225,6 +225,44 @@
 				<label>[COLOR=blue] - [/COLOR]$INFO[Control.GetLabel(2)]</label>
 			</control>
 		</control>
+		<control type="group">
+			<posx>-250</posx>
+			<include>SideBladeLeft</include>
+			<control type="grouplist" id="9000">
+				<posx>0</posx>
+				<posy>110</posy>
+				<width>250</width>
+				<height>600</height>
+				<onleft>9000</onleft>
+				<onright>3</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<onback>3</onback>
+				<itemgap>0</itemgap>
+				<control type="label" id="200">
+					<width>250</width>
+					<height>35</height>
+					<font>font12</font>
+					<label>31007</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
+				<control type="button" id="20">
+					<description>Setting level button</description>
+					<textwidth>235</textwidth>
+					<include>ButtonCommonValues</include>
+					<label>10037</label>
+					<onclick>SettingsLevelChange</onclick>
+				</control>
+				<control type="button" id="21">
+					<description>Reset button</description>
+					<include>ButtonCommonValues</include>
+					<label>10035</label>
+					<onclick>SettingsReset</onclick>
+				</control>
+			</control>
+		</control>
 		<include>Clock</include>
 	</controls>
 </window>
diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po
@@ -41,7 +41,9 @@ msgctxt "#31006"
 msgid "View Options"
 msgstr ""
 
-#empty string with id 31007
+msgctxt "#31007"
+msgid "Settings Options"
+msgstr ""
 
 msgctxt "#31008"
 msgid "Fullscreen"

diff --git a/language/English/strings.po b/language/English/strings.po
@@ -3617,7 +3617,9 @@ msgctxt "#1273"
 msgid "AirPlay"
 msgstr ""
 
-#empty string with id 1274
+msgctxt "#1274"
+msgid "AirTunes"
+msgstr ""
 
 #. Filter movies/tvshows/music/episodes/artists/musicvideos/albums/songs
 #: xbmc/dialogs/GUIDialogMediaFilter.cpp
@@ -4080,14 +4082,48 @@ msgctxt "#10034"
 msgid "Settings - Profiles"
 msgstr ""
 
-#empty strings from id 10035 to 10039
+msgctxt "#10035"
+msgid "Reset"
+msgstr ""
+
+msgctxt "#10036"
+msgid "Level: Basic"
+msgstr ""
+
+msgctxt "#10037"
+msgid "Level: Standard"
+msgstr ""
+
+msgctxt "#10038"
+msgid "Level: Advanced"
+msgstr ""
+
+msgctxt "#10039"
+msgid "Level: Expert"
+msgstr ""
 
 #: xbmc/guilib/WindowIDs.h
 msgctxt "#10040"
 msgid "Addon browser"
 msgstr ""
 
-#empty strings from id 10041 to 10099
+msgctxt "#10041"
+msgid "Reset settings"
+msgstr ""
+
+msgctxt "#10042"
+msgid "Are you sure you want to reset the settings in this category?"
+msgstr ""
+
+msgctxt "#10043"
+msgid "Help"
+msgstr ""
+
+msgctxt "#10044"
+msgid "No help available"
+msgstr ""
+
+#empty strings from id 10045 to 10099
 
 #: xbmc/guilib/WindowIDs.h
 msgctxt "#10100"
@@ -5669,7 +5705,7 @@ msgstr ""
 
 #: xbmc/settings/GUISettings.cpp
 msgctxt "#13435"
-msgid "Enable HQ Scalers for scalings above %"
+msgid "Enable HQ Scalers for scalings above"
 msgstr ""
 
 #empty strings from id 13436 to 13499
@@ -12060,15 +12096,27 @@ msgstr ""
 
 xbmc\network\windows\ZeroconfWIN.cpp
 msgctxt "#34300"
-msgid "Failed to start zeroconf"
+msgid "Failed to start Zeroconf"
 msgstr ""
 
 #: xbmc\network\windows\ZeroconfWIN.cpp
 msgctxt "#34301"
 msgid "Is Apple's Bonjour Service installed? See log for more info."
 msgstr ""
 
-#empty strings from id 34302 to 34399
+msgctxt "#34302"
+msgid "AirPlay requires Zeroconf to be enabled."
+msgstr ""
+
+msgctxt "#34303"
+msgid "Unable to stop Zeroconf"
+msgstr ""
+
+msgctxt "#34304"
+msgid "AirPlay and AirTunes depend on Zeroconf running."
+msgstr ""
+
+#empty strings from id 34305 to 34399
 
 #: xbmc\cores\VideoRenderers\LinuxRendererGL.cpp
 msgctxt "#34400"

diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
@@ -836,6 +836,7 @@
     <ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceHandler.cpp" />
     <ClCompile Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.cpp" />
     <ClCompile Include="..\..\xbmc\network\Network.cpp" />
+    <ClCompile Include="..\..\xbmc\network\NetworkServices.cpp" />
     <ClCompile Include="..\..\xbmc\network\Socket.cpp" />
     <ClCompile Include="..\..\xbmc\network\TCPServer.cpp" />
     <ClCompile Include="..\..\xbmc\network\UdpClient.cpp" />
@@ -952,13 +953,24 @@
     <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\GUISettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\ISetting.cpp" />
     <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\Setting.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingAddon.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingCategoryAccess.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingConditions.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingControl.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingDependency.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingPath.cpp" />
     <ClCompile Include="..\..\xbmc\settings\Settings.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingSection.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingsManager.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingUpdate.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\SettingVisibility.cpp" />
     <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\VideoSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\settings\windows\GUISettingControls.cpp" />
+    <ClCompile Include="..\..\xbmc\settings\windows\GUIControlSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp" />
     <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp" />
@@ -1103,6 +1115,7 @@
     <ClInclude Include="..\..\xbmc\interfaces\python\PyContext.h" />
     <ClInclude Include="..\..\xbmc\interfaces\python\pythreadstate.h" />
     <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h" />
+    <ClInclude Include="..\..\xbmc\network\NetworkServices.h" />
     <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h" />
     <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h" />
     <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h" />
@@ -1113,17 +1126,33 @@
     <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\ISetting.h" />
+    <ClInclude Include="..\..\xbmc\settings\ISettingCallback.h" />
+    <ClInclude Include="..\..\xbmc\settings\ISettingCreator.h" />
     <ClInclude Include="..\..\xbmc\settings\ISettingsHandler.h" />
     <ClInclude Include="..\..\xbmc\settings\ISubSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\MediaSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h" />
+    <ClInclude Include="..\..\xbmc\settings\Setting.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingAddon.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingCategoryAccess.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingConditions.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingControl.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingDependency.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingPath.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingSection.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingsManager.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingUpdate.h" />
+    <ClInclude Include="..\..\xbmc\settings\SettingVisibility.h" />
     <ClInclude Include="..\..\xbmc\settings\SkinSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\windows\GUISettingControls.h" />
+    <ClInclude Include="..\..\xbmc\settings\windows\GUIControlSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h" />
     <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h" />
     <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h" />
+    <ClInclude Include="..\..\xbmc\utils\BooleanLogic.h" />
     <ClInclude Include="..\..\xbmc\utils\IRssObserver.h" />
+    <ClInclude Include="..\..\xbmc\utils\IXmlDeserializable.h" />
     <ClInclude Include="..\..\xbmc\utils\RssManager.h" />
     <ClInclude Include="..\..\xbmc\utils\Vector.h" />
     <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h" />
@@ -1261,6 +1290,7 @@
     </ClInclude>
     <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.h" />
     <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\utils\BooleanLogic.cpp" />
     <ClCompile Include="..\..\xbmc\utils\RssManager.cpp" />
     <ClCompile Include="..\..\xbmc\utils\test\TestUrlOptions.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">true</ExcludedFromBuild>
@@ -2356,7 +2386,6 @@
     <ClInclude Include="..\..\xbmc\rendering\RenderSystem.h" />
     <ClInclude Include="..\..\xbmc\SectionLoader.h" />
     <ClInclude Include="..\..\xbmc\settings\AdvancedSettings.h" />
-    <ClInclude Include="..\..\xbmc\settings\GUISettings.h" />
     <ClInclude Include="..\..\xbmc\settings\Settings.h" />
     <ClInclude Include="..\..\xbmc\settings\VideoSettings.h" />
     <ClInclude Include="..\..\xbmc\SortFileItem.h" />
@@ -2945,4 +2974,4 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
+</Project>