Skip to content

Commit acde850

Browse files
committed
Chore: Refactoring & Cleanup & Docs
1 parent 161c695 commit acde850

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

Source/NETworkManager/Views/IPScannerView.xaml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,16 @@
5858
<ColumnDefinition Width="10" />
5959
<ColumnDefinition Width="Auto" />
6060
</Grid.ColumnDefinitions>
61-
<TextBlock Grid.Column="0" Text="{x:Static Member=localization:Strings.Host}" Style="{DynamicResource ResourceKey=DefaultTextBlock}" VerticalAlignment="Center" />
62-
<ComboBox Grid.Column="2" x:Name="ComboBoxHosts" ItemsSource="{Binding Path=HostsHistoryView}" mah:TextBoxHelper.Watermark="{x:Static Member=localization:StaticStrings.ExampleHostRange}" IsEnabled="{Binding Path=IsRunning, Converter={StaticResource ResourceKey=BooleanReverseConverter}}" Style="{StaticResource ResourceKey=HistoryComboBox}">
61+
<TextBlock Grid.Column="0" Grid.Row="0"
62+
Text="{x:Static Member=localization:Strings.Host}"
63+
Style="{DynamicResource ResourceKey=DefaultTextBlock}"
64+
VerticalAlignment="Center" />
65+
<ComboBox Grid.Column="2" Grid.Row="0"
66+
x:Name="ComboBoxHosts"
67+
ItemsSource="{Binding Path=HostsHistoryView}"
68+
mah:TextBoxHelper.Watermark="{x:Static Member=localization:StaticStrings.ExampleHostRange}"
69+
IsReadOnly="{Binding Path=IsRunning}"
70+
Style="{StaticResource ResourceKey=HistoryComboBox}">
6371
<ComboBox.Text>
6472
<Binding Path="Hosts" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
6573
<Binding.ValidationRules>
@@ -88,7 +96,10 @@
8896
</Rectangle.OpacityMask>
8997
</Rectangle>
9098
</Button>
91-
<Button Grid.Column="6" Command="{Binding ScanCommand}" IsDefault="{Binding IsRunning, Converter={StaticResource BooleanReverseConverter}}" IsCancel="{Binding IsRunning}">
99+
<Button Grid.Column="6"
100+
Command="{Binding ScanCommand}"
101+
IsDefault="{Binding IsRunning, Converter={StaticResource BooleanReverseConverter}}"
102+
IsCancel="{Binding IsRunning}">
92103
<Button.Resources>
93104
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
94105
<Setter Property="IsEnabled" Value="True" />

docs/Changelog/next-release.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ New Feature
2323

2424
## Breaking Changes
2525

26+
- Settings will be reset to default values due to refactoring [#2483](https://github.com/BornToBeRoot/NETworkManager/pull/2483){:target="\_blank"}
2627
- Profiles and settings migration (indroduced in `2023.3.7.0`) from `%AppData%\NETworkManager` to `%UserProfile%\Documents\NETworkManager` removed. If you use a version before `2023.3.7.0` you have to install and start version `2023.6.27.1` before you install this version. [#2380](https://github.com/BornToBeRoot/NETworkManager/pull/2380){:target="\_blank"}
2728
- Remove profile migration script to migrate from `2021.11.30.0` and before to a later version [#2388](https://github.com/BornToBeRoot/NETworkManager/pull/2388){:target="\_blank"}
2829

@@ -58,6 +59,7 @@ New Feature
5859
- Copy & Export time fixed (format is now `yyyy-MM-dd HH:mm:ss.fff`) [#2483](https://github.com/BornToBeRoot/NETworkManager/pull/2483){:target="\_blank"}
5960
- Profiles
6061
- Prevent the application from crashing if a profile file cannot be loaded (profile management is then blocked) [#2464](https://github.com/BornToBeRoot/NETworkManager/pull/2464){:target="\_blank"}
62+
- Fix some focus issues when the enter key is pressed [#2483](https://github.com/BornToBeRoot/NETworkManager/pull/2483){:target="\_blank"}
6163

6264
## Other
6365

0 commit comments

Comments
 (0)