Skip to content

Commit a3880e5

Browse files
BornToBeRootBornToBeRoot
authored
Fix ToolTip background, WiFi autorefresh moved to top (#421)
* Close #279 - Add translator * Close #414 - Add application to title if tab is dragged out * Move auto refresh to the top * Fix ToolTip background * Fix ToolTip background Co-authored-by: BornToBeRoot <[email protected]>
1 parent 7c31711 commit a3880e5

File tree

4 files changed

+26
-31
lines changed

4 files changed

+26
-31
lines changed

‎Source/NETworkManager/Controls/LvlChartsBandwidthTooltip.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<converters:LvlChartsHeaderConverter x:Key="LvlChartsHeaderConverter" />
1212
<converters:LvlChartsBandwidthValueConverter x:Key="LvlChartsBandwidthValueConverter" />
1313
</UserControl.Resources>
14-
<Grid Background="{DynamicResource WhiteColorBrush}" >
14+
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}">
1515
<StackPanel Margin="10">
1616
<TextBlock Style="{StaticResource HeaderTextBlock}">
1717
<TextBlock.Text>

‎Source/NETworkManager/Controls/LvlChartsPingTimeTooltip.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<converters:LvlChartsHeaderConverter x:Key="LvlChartsHeaderConverter" />
1212
<converters:LvlChartsPingTimeValueConverter x:Key="LvlChartsPingTimeValueConverter" />
1313
</UserControl.Resources>
14-
<Grid Background="{DynamicResource WhiteColorBrush}" >
14+
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}">
1515
<StackPanel Margin="10">
1616
<TextBlock Style="{StaticResource HeaderTextBlock}">
1717
<TextBlock.Text>

‎Source/NETworkManager/Controls/LvlChartsWiFiChannelTooltip.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<converters:LvlChartsHeaderConverter x:Key="LvlChartsHeaderConverter" />
1212
<converters:WiFiDBMReverseConverter x:Key="WiFiDBMReverseConverter" />
1313
</UserControl.Resources>
14-
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}" >
14+
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}">
1515
<StackPanel Margin="10">
1616
<TextBlock Style="{StaticResource HeaderTextBlock}">
1717
<TextBlock.Text>

‎Source/NETworkManager/Views/WiFiView.xaml‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,28 @@
147147
<ColumnDefinition Width="Auto" />
148148
<ColumnDefinition Width="10" />
149149
<ColumnDefinition Width="Auto" />
150-
</Grid.ColumnDefinitions>
151-
<TextBlock Grid.Column="0" Text="{x:Static localization:Strings.Networks}" Style="{StaticResource HeaderTextBlock}" Margin="0,0,0,0" />
152-
<CheckBox Grid.Column="4" Content="{x:Static localization:Strings.GHz2dot4}" IsChecked="{Binding Show2dot4GHzNetworks}" />
153-
<CheckBox Grid.Column="6" Content="{x:Static localization:Strings.GHz5}" IsChecked="{Binding Show5GHzNetworks}" />
154-
<TextBox x:Name="TextBoxSearch" Grid.Column="8" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
150+
</Grid.ColumnDefinitions>
151+
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Networks}" Style="{StaticResource HeaderTextBlock}" Margin="0,0,0,0" />
152+
<WrapPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
153+
<CheckBox IsChecked="{Binding AutoRefresh}" Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}" Margin="0,0,10,0"/>
154+
<ComboBox ItemsSource="{Binding AutoRefreshTimes}" SelectedItem="{Binding SelectedAutoRefreshTime}" MinWidth="150">
155+
<ComboBox.ItemTemplate>
156+
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
157+
<TextBlock>
158+
<TextBlock.Text>
159+
<MultiBinding StringFormat="{}{0} {1}">
160+
<Binding Path="Value" />
161+
<Binding Path="TimeUnit" Converter="{StaticResource AutoRefreshTimeToStringConverter}" />
162+
</MultiBinding>
163+
</TextBlock.Text>
164+
</TextBlock>
165+
</DataTemplate>
166+
</ComboBox.ItemTemplate>
167+
</ComboBox>
168+
</WrapPanel>
169+
<CheckBox Grid.Column="4" Grid.Row="0" Content="{x:Static localization:Strings.GHz2dot4}" IsChecked="{Binding Show2dot4GHzNetworks}" />
170+
<CheckBox Grid.Column="6" Grid.Row="0" Content="{x:Static localization:Strings.GHz5}" IsChecked="{Binding Show5GHzNetworks}" />
171+
<TextBox x:Name="TextBoxSearch" Grid.Column="8" Grid.Row="0" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
155172
</Grid>
156173
<ListView Grid.Row="2" Visibility="{Binding IsNetworksLoading, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" ScrollViewer.PanningMode="VerticalOnly" ItemsSource="{Binding NetworksView}" SelectedItem="{Binding SelectedNetwork}" Background="Transparent" BorderThickness="0" SelectionMode="Single">
157174
<ListView.Resources>
@@ -355,29 +372,7 @@
355372
<TextBlock Text="{x:Static localization:Strings.SearchingForNetworksDots}" Style="{StaticResource MessageTextBlock}" />
356373
</StackPanel>
357374
<Grid Grid.Row="4">
358-
<Grid.ColumnDefinitions>
359-
<ColumnDefinition Width="*" />
360-
<ColumnDefinition Width="10" />
361-
<ColumnDefinition Width="Auto" />
362-
</Grid.ColumnDefinitions>
363-
<WrapPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
364-
<CheckBox IsChecked="{Binding AutoRefresh}" Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}" Margin="0,0,10,0"/>
365-
<ComboBox ItemsSource="{Binding AutoRefreshTimes}" SelectedItem="{Binding SelectedAutoRefreshTime}" MinWidth="150">
366-
<ComboBox.ItemTemplate>
367-
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
368-
<TextBlock>
369-
<TextBlock.Text>
370-
<MultiBinding StringFormat="{}{0} {1}">
371-
<Binding Path="Value" />
372-
<Binding Path="TimeUnit" Converter="{StaticResource AutoRefreshTimeToStringConverter}" />
373-
</MultiBinding>
374-
</TextBlock.Text>
375-
</TextBlock>
376-
</DataTemplate>
377-
</ComboBox.ItemTemplate>
378-
</ComboBox>
379-
</WrapPanel>
380-
<Button Grid.Column="2" Command="{Binding ScanNetworksCommand}" VerticalAlignment="Bottom" HorizontalAlignment="Right">
375+
<Button Grid.Column="0" Grid.Row="0" Command="{Binding ScanNetworksCommand}" VerticalAlignment="Bottom" HorizontalAlignment="Right">
381376
<Button.Style>
382377
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
383378
<Style.Triggers>

0 commit comments

Comments
 (0)