Skip to content

Commit b43ee58

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent a754365 commit b43ee58

53 files changed

Lines changed: 152 additions & 89 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/NETworkManager.Settings/GlobalStaticConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// ReSharper disable InconsistentNaming
1515

16-
namespace NETworkManager
16+
namespace NETworkManager.Settings
1717
{
1818
public static class GlobalStaticConfiguration
1919
{

‎Source/NETworkManager.Settings/LocalSettingsManager.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
namespace NETworkManager.Settings
2+
{
3+
public static class LocalSettingsManager
4+
{
5+
public static bool UpgradeRequired
6+
{
7+
get { return Properties.Settings.Default.UpgradeRequired; }
8+
set { Properties.Settings.Default.UpgradeRequired = value; }
9+
}
10+
11+
public static string Settings_CustomSettingsLocation
12+
{
13+
get { return Properties.Settings.Default.Settings_CustomSettingsLocation; }
14+
set { Properties.Settings.Default.Settings_CustomSettingsLocation = value; }
15+
}
16+
17+
public static void Upgrade()
18+
{
19+
Properties.Settings.Default.Upgrade();
20+
}
21+
22+
public static void Save()
23+
{
24+
Properties.Settings.Default.Save();
25+
}
26+
}
27+
}

‎Source/NETworkManager.Settings/NETworkManager.Settings.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@
4444
</ItemGroup>
4545
<ItemGroup>
4646
<Compile Include="GlobalStaticConfiguration.cs" />
47+
<Compile Include="LocalSettingsManager.cs" />
4748
<Compile Include="Properties\AssemblyInfo.cs" />
49+
<Compile Include="Properties\Settings.Designer.cs">
50+
<AutoGen>True</AutoGen>
51+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
52+
<DependentUpon>Settings.settings</DependentUpon>
53+
</Compile>
4854
</ItemGroup>
4955
<ItemGroup>
5056
<ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj">
@@ -64,5 +70,12 @@
6470
<Version>12.0.0</Version>
6571
</PackageReference>
6672
</ItemGroup>
73+
<ItemGroup>
74+
<None Include="app.config" />
75+
<None Include="Properties\Settings.settings">
76+
<Generator>SettingsSingleFileGenerator</Generator>
77+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
78+
</None>
79+
</ItemGroup>
6780
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6881
</Project>

Source/NETworkManager/Properties/Settings.Designer.cs renamed to Source/NETworkManager.Settings/Properties/Settings.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/NETworkManager/Properties/Settings.settings renamed to Source/NETworkManager.Settings/Properties/Settings.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="NETworkManager.Properties" GeneratedClassName="Settings">
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="NETworkManager.Settings.Properties" GeneratedClassName="Settings">
33
<Profiles />
44
<Settings>
55
<Setting Name="Settings_CustomSettingsLocation" Type="System.String" Scope="User">

‎Source/NETworkManager.Settings/app.config‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5+
<section name="NETworkManager.Settings.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<NETworkManager.Settings.Properties.Settings>
10+
<setting name="Settings_CustomSettingsLocation" serializeAs="String">
11+
<value />
12+
</setting>
13+
<setting name="UpgradeRequired" serializeAs="String">
14+
<value>True</value>
15+
</setting>
16+
</NETworkManager.Settings.Properties.Settings>
17+
</userSettings>
18+
</configuration>

‎Source/NETworkManager/App.config‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="NETworkManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
6-
</sectionGroup>
74
</configSections>
8-
<userSettings>
9-
<NETworkManager.Properties.Settings>
10-
<setting name="Settings_CustomSettingsLocation" serializeAs="String">
11-
<value/>
12-
</setting>
13-
<setting name="UpgradeRequired" serializeAs="String">
14-
<value>True</value>
15-
</setting>
16-
</NETworkManager.Properties.Settings>
17-
</userSettings>
185
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

‎Source/NETworkManager/App.xaml.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using System.Threading;
77
using System.Windows;
88
using System.Windows.Threading;
9-
using NETworkManager.Properties;
109
using NETworkManager.Models.Profile;
1110
using NETworkManager.Localization;
11+
using NETworkManager.Settings;
1212

1313
namespace NETworkManager
1414
{
@@ -52,10 +52,10 @@ private void Application_Startup(object sender, StartupEventArgs e)
5252
}
5353

5454
// Update integrated settings %LocalAppData%\NETworkManager\NETworkManager_GUID (custom settings path)
55-
if (Settings.Default.UpgradeRequired)
55+
if (LocalSettingsManager.UpgradeRequired)
5656
{
57-
Settings.Default.Upgrade();
58-
Settings.Default.UpgradeRequired = false;
57+
LocalSettingsManager.Upgrade();
58+
LocalSettingsManager.UpgradeRequired = false;
5959
}
6060

6161
// Load settings
@@ -141,7 +141,7 @@ private void Application_Exit(object sender, ExitEventArgs e)
141141
private void Save()
142142
{
143143
// Save local settings (custom settings path in AppData/Local)
144-
Settings.Default.Save();
144+
LocalSettingsManager.Save();
145145

146146
if (SettingsManager.Current.SettingsChanged) // This will also create the "Settings" folder, if it does not exist
147147
SettingsManager.Save();

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
1010
xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
1111
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
12-
xmlns:networkManager="clr-namespace:NETworkManager"
13-
xmlns:settings="clr-namespace:NETworkManager.Models.Settings"
12+
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
13+
xmlns:settingsOld="clr-namespace:NETworkManager.Models.Settings"
1414
xmlns:resources="clr-namespace:NETworkManager.Properties"
15+
xmlns:networkManager="clr-namespace:NETworkManager"
1516
mc:Ignorable="d"
1617
Title="{x:Static resources:Resources.NETworkManager_ProjectName}" Style="{DynamicResource DefaultWindow}" MinWidth="1050" MinHeight="700" SaveWindowPosition="True" TitleAlignment="Left" Closing="MetroWindowMain_Closing" StateChanged="MetroWindowMain_StateChanged"
1718
d:DataContext="{d:DesignInstance networkManager:MainWindow}">
@@ -66,7 +67,7 @@
6667
<mahAppsControls:MetroWindow.LeftWindowCommands>
6768
<mahAppsControls:WindowCommands>
6869
<StackPanel Orientation="Horizontal">
69-
<Grid Background="{DynamicResource GrayBrush8}" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsAdmin, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
70+
<Grid Background="{DynamicResource GrayBrush8}" Visibility="{Binding Source={x:Static settingsOld:ConfigurationManager.Current}, Path=IsAdmin, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
7071
<TextBlock Text="Administrator" Foreground="{DynamicResource GrayBrush3}" Style="{StaticResource CenterTextBlock}" Margin="10,0"/>
7172
</Grid>
7273
</StackPanel>

‎Source/NETworkManager/Models/Profile/ProfileInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using NETworkManager.Models.RemoteDesktop;
2+
using NETworkManager.Settings;
23
using System.Diagnostics.CodeAnalysis;
34
using static NETworkManager.Models.PuTTY.PuTTY;
45

0 commit comments

Comments
 (0)