Skip to content

Commit f6aa5bf

Browse files
committed
Nereus: Completely move up skin settings by one level
1 parent 7ecaaf4 commit f6aa5bf

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
call MSBUILD_Rebuild_Base.bat Build_Report_MediaPortal_2 "/property:Configuration=Release"
2+
pause

MediaPortal/Incubator/HomeEditor/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
-->
9393

9494
<!-- Contents of '/Appearance' group -->
95-
<Register Location="/Configuration/Settings/Appearance/Skin">
95+
<Register Location="/Configuration/Settings/Appearance">
9696
<ConfigSection
9797
Id="SkinSettings"
9898
Redundant="true"
9999
Text="[SkinSettings.Configuration.SkinSettings]"/>
100100
</Register>
101101

102-
<Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
102+
<Register Location="/Configuration/Settings/Appearance/SkinSettings">
103103
<CustomConfigSetting
104104
Id="HomeEditorConfig"
105105
Text="[HomeEditor.Configuration]"

MediaPortal/Source/Core/MediaPortal.Common/VersionInfo/VersionInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// be deleted.
66
[assembly: AssemblyCompany("Team MediaPortal")]
77
[assembly: AssemblyProduct("MediaPortal 2")]
8-
[assembly: AssemblyCopyright("Copyright © Team MediaPortal 2007 - 2020")]
8+
[assembly: AssemblyCopyright("Copyright © Team MediaPortal 2007 - 2021")]
99
// Note: Following two line will be modified by AssemblyInfoHelper in build process:
1010
// The version number will have format: 2.YY.MM.{BuildNumber}
11-
[assembly: AssemblyVersion("2.3.2011.13404")]
12-
[assembly: AssemblyFileVersion("2.3.2011.13404")]
11+
[assembly: AssemblyVersion("2.3.2101.13486")]
12+
[assembly: AssemblyFileVersion("2.3.2101.13486")]
1313
// Note: This line will be filled by AssemblyInfoHelper in build process.
14-
[assembly: AssemblyInformationalVersion("origin/Branch_WIP_2.3.1_TVE_downgrade-5e7070")]
14+
[assembly: AssemblyInformationalVersion("origin/WIP_2.3.2-7ecaaf")]

MediaPortal/Source/UI/Skins/BlueVision/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
</Register>
5656

5757
<!-- Contents of '/Appearance/Skin' section -->
58-
<Register Location="/Configuration/Settings/Appearance/Skin">
58+
<Register Location="/Configuration/Settings/Appearance">
5959
<ConfigSection
6060
Id="SkinSettings"
6161
Redundant="true"
6262
Text="[SkinSettings.Configuration.SkinSettings]"/>
6363
</Register>
6464

6565
<!-- Contents of '/Appearance/Skin/SkinSettings' section -->
66-
<Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
66+
<Register Location="/Configuration/Settings/Appearance/SkinSettings">
6767
<CustomConfigSetting
6868
Id="BlueVisionSetup"
6969
Text="[BlueVision.Configuration]"

MediaPortal/Source/UI/Skins/Nereus/Actions/SkinSettingsAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace MediaPortal.UiComponents.Nereus.Actions
2929
{
3030
public class SkinSettingsAction : AbstractConfigurationAction
3131
{
32-
public const string CONFIG_LOCATION = "/Appearance/Skin/SkinSettings";
32+
public const string CONFIG_LOCATION = "/Appearance/SkinSettings";
3333

3434
public override IResourceString DisplayTitle
3535
{

MediaPortal/Source/UI/Skins/WMC/Actions/SkinSettingsAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace MediaPortal.UiComponents.WMCSkin.Actions
3636
{
3737
public class SkinSettingsAction : AbstractConfigurationAction
3838
{
39-
public const string CONFIG_LOCATION = "/Appearance/Skin/SkinSettings";
39+
public const string CONFIG_LOCATION = "/Appearance/SkinSettings";
4040

4141
public override IResourceString DisplayTitle
4242
{

MediaPortal/Source/UI/Skins/WMC/plugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@
6060
</Register>
6161

6262
<!-- Contents of '/Appearance/Skin' section -->
63-
<Register Location="/Configuration/Settings/Appearance/Skin">
63+
<Register Location="/Configuration/Settings/Appearance">
6464
<ConfigSection
6565
Id="SkinSettings"
6666
Redundant="true"
6767
Text="[SkinSettings.Configuration.SkinSettings]"/>
6868
</Register>
6969

7070
<!-- Contents of '/Appearance/Skin/SkinAndTheme' group -->
71-
<Register Location="/Configuration/Settings/Appearance/Skin/SkinSettings">
71+
<Register Location="/Configuration/Settings/Appearance/SkinSettings">
7272
<ConfigSetting
7373
Id="EnableFanart"
7474
Text="[WMC.Configuration.EnableFanart]"

0 commit comments

Comments
 (0)