Skip to content

Fix ToolTip background, WiFi autorefresh moved to top #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 28, 2020
Merged

Fix ToolTip background, WiFi autorefresh moved to top #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d62bb7b
Close #279 - Add translator
BornToBeRoot Dec 28, 2020
2de439d
Merge branch 'master' of https://github.com/BornToBeRoot/NETworkManag…
BornToBeRoot Dec 28, 2020
bbd722a
Close #414 - Add application to title if tab is dragged out
BornToBeRoot Dec 28, 2020
be5f70b
Merge branch 'master' of https://github.com/BornToBeRoot/NETworkManag…
BornToBeRoot Dec 28, 2020
fea34e2
Move auto refresh to the top
BornToBeRoot Dec 28, 2020
1ce584e
Fix ToolTip background
BornToBeRoot Dec 28, 2020
03779c4
Fix ToolTip background
BornToBeRoot Dec 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/NETworkManager/Controls/LvlChartsBandwidthTooltip.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<converters:LvlChartsHeaderConverter x:Key="LvlChartsHeaderConverter" />
<converters:LvlChartsBandwidthValueConverter x:Key="LvlChartsBandwidthValueConverter" />
</UserControl.Resources>
<Grid Background="{DynamicResource WhiteColorBrush}" >
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}">
<StackPanel Margin="10">
<TextBlock Style="{StaticResource HeaderTextBlock}">
<TextBlock.Text>
Expand Down
2 changes: 1 addition & 1 deletion Source/NETworkManager/Controls/LvlChartsPingTimeTooltip.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<converters:LvlChartsHeaderConverter x:Key="LvlChartsHeaderConverter" />
<converters:LvlChartsPingTimeValueConverter x:Key="LvlChartsPingTimeValueConverter" />
</UserControl.Resources>
<Grid Background="{DynamicResource WhiteColorBrush}" >
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}">
<StackPanel Margin="10">
<TextBlock Style="{StaticResource HeaderTextBlock}">
<TextBlock.Text>
Expand Down
2 changes: 1 addition & 1 deletion Source/NETworkManager/Controls/LvlChartsWiFiChannelTooltip.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<converters:LvlChartsHeaderConverter x:Key="LvlChartsHeaderConverter" />
<converters:WiFiDBMReverseConverter x:Key="WiFiDBMReverseConverter" />
</UserControl.Resources>
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}" >
<Grid Background="{DynamicResource MahApps.Brushes.Window.Background}">
<StackPanel Margin="10">
<TextBlock Style="{StaticResource HeaderTextBlock}">
<TextBlock.Text>
Expand Down
51 changes: 23 additions & 28 deletions Source/NETworkManager/Views/WiFiView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,28 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{x:Static localization:Strings.Networks}" Style="{StaticResource HeaderTextBlock}" Margin="0,0,0,0" />
<CheckBox Grid.Column="4" Content="{x:Static localization:Strings.GHz2dot4}" IsChecked="{Binding Show2dot4GHzNetworks}" />
<CheckBox Grid.Column="6" Content="{x:Static localization:Strings.GHz5}" IsChecked="{Binding Show5GHzNetworks}" />
<TextBox x:Name="TextBoxSearch" Grid.Column="8" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Networks}" Style="{StaticResource HeaderTextBlock}" Margin="0,0,0,0" />
<WrapPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">
<CheckBox IsChecked="{Binding AutoRefresh}" Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}" Margin="0,0,10,0"/>
<ComboBox ItemsSource="{Binding AutoRefreshTimes}" SelectedItem="{Binding SelectedAutoRefreshTime}" MinWidth="150">
<ComboBox.ItemTemplate>
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
<TextBlock>
<TextBlock.Text>
<MultiBinding StringFormat="{}{0} {1}">
<Binding Path="Value" />
<Binding Path="TimeUnit" Converter="{StaticResource AutoRefreshTimeToStringConverter}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</WrapPanel>
<CheckBox Grid.Column="4" Grid.Row="0" Content="{x:Static localization:Strings.GHz2dot4}" IsChecked="{Binding Show2dot4GHzNetworks}" />
<CheckBox Grid.Column="6" Grid.Row="0" Content="{x:Static localization:Strings.GHz5}" IsChecked="{Binding Show5GHzNetworks}" />
<TextBox x:Name="TextBoxSearch" Grid.Column="8" Grid.Row="0" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
</Grid>
<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">
<ListView.Resources>
Expand Down Expand Up @@ -355,29 +372,7 @@
<TextBlock Text="{x:Static localization:Strings.SearchingForNetworksDots}" Style="{StaticResource MessageTextBlock}" />
</StackPanel>
<Grid Grid.Row="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<WrapPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
<CheckBox IsChecked="{Binding AutoRefresh}" Content="{x:Static localization:Strings.AutomaticallyUpdateEvery}" Margin="0,0,10,0"/>
<ComboBox ItemsSource="{Binding AutoRefreshTimes}" SelectedItem="{Binding SelectedAutoRefreshTime}" MinWidth="150">
<ComboBox.ItemTemplate>
<DataTemplate DataType="utilities:AutoRefreshTimeInfo">
<TextBlock>
<TextBlock.Text>
<MultiBinding StringFormat="{}{0} {1}">
<Binding Path="Value" />
<Binding Path="TimeUnit" Converter="{StaticResource AutoRefreshTimeToStringConverter}" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</WrapPanel>
<Button Grid.Column="2" Command="{Binding ScanNetworksCommand}" VerticalAlignment="Bottom" HorizontalAlignment="Right">
<Button Grid.Column="0" Grid.Row="0" Command="{Binding ScanNetworksCommand}" VerticalAlignment="Bottom" HorizontalAlignment="Right">
<Button.Style>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
<Style.Triggers>
Expand Down