Skip to content

Commit 52f3a0f

Browse files
BornToBeRootBornToBeRoot
committed
Import/Export removed
1 parent 4e27e9b commit 52f3a0f

10 files changed

Lines changed: 3 additions & 739 deletions

‎Source/NETworkManager/App.xaml.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Windows.Threading;
99
using NETworkManager.Properties;
1010
using NETworkManager.Models.Profile;
11-
using NETworkManager.Models.ImportExport;
1211

1312
namespace NETworkManager
1413
{
@@ -141,7 +140,7 @@ protected override void OnSessionEnding(SessionEndingCancelEventArgs e)
141140
private void Application_Exit(object sender, ExitEventArgs e)
142141
{
143142
// Save settings, when the application is normally closed
144-
if (_singleInstanceClose || ImportExportManager.ForceRestart || CommandLineManager.Current.Help)
143+
if (_singleInstanceClose || ConfigurationManager.Current.ForceRestart || CommandLineManager.Current.Help)
145144
return;
146145

147146
_dispatcherTimer?.Stop();

‎Source/NETworkManager/MainWindow.xaml.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
using NETworkManager.ViewModels;
2424
using NETworkManager.Models.EventSystem;
2525
using ContextMenu = System.Windows.Controls.ContextMenu;
26-
using DnsClient;
2726
using NETworkManager.Models.Profile;
28-
using NETworkManager.Models.ImportExport;
2927

3028
namespace NETworkManager
3129
{
@@ -429,8 +427,8 @@ private void LoadApplicationList()
429427

430428
private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
431429
{
432-
// Force restart (if user has reset the settings or import them)
433-
if (ConfigurationManager.Current.ForceRestart || ImportExportManager.ForceRestart)
430+
// Force restart --> Import, Reset, etc.
431+
if (ConfigurationManager.Current.ForceRestart)
434432
{
435433
RestartApplication(false);
436434

‎Source/NETworkManager/Models/ImportExport/ImportExportManager.cs‎

Lines changed: 0 additions & 127 deletions
This file was deleted.

‎Source/NETworkManager/Models/ImportExport/ImportFileNotValidException.cs‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -956,10 +956,6 @@
956956
<Generator>MSBuild:Compile</Generator>
957957
<SubType>Designer</SubType>
958958
</Page>
959-
<Page Include="Views\SettingsImportExportView.xaml">
960-
<Generator>MSBuild:Compile</Generator>
961-
<SubType>Designer</SubType>
962-
</Page>
963959
<Page Include="Views\SettingsSettingsView.xaml">
964960
<Generator>MSBuild:Compile</Generator>
965961
<SubType>Designer</SubType>
@@ -1040,8 +1036,6 @@
10401036
<Compile Include="Models\Lookup\PortLookup.cs" />
10411037
<Compile Include="Models\Lookup\OUILookup.cs" />
10421038
<Compile Include="Models\Network\PortScanner.cs" />
1043-
<Compile Include="Models\ImportExport\ImportExportManager.cs" />
1044-
<Compile Include="Models\ImportExport\ImportFileNotValidException.cs" />
10451039
<Compile Include="Models\Settings\SettingsFileInfo.cs" />
10461040
<Compile Include="Validators\FileExistsValidator.cs" />
10471041
<Compile Include="Validators\PortRangeValidator.cs" />
@@ -1111,7 +1105,6 @@
11111105
<Compile Include="ViewModels\SettingsAppearanceViewModel.cs" />
11121106
<Compile Include="ViewModels\SettingsLanguageViewModel.cs" />
11131107
<Compile Include="ViewModels\SettingsHotKeysViewModel.cs" />
1114-
<Compile Include="ViewModels\SettingsImportExportViewModel.cs" />
11151108
<Compile Include="ViewModels\SettingsSettingsViewModel.cs" />
11161109
<Compile Include="ViewModels\SettingsAutostartViewModel.cs" />
11171110
<Compile Include="ViewModels\SettingsViewModel.cs" />
@@ -1146,9 +1139,6 @@
11461139
<Compile Include="Views\SettingsGeneralView.xaml.cs">
11471140
<DependentUpon>SettingsGeneralView.xaml</DependentUpon>
11481141
</Compile>
1149-
<Compile Include="Views\SettingsImportExportView.xaml.cs">
1150-
<DependentUpon>SettingsImportExportView.xaml</DependentUpon>
1151-
</Compile>
11521142
<Compile Include="Views\SettingsSettingsView.xaml.cs">
11531143
<DependentUpon>SettingsSettingsView.xaml</DependentUpon>
11541144
</Compile>

‎Source/NETworkManager/SettingsViewManager.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public static class SettingsViewManager
1717
new SettingsViewInfo(Name.HotKeys, new PackIconOcticons { Kind = PackIconOcticonsKind.Keyboard }, Group.General),
1818
new SettingsViewInfo(Name.Autostart, new PackIconMaterial { Kind = PackIconMaterialKind.Power }, Group.General),
1919
new SettingsViewInfo(Name.Update, new PackIconMaterial { Kind = PackIconMaterialKind.Download }, Group.General),
20-
new SettingsViewInfo(Name.ImportExport, new PackIconMaterial { Kind = PackIconMaterialKind.Import }, Group.General),
2120
new SettingsViewInfo(Name.Settings, new PackIconMaterialLight { Kind = PackIconMaterialLightKind.Cog }, Group.General),
2221

2322
// Applications

0 commit comments

Comments
 (0)