Merge pull request #2738 from Montellese/fix_videoscreen_settings

settings: move dependency handling into CSettingsManager and fix videoscreen settings

diff --cc system/settings/settings.xml
index 839c8c4,d66db3c..b72c2e2
--- 1/system/settings/settings.xml
--- 2/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@@ -1842,9 -1837,13 +1842,13 @@@
            <constraints>
              <options>screens</options>
            </constraints>
-           <control type="spinner" format="string" delayed="true" />
+           <control type="spinner" format="string" delayed="true">
+             <dependencies>
+               <dependency type="update" setting="videoscreen.screenmode" />
+             </dependencies>
+           </control>
          </setting>
 -        <setting id="videoscreen.resolution" type="integer" label="169" help="">
 +        <setting id="videoscreen.resolution" type="integer" label="169" help="36352">
            <level>0</level>
            <default>16</default> <!-- RES_DESKTOP -->
            <constraints>

diff --cc xbmc/network/NetworkServices.cpp
Simple merge

diff --cc xbmc/settings/Setting.cpp
Simple merge

diff --cc xbmc/settings/windows/GUIWindowSettingsCategory.cpp
Simple merge