Nereus: Completely move up skin settings by one level

MediaPortal · Jan 6, 2021 · f6aa5bf · f6aa5bf
1 parent 7ecaaf4
commit f6aa5bf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/MediaPortal/Build/MSBUILD_Create_Release_Full_Installer.bat b/MediaPortal/Build/MSBUILD_Create_Release_Full_Installer.bat
@@ -1 +1,2 @@
 call MSBUILD_Rebuild_Base.bat Build_Report_MediaPortal_2 "/property:Configuration=Release"
+pause
diff --git a/MediaPortal/Incubator/HomeEditor/plugin.xml b/MediaPortal/Incubator/HomeEditor/plugin.xml
@@ -92,14 +92,14 @@
   -->
 
   <!-- Contents of '/Appearance' group -->
-  <Register Location="/Configuration/Settings/Appearance/Skin">
+  <Register Location="/Configuration/Settings/Appearance">
     <ConfigSection
       Id="SkinSettings"
       Redundant="true"
       Text="[SkinSettings.Configuration.SkinSettings]"/>
   </Register>
 
-  <Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
+  <Register Location="/Configuration/Settings/Appearance/SkinSettings">
     <CustomConfigSetting
         Id="HomeEditorConfig"
         Text="[HomeEditor.Configuration]"

diff --git a/MediaPortal/Source/Core/MediaPortal.Common/VersionInfo/VersionInfo.cs b/MediaPortal/Source/Core/MediaPortal.Common/VersionInfo/VersionInfo.cs
@@ -5,10 +5,10 @@
 // be deleted.
 [assembly: AssemblyCompany("Team MediaPortal")]
 [assembly: AssemblyProduct("MediaPortal 2")]
-[assembly: AssemblyCopyright("Copyright © Team MediaPortal 2007 - 2020")]
+[assembly: AssemblyCopyright("Copyright © Team MediaPortal 2007 - 2021")]
 // Note: Following two line will be modified by AssemblyInfoHelper in build process:
 // The version number will have format: 2.YY.MM.{BuildNumber}
-[assembly: AssemblyVersion("2.3.2011.13404")]
-[assembly: AssemblyFileVersion("2.3.2011.13404")]
+[assembly: AssemblyVersion("2.3.2101.13486")]
+[assembly: AssemblyFileVersion("2.3.2101.13486")]
 // Note: This line will be filled by AssemblyInfoHelper in build process.
-[assembly: AssemblyInformationalVersion("origin/Branch_WIP_2.3.1_TVE_downgrade-5e7070")]
+[assembly: AssemblyInformationalVersion("origin/WIP_2.3.2-7ecaaf")]
diff --git a/MediaPortal/Source/UI/Skins/BlueVision/plugin.xml b/MediaPortal/Source/UI/Skins/BlueVision/plugin.xml
@@ -55,15 +55,15 @@
   </Register>
 
   <!-- Contents of '/Appearance/Skin' section -->
-  <Register Location="/Configuration/Settings/Appearance/Skin">
+  <Register Location="/Configuration/Settings/Appearance">
     <ConfigSection
         Id="SkinSettings"
         Redundant="true"
         Text="[SkinSettings.Configuration.SkinSettings]"/>
   </Register>
 
   <!-- Contents of '/Appearance/Skin/SkinSettings' section -->
-  <Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
+  <Register Location="/Configuration/Settings/Appearance/SkinSettings">
     <CustomConfigSetting
         Id="BlueVisionSetup"
         Text="[BlueVision.Configuration]"

diff --git a/MediaPortal/Source/UI/Skins/Nereus/Actions/SkinSettingsAction.cs b/MediaPortal/Source/UI/Skins/Nereus/Actions/SkinSettingsAction.cs
@@ -29,7 +29,7 @@ namespace MediaPortal.UiComponents.Nereus.Actions
 {
   public class SkinSettingsAction : AbstractConfigurationAction
   {
-    public const string CONFIG_LOCATION = "/Appearance/Skin/SkinSettings";
+    public const string CONFIG_LOCATION = "/Appearance/SkinSettings";
 
     public override IResourceString DisplayTitle
     {

diff --git a/MediaPortal/Source/UI/Skins/WMC/Actions/SkinSettingsAction.cs b/MediaPortal/Source/UI/Skins/WMC/Actions/SkinSettingsAction.cs
@@ -36,7 +36,7 @@ namespace MediaPortal.UiComponents.WMCSkin.Actions
 {
   public class SkinSettingsAction : AbstractConfigurationAction
   {
-    public const string CONFIG_LOCATION = "/Appearance/Skin/SkinSettings";
+    public const string CONFIG_LOCATION = "/Appearance/SkinSettings";
 
     public override IResourceString DisplayTitle
     {

diff --git a/MediaPortal/Source/UI/Skins/WMC/plugin.xml b/MediaPortal/Source/UI/Skins/WMC/plugin.xml
@@ -60,15 +60,15 @@
   </Register>
 
   <!-- Contents of '/Appearance/Skin' section -->
-  <Register Location="/Configuration/Settings/Appearance/Skin">
+  <Register Location="/Configuration/Settings/Appearance">
     <ConfigSection
         Id="SkinSettings"
         Redundant="true"
         Text="[SkinSettings.Configuration.SkinSettings]"/>
   </Register>
 
   <!-- Contents of '/Appearance/Skin/SkinAndTheme' group -->
-  <Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
+  <Register Location="/Configuration/Settings/Appearance/SkinSettings">
     <ConfigSetting
         Id="EnableFanart"
         Text="[WMC.Configuration.EnableFanart]"