Skip to content

Commit

Permalink
Release version 1.3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@BornToBeRoot
BornToBeRoot committed Nov 3, 2017
1 parent 0d58188 commit 153bd87
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 48 deletions.
Binary file removed Documentation/Images/NETworkManager_v1.2.0.0.gif
View file
Binary file not shown.
Binary file added Documentation/Images/NETworkManager_v1.3.0.0.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Images/Remote-Desktop.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions Source/NETworkManager/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,7 @@
<Border Grid.Row="1" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource GrayBrush8}">
<StatusBar Foreground="{DynamicResource GrayBrush3}">
<StatusBarItem>
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource GrayBrush3}" FontWeight="Bold" />
<TextBlock Text="BETA" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource AccentColorBrush}" Margin="10,0,0,0" />
</StackPanel>
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource GrayBrush3}" FontWeight="Bold" />
</StatusBarItem>
</StatusBar>
</Border>
Expand Down
4 changes: 2 additions & 2 deletions Source/NETworkManager/Views/Applications/PortScannerView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<RowDefinition Height="10" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_Destination}" />
<TextBlock Grid.Column="0" Grid.Row="0" DataContext="{DynamicResource String_Destination}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
<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}">
<ComboBox.Text>
<Binding Path="HostnameOrIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
Expand All @@ -66,7 +66,7 @@
</Binding>
</ComboBox.Text>
</ComboBox>
<TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_Ports}" />
<TextBlock Grid.Column="0" Grid.Row="2" DataContext="{DynamicResource String_Ports}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
<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}">
<ComboBox.Text>
<Binding Path="Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
Expand Down
75 changes: 39 additions & 36 deletions Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,18 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="200" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="10" />
<RowDefinition Height="Auto" />
<RowDefinition Height="10" />
<RowDefinition Height="Auto" />
<RowDefinition Height="10" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_MACAddress}" />
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" DataContext="{DynamicResource String_MACAddress}" Text="{Binding Path=., StringFormat={}{0}:}" />
<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}">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
Expand All @@ -56,7 +58,7 @@
</Binding>
</TextBox.Text>
</TextBox>
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Broadcast}" Style="{StaticResource CenterTextBlock}" />
<TextBlock Grid.Column="0" Grid.Row="2" DataContext="{DynamicResource String_Broadcast}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
<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}">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
Expand All @@ -70,7 +72,7 @@
</Binding>
</TextBox.Text>
</TextBox>
<TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_Port}" Style="{StaticResource CenterTextBlock}" />
<TextBlock Grid.Column="0" Grid.Row="4" DataContext="{DynamicResource String_Port}" Text="{Binding Path=., StringFormat={}{0}:}" Style="{StaticResource CenterTextBlock}" />
<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}">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
Expand All @@ -84,39 +86,40 @@
</Binding>
</TextBox.Text>
</TextBox>
<Button Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Command="{Binding WakeUpCommand}">
<Button.Content>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconMaterial Kind=Power}" />
</Rectangle.OpacityMask>
</Rectangle>
<TextBlock Grid.Column="1" Text="{DynamicResource String_Button_WakeUp}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
</Grid>
</Button.Content>
<Button.Style>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}" >
<Setter Property="IsEnabled" Value="False" />
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtMACAddress}" Value="False"/>
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtBroadcast}" Value="False"/>
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtPort}" Value="False"/>
</MultiDataTrigger.Conditions>
<Setter Property="IsEnabled" Value="True" />
</MultiDataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
</Grid>
<Button Grid.Row="2" HorizontalAlignment="Right" Command="{Binding WakeUpCommand}">
<Button.Content>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
<Rectangle.OpacityMask>
<VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconMaterial Kind=Power}" />
</Rectangle.OpacityMask>
</Rectangle>
<TextBlock Grid.Column="1" Text="{DynamicResource String_Button_WakeUp}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
</Grid>
</Button.Content>
<Button.Style>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}" >
<Setter Property="IsEnabled" Value="False" />
<Style.Triggers>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtMACAddress}" Value="False"/>
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtBroadcast}" Value="False"/>
<Condition Binding="{Binding Path=(Validation.HasError), ElementName=txtPort}" Value="False"/>
</MultiDataTrigger.Conditions>
<Setter Property="IsEnabled" Value="True" />
</MultiDataTrigger>
</Style.Triggers>
</Style>
</Button.Style>
</Button>
<TextBlock Grid.Row="3" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />

<TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
</Grid>
<Border Grid.Column="1" Grid.Row="0" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource GrayBrush8}">
<Expander x:Name="expanderProfiles" Header="{DynamicResource String_Header_Clients}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandClientView}">
Expand Down
5 changes: 1 addition & 4 deletions Source/NETworkManager/Views/Settings/AboutView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
<StackPanel Grid.Column="1" Margin="20,0,0,0">
<TextBlock FontSize="32" Grid.Row="0" Text="{DynamicResource String_ProductName}" Style="{StaticResource HeaderTextBlock}" />
<TextBlock Text="{DynamicResource String_Slogan}" Style="{DynamicResource WrapTextBlock}" Margin="0,0,0,5" />
<StackPanel Orientation="Horizontal" Margin="0,0,0,5">
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" />
<TextBlock Text="BETA" Style="{StaticResource DefaultTextBlock}" Foreground="{DynamicResource AccentColorBrush}" Margin="10,0" />
</StackPanel>
<TextBlock Text="{Binding Version}" Style="{StaticResource DefaultTextBlock}" FontWeight="Bold" Margin="0,0,0,5"/>
<TextBlock Text="{Binding CopyrightAndAuthor}" Style="{StaticResource DefaultTextBlock}" Margin="0,0,0,5"/>
<TextBlock Text="{x:Static Resources:Resources.License_GNUGPLv3 }" Style="{StaticResource LinkTextBlock}">
<TextBlock.InputBindings>
Expand Down
4 changes: 2 additions & 2 deletions Source/NETworkManager/Views/Settings/SettingsView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@
</ScrollViewer>
</Grid>
</TabItem>
<TabItem Header="{DynamicResource String_Header_Update}">
<!--<TabItem Header="{DynamicResource String_Header_Update}">
<SettingsViews:UpdateView Margin="10" />
</TabItem>
</TabItem>-->
<!-- About -->
<TabItem Header="{DynamicResource String_Header_About}">
<SettingsViews:AboutView Margin="10" />
Expand Down

0 comments on commit 153bd87

Please sign in to comment.