Skip to content

Commit 153bd87

Browse files
BornToBeRootBornToBeRoot
committed
Release version 1.3.0.0
1 parent 0d58188 commit 153bd87

File tree

8 files changed

+45
-48
lines changed

8 files changed

+45
-48
lines changed

‎Documentation/Images/NETworkManager_v1.2.0.0.gif‎

-642 KB
Binary file not shown.

‎Documentation/Images/NETworkManager_v1.3.0.0.gif‎

283 KB
Loading

‎Documentation/Images/Remote-Desktop.png‎

294 KB
Loading

‎Source/NETworkManager/MainWindow.xaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,7 @@
594594
<Border Grid.Row="1" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource GrayBrush8}">
595595
<StatusBar Foreground="{DynamicResource GrayBrush3}">
596596
<StatusBarItem>
597-
<StackPanel Orientation="Horizontal">
598-
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource GrayBrush3}" FontWeight="Bold" />
599-
<TextBlock Text="BETA" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource AccentColorBrush}" Margin="10,0,0,0" />
600-
</StackPanel>
597+
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource GrayBrush3}" FontWeight="Bold" />
601598
</StatusBarItem>
602599
</StatusBar>
603600
</Border>

‎Source/NETworkManager/Views/Applications/PortScannerView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<RowDefinition Height="10" />
5757
<RowDefinition Height="Auto" />
5858
</Grid.RowDefinitions>
59-
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_Destination}" />
59+
<TextBlock Grid.Column="0" Grid.Row="0" DataContext="{DynamicResource String_Destination}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
6060
<ComboBox Grid.Column="2" Grid.Row="0" x:Name="cbHostnameOrIPAddress" ItemsSource="{Binding HostnameOrIPAddressHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostnameAndOrIPAddress}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
6161
<ComboBox.Text>
6262
<Binding Path="HostnameOrIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -66,7 +66,7 @@
6666
</Binding>
6767
</ComboBox.Text>
6868
</ComboBox>
69-
<TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_Ports}" />
69+
<TextBlock Grid.Column="0" Grid.Row="2" DataContext="{DynamicResource String_Ports}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
7070
<ComboBox Grid.Column="2" Grid.Row="2" x:Name="cbPorts" ItemsSource="{Binding PortsHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EamplePortScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
7171
<ComboBox.Text>
7272
<Binding Path="Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">

