Skip to content

Commit 095656e

Browse files
BornToBeRootBornToBeRoot
committed
Update
1 parent 1547a2a commit 095656e

8 files changed

Lines changed: 12622 additions & 268 deletions

File tree

‎Source/NETworkManager.Setup/NETworkManager.Setup.vdproj‎

Lines changed: 12598 additions & 251 deletions
Large diffs are not rendered by default.

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,6 @@
6565
<mahAppsControls:MetroWindow.RightWindowCommands>
6666
<mahAppsControls:WindowCommands>
6767
<StackPanel Orientation="Horizontal">
68-
<ComboBox ItemsSource="{Binding ProfileFiles}" SelectedItem="{Binding SelectedProfileFile}" DisplayMemberPath="Name" Foreground="{DynamicResource AccentColorBrush}" BorderThickness="0" MinWidth="100" HorizontalAlignment="Left" Margin="0,0,10,0" />
69-
<Button Command="{Binding OpenWebsiteCommand}" Opacity="1" Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" CommandParameter="{x:Static resources:Resources.NETworkManager_LatestReleaseURL}" Cursor="Hand">
70-
<StackPanel Orientation="Horizontal">
71-
<Rectangle Width="20" Height="20" Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
72-
<Rectangle.OpacityMask>
73-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Octicons Kind=DesktopDownload}" />
74-
</Rectangle.OpacityMask>
75-
</Rectangle>
76-
<TextBlock Text="{Binding UpdateText}" VerticalAlignment="Center" Margin="5,0,0,0" />
77-
</StackPanel>
78-
</Button>
7968
<Button Command="{Binding OpenWebsiteCommand}" Opacity="1" Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" CommandParameter="{x:Static resources:Resources.NETworkManager_LatestReleaseURL}" Cursor="Hand">
8069
<StackPanel Orientation="Horizontal">
8170
<Rectangle Width="20" Height="20" Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
@@ -86,6 +75,7 @@
8675
<TextBlock Text="{Binding UpdateText}" VerticalAlignment="Center" Margin="5,0,0,0" />
8776
</StackPanel>
8877
</Button>
78+
<ComboBox ItemsSource="{Binding ProfileFiles}" SelectedItem="{Binding SelectedProfileFile}" DisplayMemberPath="Name" Foreground="{DynamicResource AccentColorBrush}" BorderThickness="0" MinWidth="100" HorizontalAlignment="Left" Margin="0,0,10,0" />
8979
<Button Command="{Binding OpenWebsiteCommand}" ToolTip="{x:Static localization:Strings.StarForkTheProjectOnGitHub}" CommandParameter="{x:Static resources:Resources.NETworkManager_ProjectUrl}" Cursor="Hand">
9080
<StackPanel Orientation="Horizontal">
9181
<Rectangle Width="20" Height="20" Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">

‎Source/NETworkManager/Models/Update/Updater.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void Check()
4848

4949
var latestVersion = new Version(client.Repository.Release.GetLatest(Properties.Resources.NETworkManager_GitHub_User, Properties.Resources.NETworkManager_GitHub_Repo).Result.TagName.TrimStart('v'));
5050

51-
// Compare versions (tag=v2.0.1, version=2.0.1)
51+
// Compare versions (tag=v2019.12.0, version=2019.12.0)
5252
if (latestVersion > AssemblyManager.Current.Version)
5353
OnUpdateAvailable(new UpdateAvailableArgs(latestVersion));
5454
else

‎Source/NETworkManager/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
5050
// übernehmen, indem Sie "*" eingeben:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("2.0.0.0")]
53-
[assembly: AssemblyFileVersion("2.0.0.0")]
52+
[assembly: AssemblyVersion("2019.12.0.0")]
53+
[assembly: AssemblyFileVersion("2019.12.0.0")]
5454

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

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

‎Source/NETworkManager/Resources/Localization/Strings.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2526,4 +2526,7 @@ URL: https://github.com/BornToBeRoot/NETworkManager/tree/master/Documentation</v
25262526
<data name="ResetProfilesMessage" xml:space="preserve">
25272527
<value>All profiles in this profile file will be permanently deleted!</value>
25282528
</data>
2529+
<data name="Patch" xml:space="preserve">
2530+
<value>Patch</value>
2531+
</data>
25292532
</root>

‎Source/NETworkManager/ViewModels/AboutViewModel.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ namespace NETworkManager.ViewModels
1414
public class AboutViewModel : ViewModelBase
1515
{
1616
#region Variables
17-
public string Version => $"{Strings.Version} {AssemblyManager.Current.Version.Major}.{AssemblyManager.Current.Version.Minor}.{AssemblyManager.Current.Version.Build}-Pre002";
17+
public string Version => $"{Strings.Version} {AssemblyManager.Current.Version.Major}.{AssemblyManager.Current.Version.Minor}";
18+
public string Patch => $"{Strings.Patch} {AssemblyManager.Current.Version.Build}";
19+
public bool IsPatchVisible => AssemblyManager.Current.Version.Build > 0;
1820

1921
private bool _isUpdateCheckRunning;
2022
public bool IsUpdateCheckRunning

‎Source/NETworkManager/Views/AboutView.xaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
<StackPanel Grid.Column="1" Margin="20,0,0,0">
3939
<TextBlock FontSize="32" Text="{x:Static resources:Resources.NETworkManager_ProjectName}" Style="{StaticResource HeaderTextBlock}" />
4040
<TextBlock Text="{x:Static localization:Strings.Slogan}" Style="{DynamicResource WrapTextBlock}" Margin="0,0,0,5" />
41-
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" Margin="0,0,0,5" />
41+
<StackPanel Orientation="Horizontal" Margin="0,0,0,5">
42+
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" VerticalAlignment="Center" />
43+
<TextBlock Text="{Binding Patch}" Style="{StaticResource DefaultTextBlock}" Visibility="{Binding IsPatchVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" VerticalAlignment="Center" Margin="5,0,0,0" />
44+
</StackPanel>
4245
<TextBlock Text="{x:Static resources:Resources.NETworkManager_License}" Style="{StaticResource LinkTextBlock}" Margin="0,0,0,5">
4346
<TextBlock.InputBindings>
4447
<MouseBinding Command="{Binding OpenWebsiteCommand}" CommandParameter="{x:Static resources:Resources.NETworkManager_LicenseUrl}" MouseAction="LeftClick" />
@@ -100,7 +103,7 @@
100103
</Style.Triggers>
101104
</Style>
102105
</Rectangle.Style>
103-
</Rectangle>
106+
</Rectangle>
104107
</Button>
105108
<Button ToolTip="{x:Static localization:Strings.ToolTip_TransifexProjectUrl}" Command="{Binding OpenWebsiteCommand}" CommandParameter="{x:Static resources:Resources.NETworkManager_TranslationUrl}" Margin="10,0,0,0">
106109
<Rectangle Width="24" Height="24" >

0 commit comments

Comments
 (0)