Skip to content

Commit 712a05d

Browse files
committed
Update SettingsSettingsView.xaml
1 parent 3264291 commit 712a05d

File tree

1 file changed

+37
-26
lines changed

1 file changed

+37
-26
lines changed

Source/NETworkManager/Views/SettingsSettingsView.xaml

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,46 @@
1717
<TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Location}" />
1818
<TextBox x:Name="TextBoxLocation" Text="{Binding Location}" Style="{StaticResource ReadOnlyTextBox}"
1919
IsEnabled="False" Margin="0,0,0,10" />
20-
<StackPanel Orientation="Horizontal" Margin="0,0,0,10"
21-
Visibility="{Binding IsLocationManagedByPolicy, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
22-
<Rectangle Width="24" Height="24" Fill="{DynamicResource MahApps.Brushes.Accent}" VerticalAlignment="Center" Margin="0,0,5,0">
23-
<Rectangle.OpacityMask>
24-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ShieldLock}" />
25-
</Rectangle.OpacityMask>
26-
</Rectangle>
27-
<TextBlock Text="{x:Static localization:Strings.SettingManagedByAdministrator}"
20+
<Grid>
21+
<Grid.ColumnDefinitions>
22+
<ColumnDefinition Width="*" />
23+
<ColumnDefinition Width="10" />
24+
<ColumnDefinition Width="Auto" />
25+
</Grid.ColumnDefinitions>
26+
<StackPanel Grid.Column="0" Grid.Row="0"
27+
Orientation="Horizontal"
28+
Visibility="{Binding IsLocationManagedByPolicy, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
29+
Margin="0,0,0,10">
30+
<Rectangle Width="24" Height="24" Fill="{DynamicResource MahApps.Brushes.Accent}" VerticalAlignment="Center" Margin="0,0,5,0">
31+
<Rectangle.OpacityMask>
32+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ShieldLock}" />
33+
</Rectangle.OpacityMask>
34+
</Rectangle>
35+
<TextBlock Text="{x:Static localization:Strings.SettingManagedByAdministrator}"
2836
Style="{StaticResource AccentTextBlock}"
2937
VerticalAlignment="Center" />
30-
</StackPanel>
31-
<Button Command="{Binding OpenLocationCommand}" Style="{StaticResource ImageWithTextButton}"
32-
HorizontalAlignment="Right" Margin="0,0,0,20">
33-
<Button.Content>
34-
<Grid>
35-
<Grid.ColumnDefinitions>
36-
<ColumnDefinition Width="Auto" />
37-
<ColumnDefinition Width="*" />
38-
</Grid.ColumnDefinitions>
39-
<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
40-
<Rectangle.OpacityMask>
41-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOpen}" />
42-
</Rectangle.OpacityMask>
43-
</Rectangle>
44-
<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenLocation}"
38+
</StackPanel>
39+
<Button Grid.Column="2" Grid.Row="0"
40+
Command="{Binding OpenLocationCommand}"
41+
Style="{StaticResource ImageWithTextButton}"
42+
Margin="0,0,0,20">
43+
<Button.Content>
44+
<Grid>
45+
<Grid.ColumnDefinitions>
46+
<ColumnDefinition Width="Auto" />
47+
<ColumnDefinition Width="*" />
48+
</Grid.ColumnDefinitions>
49+
<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
50+
<Rectangle.OpacityMask>
51+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOpen}" />
52+
</Rectangle.OpacityMask>
53+
</Rectangle>
54+
<TextBlock Grid.Column="1" Text="{x:Static localization:Strings.OpenLocation}"
4555
Style="{StaticResource ButtonWithImageTextBlock}" />
46-
</Grid>
47-
</Button.Content>
48-
</Button>
56+
</Grid>
57+
</Button.Content>
58+
</Button>
59+
</Grid>
4960
<TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Backup}" />
5061
<mah:ToggleSwitch Header="{x:Static localization:Strings.CreateDailyBackup}"
5162
IsOn="{Binding IsDailyBackupEnabled}" Margin="0,0,0,10" />

0 commit comments

Comments
 (0)