Skip to content

Commit 7980a65

Browse files
BornToBeRootBornToBeRoot
committed
Minor fixes for string, preview etc.
1 parent 932a0bc commit 7980a65

10 files changed

Lines changed: 72 additions & 59 deletions

File tree

‎Source/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
[assembly: AssemblyTrademark("")]
77
[assembly: AssemblyCulture("")]
88

9-
[assembly: AssemblyVersion("2020.7.0.0")]
10-
[assembly: AssemblyFileVersion("2020.7.0.0")]
9+
[assembly: AssemblyVersion("2020.9.0.0")]
10+
[assembly: AssemblyFileVersion("2020.9.0.0")]

‎Source/NETworkManager.Localization/NETworkManager.Localization.csproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,28 @@
4747
<ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
4848
</ItemGroup>
4949

50+
<ItemGroup>
51+
<Compile Update="Resources\StaticStrings.Designer.cs">
52+
<DesignTime>True</DesignTime>
53+
<AutoGen>True</AutoGen>
54+
<DependentUpon>StaticStrings.resx</DependentUpon>
55+
</Compile>
56+
<Compile Update="Resources\Strings.Designer.cs">
57+
<DesignTime>True</DesignTime>
58+
<AutoGen>True</AutoGen>
59+
<DependentUpon>Strings.resx</DependentUpon>
60+
</Compile>
61+
</ItemGroup>
62+
63+
<ItemGroup>
64+
<EmbeddedResource Update="Resources\StaticStrings.resx">
65+
<Generator>PublicResXFileCodeGenerator</Generator>
66+
<LastGenOutput>StaticStrings.Designer.cs</LastGenOutput>
67+
</EmbeddedResource>
68+
<EmbeddedResource Update="Resources\Strings.resx">
69+
<Generator>PublicResXFileCodeGenerator</Generator>
70+
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
71+
</EmbeddedResource>
72+
</ItemGroup>
73+
5074
</Project>

‎Source/NETworkManager.Localization/Resources/Strings.Designer.cs‎

Lines changed: 32 additions & 51 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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="About" xml:space="preserve">
121121
<value>About</value>
@@ -2883,4 +2883,7 @@ $$hostname$$ --&gt; Hostname</value>
28832883
<data name="PrivateKeyFile" xml:space="preserve">
28842884
<value>Private key file</value>
28852885
</data>
2886+
<data name="Preview" xml:space="preserve">
2887+
<value>Preview</value>
2888+
</data>
28862889
</root>

‎Source/NETworkManager.Models/NETworkManager.Models.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.0.0" />
2727
<PackageReference Include="MahApps.Metro" Version="2.2.0" />
2828
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.4.0" />
29-
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
30-
<!--<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />-->
29+
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
3130
<PackageReference Include="Microsoft.Web.WebView2" Version="0.9.579-prerelease" />
3231
<PackageReference Include="Microsoft.Windows.SDK.NET" Version="10.0.18362.3-preview" />
32+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
3333
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3434
</ItemGroup>
3535

‎Source/NETworkManager.Settings/ConfigurationInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
1818
public string ApplicationFullName { get; set; }
1919
public string ApplicationName { get; set; }
2020
public bool IsPortable { get; set; }
21+
public bool IsPreview { get; set; }
2122
public Version OSVersion { get; set; }
2223

2324
// Everything below will be set dynamically in the application

‎Source/NETworkManager.Settings/ConfigurationManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ static ConfigurationManager()
1919
ApplicationFullName = Path.Combine(AssemblyManager.Current.Location, AssemblyManager.Current.Name + ".exe"),
2020
ApplicationName = AssemblyManager.Current.Name,
2121
OSVersion = System.Environment.OSVersion.Version,
22-
IsPortable = File.Exists(Path.Combine(AssemblyManager.Current.Location, $"{IsPortableFileName}.{IsPortableExtension}"))
22+
IsPortable = File.Exists(Path.Combine(AssemblyManager.Current.Location, $"{IsPortableFileName}.{IsPortableExtension}")),
23+
IsPreview = File.Exists(Path.Combine(AssemblyManager.Current.Location, "IsPreview.settings"))
2324
};
2425
}
2526
}

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<StackPanel Orientation="Horizontal">
6969
<Grid Background="{DynamicResource MahApps.Brushes.Gray8}" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsAdmin, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
7070
<TextBlock Text="Administrator" Foreground="{DynamicResource MahApps.Brushes.Gray3}" Style="{StaticResource CenterTextBlock}" Margin="10,0"/>
71-
</Grid>
71+
</Grid>
7272
</StackPanel>
7373
</mahAppsControls:WindowCommands>
7474
</mahAppsControls:MetroWindow.LeftWindowCommands>

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
2929
<PackageReference Include="Microsoft.Web.WebView2" Version="0.9.579-prerelease" />
3030
<PackageReference Include="Microsoft.Windows.SDK.NET" Version="10.0.18362.3-preview" />
31+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
3132
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
3233
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3334
<Reference Include="AxMSTSCLib">

‎Source/NETworkManager/Views/AboutView.xaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
xmlns:documentation="clr-namespace:NETworkManager.Documentation;assembly=NETworkManager.Documentation"
99
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
1010
xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
11+
xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
1112
xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
1213
xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
1314
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:AboutViewModel}">
@@ -41,6 +42,7 @@
4142
<StackPanel Orientation="Horizontal" Margin="0,0,0,5">
4243
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" VerticalAlignment="Center" />
4344
<TextBlock Text="{Binding Patch}" Style="{StaticResource DefaultTextBlock}" Visibility="{Binding IsPatchVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" VerticalAlignment="Center" Margin="5,0,0,0" />
45+
<TextBlock Text="{x:Static localization:Strings.Preview}" Style="{StaticResource DefaultTextBlock}" Padding="5" Background="{DynamicResource MahApps.Brushes.Gray8}" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsPreview, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" VerticalAlignment="Center" Margin="5,0,0,0" />
4446
</StackPanel>
4547
<TextBlock Text="{x:Static resources:Resources.NETworkManager_License}" Style="{StaticResource LinkTextBlock}" Margin="0,0,0,5">
4648
<TextBlock.InputBindings>

0 commit comments

Comments
 (0)