‎Source/NETworkManager/Views/Applications/WakeOnLANView.xaml‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,18 @@
3333
<Grid.ColumnDefinitions>
3434
<ColumnDefinition Width="Auto" />
3535
<ColumnDefinition Width="10" />
36-
<ColumnDefinition Width="*" />
36+
<ColumnDefinition Width="200" />
3737
</Grid.ColumnDefinitions>
3838
<Grid.RowDefinitions>
3939
<RowDefinition Height="Auto" />
4040
<RowDefinition Height="10" />
4141
<RowDefinition Height="Auto" />
4242
<RowDefinition Height="10" />
4343
<RowDefinition Height="Auto" />
44+
<RowDefinition Height="10" />
45+
<RowDefinition Height="Auto" />
4446
</Grid.RowDefinitions>
45-
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_MACAddress}" />
47+
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" DataContext="{DynamicResource String_MACAddress}" Text="{Binding Path=., StringFormat={}{0}:}" />
4648
<TextBox Grid.Column="2" Grid.Row="0" x:Name="txtMACAddress" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleMACAddress}" Style="{StaticResource DefaultTextBox}">
4749
<TextBox.InputBindings>
4850
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
@@ -56,7 +58,7 @@
5658
</Binding>
5759
</TextBox.Text>
5860
</TextBox>
59-
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Broadcast}" Style="{StaticResource CenterTextBlock}" />
61+
<TextBlock Grid.Column="0" Grid.Row="2" DataContext="{DynamicResource String_Broadcast}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
6062
<TextBox x:Name="txtBroadcast" Grid.Column="2" Grid.Row="2" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding BroadcastHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPv4Broadcast}" Style="{StaticResource DefaultTextBox}">
6163
<TextBox.InputBindings>
6264
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
@@ -70,7 +72,7 @@
7072
</Binding>
7173
</TextBox.Text>
7274
</TextBox>
73-
<TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_Port}" Style="{StaticResource CenterTextBlock}" />
75+
<TextBlock Grid.Column="0" Grid.Row="4" DataContext="{DynamicResource String_Port}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
7476
<TextBox x:Name="txtPort" Grid.Column="2" Grid.Row="4" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExamplePort}" Style="{StaticResource DefaultTextBox}" HorizontalAlignment="Left" Width="65" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
7577
<TextBox.InputBindings>
7678
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
@@ -84,39 +86,40 @@
8486
</Binding>
8587
</TextBox.Text>
8688
</TextBox>
89+
<Button Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Command="{Binding WakeUpCommand}">
90+
<Button.Content>
91+
<Grid>
92+
<Grid.ColumnDefinitions>
93+
<ColumnDefinition Width="Auto" />
94+
<ColumnDefinition Width="*" />
95+
</Grid.ColumnDefinitions>
96+
<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
97+
<Rectangle.OpacityMask>
98+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconMaterial Kind=Power}" />
99+
</Rectangle.OpacityMask>
100+
</Rectangle>
101+
<TextBlock Grid.Column="1" Text="{DynamicResource String_Button_WakeUp}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
102+
</Grid>
103+
</Button.Content>
104+
<Button.Style>
105+
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}" >
106+
<Setter Property="IsEnabled" Value="False" />
107+
<Style.Triggers>
108+
<MultiDataTrigger>
109+
<MultiDataTrigger.Conditions>
110+
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtMACAddress}" Value="False"/>
111+
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtBroadcast}" Value="False"/>
112+
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtPort}" Value="False"/>
113+
</MultiDataTrigger.Conditions>
114+
<Setter Property="IsEnabled" Value="True" />
115+
</MultiDataTrigger>
116+
</Style.Triggers>
117+
</Style>
118+
</Button.Style>
119+
</Button>
87120
</Grid>
88-
<Button Grid.Row="2" HorizontalAlignment="Right" Command="{Binding WakeUpCommand}">
89-
<Button.Content>
90-
<Grid>
91-
<Grid.ColumnDefinitions>
92-
<ColumnDefinition Width="Auto" />
93-
<ColumnDefinition Width="*" />
94-
</Grid.ColumnDefinitions>
95-
<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
96-
<Rectangle.OpacityMask>
97-
<VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconMaterial Kind=Power}" />
98-
</Rectangle.OpacityMask>
99-
</Rectangle>
100-
<TextBlock Grid.Column="1" Text="{DynamicResource String_Button_WakeUp}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
101-
</Grid>
102-
</Button.Content>
103-
<Button.Style>
104-
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}" >
105-
<Setter Property="IsEnabled" Value="False" />
106-
<Style.Triggers>
107-
<MultiDataTrigger>
108-
<MultiDataTrigger.Conditions>
109-
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtMACAddress}" Value="False"/>
110-
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtBroadcast}" Value="False"/>
111-
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtPort}" Value="False"/>
112-
</MultiDataTrigger.Conditions>
113-
<Setter Property="IsEnabled" Value="True" />
114-
</MultiDataTrigger>
115-
</Style.Triggers>
116-
</Style>
117-
</Button.Style>
118-
</Button>
119-
<TextBlock Grid.Row="3" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
121+
122+
<TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
120123
</Grid>
121124
<Border Grid.Column="1" Grid.Row="0" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource GrayBrush8}">
122125
<Expander x:Name="expanderProfiles" Header="{DynamicResource String_Header_Clients}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandClientView}">

‎Source/NETworkManager/Views/Settings/AboutView.xaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
<StackPanel Grid.Column="1" Margin="20,0,0,0">
2121
<TextBlock FontSize="32" Grid.Row="0" Text="{DynamicResource String_ProductName}" Style="{StaticResource HeaderTextBlock}" />
2222
<TextBlock Text="{DynamicResource String_Slogan}" Style="{DynamicResource WrapTextBlock}" Margin="0,0,0,5" />
23-
<StackPanel Orientation="Horizontal" Margin="0,0,0,5">
24-
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" />
25-
<TextBlock Text="BETA" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource AccentColorBrush}" Margin="10,0" />
26-
</StackPanel>
23+
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" Margin="0,0,0,5"/>
2724
<TextBlock Text="{Binding CopyrightAndAuthor}" Style="{StaticResource DefaultTextBlock}" Margin="0,0,0,5"/>
2825
<TextBlock Text="{x:Static Resources:Resources.License_GNUGPLv3 }" Style="{StaticResource LinkTextBlock}">
2926
<TextBlock.InputBindings>

‎Source/NETworkManager/Views/Settings/SettingsView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@
120120
</ScrollViewer>
121121
</Grid>
122122
</TabItem>
123-
<TabItem Header="{DynamicResource String_Header_Update}">
123+
<!--<TabItem Header="{DynamicResource String_Header_Update}">
124124
<SettingsViews:UpdateView Margin="10" />
125-
</TabItem>
125+
</TabItem>-->
126126
<!-- About -->
127127
<TabItem Header="{DynamicResource String_Header_About}">
128128
<SettingsViews:AboutView Margin="10" />

0 commit comments

Comments
 (0)