Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Source/NETworkManager.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AES/@EntryIndexedValue">AES</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARP/@EntryIndexedValue">ARP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CNAME/@EntryIndexedValue">CNAME</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DES/@EntryIndexedValue">DES</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DNS/@EntryIndexedValue">DNS</s:String>
Expand All @@ -18,6 +19,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RAW/@EntryIndexedValue">RAW</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RDP/@EntryIndexedValue">RDP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SNMP/@EntryIndexedValue">SNMP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SNMPV/@EntryIndexedValue">SNMPV</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSH/@EntryIndexedValue">SSH</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TCP/@EntryIndexedValue">TCP</s:String>
Expand Down
2 changes: 0 additions & 2 deletions Source/NETworkManager/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatSlider.xaml" />
<!-- Dragablz -->
<ResourceDictionary Source="pack://application:,,,/Dragablz;component/Themes/MahApps.xaml" />
<!-- Localization -->
<ResourceDictionary Source="/Resources/Localization/en-US.xaml" />
<!-- Context menu (import berfore styles)-->
<ResourceDictionary Source="/Resources/ContextMenu/ContextMenu.xaml" />
<!-- Control templates (import before styles) -->
Expand Down
2 changes: 2 additions & 0 deletions Source/NETworkManager/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
// Load localization (requires settings to be loaded first)
LocalizationManager.Load();

NETworkManager.Resources.Localization.Strings.Culture = LocalizationManager.Culture;

if (CommandLineManager.Current.Help)
{
StartupUri = new Uri("/Views/CommandLineHelpWindow.xaml", UriKind.Relative);
Expand Down
39 changes: 37 additions & 2 deletions Source/NETworkManager/ApplicationViewManager.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using MahApps.Metro.IconPacks;
using NETworkManager.Models.Settings;
using System.Collections.Generic;

namespace NETworkManager
Expand Down Expand Up @@ -29,7 +28,43 @@ public static class ApplicationViewManager

public static string GetTranslatedNameByName(Name name)
{
return LocalizationManager.GetStringByKey("String_ApplicationName_" + name);
switch (name)
{
case Name.NetworkInterface:
return Resources.Localization.Strings.NetworkInterface;
case Name.IPScanner:
return Resources.Localization.Strings.IPScanner;
case Name.PortScanner:
return Resources.Localization.Strings.PortScanner;
case Name.Ping:
return Resources.Localization.Strings.Ping;
case Name.Traceroute:
return Resources.Localization.Strings.Traceroute;
case Name.DNSLookup:
return Resources.Localization.Strings.DNSLookup;
case Name.RemoteDesktop:
return Resources.Localization.Strings.RemoteDesktop;
case Name.PuTTY:
return Resources.Localization.Strings.PuTTY;
case Name.SNMP:
return Resources.Localization.Strings.SNMP;
case Name.WakeOnLAN:
return Resources.Localization.Strings.WakeOnLAN;
case Name.HTTPHeaders:
return Resources.Localization.Strings.HTTPHeaders;
case Name.SubnetCalculator:
return Resources.Localization.Strings.SubnetCalculator;
case Name.Lookup:
return Resources.Localization.Strings.Lookup;
case Name.Connections:
return Resources.Localization.Strings.Connections;
case Name.Listeners:
return Resources.Localization.Strings.Listeners;
case Name.ARPTable:
return Resources.Localization.Strings.ARPTable;
default:
return "";
}
}

public enum Name
Expand Down
3 changes: 2 additions & 1 deletion Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
xmlns:converters="clr-namespace:NETworkManager.Converters"
xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls"
mc:Ignorable="d"
Title="{DynamicResource String_ProductName}" Style="{DynamicResource DefaultWindow}" MinWidth="650" MinHeight="500" Height="650" Width="1000" TitleAlignment="Left"
Title="NETworkManager" Style="{DynamicResource DefaultWindow}" MinWidth="650" MinHeight="500" Height="650" Width="1000" TitleAlignment="Left"
d:DataContext="{d:DesignInstance networkManagerControls:DragablzTabHostWindow}">
<mahAppsControls:MetroWindow.Resources>
<converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
Expand Down
11 changes: 6 additions & 5 deletions Source/NETworkManager/Controls/PuTTYControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="clr-namespace:NETworkManager.Converters"
xmlns:windowsForms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls"
dialogs:DialogParticipation.Register="{Binding}"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
mah:DialogParticipation.Register="{Binding}"
mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance networkManagerControls:PuttyControl}">
<UserControl.Resources>
<converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
Expand All @@ -24,9 +25,9 @@
<RowDefinition Height="20" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="{DynamicResource String_Header_Disconnected}" Style="{StaticResource HeaderTextBlock}" />
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{DynamicResource String_PuTTYProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" />
<Button Grid.Row="3" Content="{DynamicResource String_Button_Reconnect}" Command="{Binding ReconnectCommand}" IsDefault="True" Style="{StaticResource DefaultButton}"/>
<TextBlock Grid.Row="0" Text="{x:Static localization:Strings.Disconnected}" Style="{StaticResource HeaderTextBlock}" />
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.PuTTYProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" />
<Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" IsDefault="True" Style="{StaticResource DefaultButton}"/>
</Grid>
</Grid>
</UserControl>
4 changes: 2 additions & 2 deletions Source/NETworkManager/Controls/PuTTYControl.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ private async void Connect()
catch (Exception ex)
{
var settings = AppearanceManager.MetroDialog;
settings.AffirmativeButtonText = LocalizationManager.GetStringByKey("String_Button_OK");
settings.AffirmativeButtonText = NETworkManager.Resources.Localization.Strings.OK;

ConfigurationManager.Current.IsDialogOpen = true;

await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error"), ex.Message, MessageDialogStyle.Affirmative, settings);
await _dialogCoordinator.ShowMessageAsync(this, NETworkManager.Resources.Localization.Strings.Error, ex.Message, MessageDialogStyle.Affirmative, settings);

ConfigurationManager.Current.IsDialogOpen = false;
}
Expand Down
5 changes: 3 additions & 2 deletions Source/NETworkManager/Controls/RemoteDesktopControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
xmlns:mstsc ="clr-namespace:AxMSTSCLib;assembly=AxMSTSCLib"
xmlns:converters="clr-namespace:NETworkManager.Converters"
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:localization ="clr-namespace:NETworkManager.Resources.Localization"
xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls"
mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance networkManagerControls:RemoteDesktopControl}">
<UserControl.Resources>
Expand All @@ -25,10 +26,10 @@
<RowDefinition Height="20" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="{DynamicResource String_Header_Disconnected}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
<TextBlock Grid.Row="0" Text="{x:Static localization:Strings.Disconnected}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding DisconnectReason}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
<controls:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsReconnecting}" Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
<Button Grid.Row="3" Content="{DynamicResource String_Button_Reconnect}" Command="{Binding ReconnectCommand}" IsDefault="True" IsEnabled="{Binding IsReconnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
<Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" IsDefault="True" IsEnabled="{Binding IsReconnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
</Grid>
</Grid>
</UserControl>
Loading