Skip to content

Commit 5a45201

Browse files
BornToBeRootBornToBeRoot
committed
List is now generated correctly. Help improved.
1 parent 0de6a84 commit 5a45201

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎Source/NETworkManager.Localization/Resources/Strings.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.Localization/Resources/Strings.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ If you click "Move & Restart", the remaining files will be copied and the ap
13191319
<value>Displays this dialog.</value>
13201320
</data>
13211321
<data name="HelpMessage_ParameterResetSettings" xml:space="preserve">
1322-
<value>Reset all settings.</value>
1322+
<value>Resets all application settings.</value>
13231323
</data>
13241324
<data name="HelpMessage_PasswordNotDisplayedCanBeOverwritten" xml:space="preserve">
13251325
<value>The password is not displayed when editing, but can be overwritten.</value>
@@ -2555,7 +2555,7 @@ URL: https://github.com/BornToBeRoot/NETworkManager/tree/master/Documentation</v
25552555
<value>Help</value>
25562556
</data>
25572557
<data name="HelpMessage_ParameterApplication" xml:space="preserve">
2558-
<value>Application to display.</value>
2558+
<value>Application that is displayed at startup.</value>
25592559
</data>
25602560
<data name="Parameter" xml:space="preserve">
25612561
<value>Parameter</value>

‎Source/NETworkManager/App.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
7474

7575
if (CommandLineManager.Current.Help)
7676
{
77-
StartupUri = new Uri("/Views/CommandLineHelpWindow.xaml", UriKind.Relative);
77+
StartupUri = new Uri("CommandLineWindow.xaml", UriKind.Relative);
7878
return;
7979
}
8080

Source/NETworkManager/Views/CommandLineHelpWindow.xaml renamed to Source/NETworkManager/CommandLineWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<mahAppsControls:MetroWindow x:Class="NETworkManager.Views.CommandLineHelpWindow"
1+
<mahAppsControls:MetroWindow x:Class="NETworkManager.CommandLineWindow"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -10,7 +10,7 @@
1010
xmlns:resources="clr-namespace:NETworkManager.Properties"
1111
mc:Ignorable="d"
1212
Title="{x:Static resources:Resources.NETworkManager_ProjectName}" Topmost="True" Style="{DynamicResource DefaultWindow}" MinHeight="500" Height="500" MinWidth="650" Width="650" WindowStartupLocation="CenterOwner" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" ShowInTaskbar="False"
13-
d:DataContext="{d:DesignInstance viewModels:CommandLineHelpViewModel}">
13+
d:DataContext="{d:DesignInstance viewModels:CommandLineViewModel}">
1414
<mahAppsControls:MetroWindow.WindowButtonCommands>
1515
<mahAppsControls:WindowButtonCommands Template="{DynamicResource MahApps.Metro.Templates.WindowButtonCommands.Win10}" />
1616
</mahAppsControls:MetroWindow.WindowButtonCommands>

Source/NETworkManager/Views/CommandLineHelpWindow.xaml.cs renamed to Source/NETworkManager/CommandLineWindow.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using NETworkManager.ViewModels;
22

3-
namespace NETworkManager.Views
3+
namespace NETworkManager
44
{
55
// ReSharper disable once UnusedMember.Global, called from App.xaml.cs
6-
public partial class CommandLineHelpWindow
6+
public partial class CommandLineWindow
77
{
8-
private readonly CommandLineHelpViewModel _viewModel = new CommandLineHelpViewModel();
8+
private readonly CommandLineViewModel _viewModel = new CommandLineViewModel();
99

10-
public CommandLineHelpWindow()
10+
public CommandLineWindow()
1111
{
1212
InitializeComponent();
1313
DataContext = _viewModel;

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<Compile Include="ViewModels\SubnetCalculatorSubnettingViewModel.cs" />
204204
<Compile Include="ViewModels\LookupOUILookupViewModel.cs" />
205205
<Compile Include="ViewModels\RemoteDesktopHostViewModel.cs" />
206-
<Compile Include="ViewModels\CommandLineHelpViewModel.cs" />
206+
<Compile Include="ViewModels\CommandLineViewModel.cs" />
207207
<Compile Include="ViewModels\HTTPHeadersSettingsViewModel.cs" />
208208
<Compile Include="ViewModels\PuTTYSettingsViewModel.cs" />
209209
<Compile Include="ViewModels\SNMPSettingsViewModel.cs" />
@@ -397,8 +397,8 @@
397397
<Compile Include="Views\WakeOnLANSettingsView.xaml.cs">
398398
<DependentUpon>WakeOnLANSettingsView.xaml</DependentUpon>
399399
</Compile>
400-
<Compile Include="Views\CommandLineHelpWindow.xaml.cs">
401-
<DependentUpon>CommandLineHelpWindow.xaml</DependentUpon>
400+
<Compile Include="CommandLineWindow.xaml.cs">
401+
<DependentUpon>CommandLineWindow.xaml</DependentUpon>
402402
</Compile>
403403
<Page Include="Controls\DragablzTabHostWindow.xaml">
404404
<Generator>MSBuild:Compile</Generator>
@@ -833,7 +833,7 @@
833833
<Generator>MSBuild:Compile</Generator>
834834
<SubType>Designer</SubType>
835835
</Page>
836-
<Page Include="Views\CommandLineHelpWindow.xaml">
836+
<Page Include="CommandLineWindow.xaml">
837837
<Generator>MSBuild:Compile</Generator>
838838
<SubType>Designer</SubType>
839839
</Page>

Source/NETworkManager/ViewModels/CommandLineHelpViewModel.cs renamed to Source/NETworkManager/ViewModels/CommandLineViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace NETworkManager.ViewModels
66
{
7-
public class CommandLineHelpViewModel : ViewModelBase
7+
public class CommandLineViewModel : ViewModelBase
88
{
99
#region Variables
1010
private bool _displayWrongParameter;
@@ -94,7 +94,7 @@ public string ParameterApplicationValues
9494
#endregion
9595

9696
#region Constructor, load settings
97-
public CommandLineHelpViewModel()
97+
public CommandLineViewModel()
9898
{
9999
if (!string.IsNullOrEmpty(CommandLineManager.Current.WrongParameter))
100100
{
@@ -105,7 +105,7 @@ public CommandLineHelpViewModel()
105105
ParameterHelp = CommandLineManager.ParameterHelp;
106106
ParameterResetSettings = CommandLineManager.ParameterResetSettings;
107107
ParameterApplication = CommandLineManager.GetParameterWithSplitIdentifier(CommandLineManager.ParameterApplication);
108-
ParameterApplicationValues = string.Join(" ,", System.Enum.GetValues(typeof(ApplicationName)).Cast<ApplicationName>().ToList());
108+
ParameterApplicationValues = string.Join(", ", System.Enum.GetValues(typeof(ApplicationName)).Cast<ApplicationName>().ToList());
109109
}
110110
#endregion
111111
}

0 commit comments

Comments
 (0)