From 0ed18556ef4c0888c05aff0e0d9ef4908e57e2ee Mon Sep 17 00:00:00 2001
From: morpheusxx <morpheus_xx@team-mediaportal.com>
Date: Wed, 23 Dec 2020 19:21:52 +0100
Subject: [PATCH] Restored SkinSettings position and sorting of Settings/Media

---
 .../ServerSettings.Client/plugin.xml          | 20 +++++++++++++------
 MediaPortal/Source/UI/Skins/Nereus/plugin.xml |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/MediaPortal/Source/Backend/BackendComponents/ServerSettings.Client/plugin.xml b/MediaPortal/Source/Backend/BackendComponents/ServerSettings.Client/plugin.xml
index b7bd3bd6fa9..81ab951e29e 100644
--- a/MediaPortal/Source/Backend/BackendComponents/ServerSettings.Client/plugin.xml
+++ b/MediaPortal/Source/Backend/BackendComponents/ServerSettings.Client/plugin.xml
@@ -92,34 +92,42 @@
   <!-- Importer settings -->
   <Register Location="/Configuration/Settings/Media">
     <ConfigSection
+        Sort="A500"
         Id="AudioMDESettings"
         Redundant="true"
         Text="[Settings.ServerSettings.AudioMDESettings]"/>
     <ConfigSection
+        Sort="A501"
         Id="VideoMDESettings"
         Redundant="true"
         Text="[Settings.ServerSettings.VideoMDESettings]"/>
     <ConfigSection
+        Sort="A502"
         Id="MovieMDESettings"
         Redundant="true"
         Text="[Settings.ServerSettings.MovieMDESettings]"/>
     <ConfigSection
+        Sort="A503"
         Id="SeriesMDESettings"
         Redundant="true"
         Text="[Settings.ServerSettings.SeriesMDESettings]"/>
     <ConfigSection
-          Id="ImageMDESettings"
-          Redundant="true"
-          Text="[Settings.ServerSettings.ImageMDESettings]"/>
+        Sort="A504"
+        Id="ImageMDESettings"
+        Redundant="true"
+        Text="[Settings.ServerSettings.ImageMDESettings]"/>
     <ConfigSection
+        Sort="A505"
         Id="SubtitleMDESettings"
         Redundant="true"
         Text="[Settings.ServerSettings.SubtitleMDESettings]"/>
     <ConfigSection
-          Id="FanArtSettings"
-          Redundant="true"
-          Text="[Settings.ServerSettings.FanArtSettings]"/>
+        Sort="A506"
+        Id="FanArtSettings"
+        Redundant="true"
+        Text="[Settings.ServerSettings.FanArtSettings]"/>
     <ConfigSection
+        Sort="A507"
         Id="LanguageSettings"
         Redundant="true"
         Text="[Settings.ServerSettings.LanguageSettings]"/>
diff --git a/MediaPortal/Source/UI/Skins/Nereus/plugin.xml b/MediaPortal/Source/UI/Skins/Nereus/plugin.xml
index ac334c93851..b63877c8cbe 100644
--- a/MediaPortal/Source/UI/Skins/Nereus/plugin.xml
+++ b/MediaPortal/Source/UI/Skins/Nereus/plugin.xml
@@ -86,7 +86,7 @@
   </Register>
 
   <!-- Contents of '/Appearance/Skin' section -->
-  <Register Location="/Configuration/Settings/Appearance/Skin">
+  <Register Location="/Configuration/Settings/Appearance">
     <ConfigSection
         Id="SkinSettings"
         Redundant="true"
@@ -94,7 +94,7 @@
   </Register>
 
   <!-- Contents of '/Appearance/Skin/SkinAndTheme' group -->
-  <Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
+  <Register Location="/Configuration/Settings/Appearance/SkinSettings">
     <ConfigSetting
         Id="NereusEnableHelpTexts"
         Text="[Nereus.Configuration.EnableHelpTexts]"