Skip to content

Commit 09c1186

Browse files
BornToBeRootBornToBeRoot
committed
Feature: Improve view
1 parent 09af5ce commit 09c1186

File tree

3 files changed

+66
-56
lines changed

3 files changed

+66
-56
lines changed

‎Source/NETworkManager.Settings/config.json.example‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Update_CheckForUpdatesAtStartup": false,
3-
"Profiles_FolderLocation": "C:\\CustomPath\\NETworkManager\\Profiles",
4-
"Settings_FolderLocation": "C:\\CustomPath\\NETworkManager\\Settings"
3+
"Profiles_FolderLocation": "\\\\Server\\Shared\\NETworkManager\\Profiles",
4+
"Settings_FolderLocation": "%UserProfile%\\NETworkManager\\Settings"
55
}

‎Source/NETworkManager/Views/SettingsProfilesView.xaml‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,12 @@
6969
</DataTrigger>
7070
</Style.Triggers>
7171
</Style>
72-
</StackPanel.Style>
73-
<Button Command="{Binding ChangeLocationCommand}"
74-
Visibility="{Binding IsLocationChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
75-
HorizontalAlignment="Left"
76-
Margin="0,0,10,0" >
77-
<Button.Style>
78-
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
79-
<Style.Triggers>
80-
<DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxLocation}" Value="True">
81-
<Setter Property="IsEnabled" Value="False" />
82-
</DataTrigger>
83-
</Style.Triggers>
84-
</Style>
85-
</Button.Style>
72+
</StackPanel.Style>
73+
<Button Command="{Binding RestoreDefaultLocationCommand}"
74+
HorizontalAlignment="Left"
75+
Margin="0,0,10,0"
76+
Visibility="{Binding IsDefaultLocation, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
77+
Style="{StaticResource ImageWithTextButton}">
8678
<Button.Content>
8779
<Grid>
8880
<Grid.ColumnDefinitions>
@@ -91,19 +83,27 @@
9183
</Grid.ColumnDefinitions>
9284
<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
9385
<Rectangle.OpacityMask>
94-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
86+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderArrowLeftOutline}" />
9587
</Rectangle.OpacityMask>
9688
</Rectangle>
9789
<TextBlock Grid.Column="1" Grid.Row="0"
98-
Text="{x:Static localization:Strings.Change}"
90+
Text="{x:Static localization:Strings.RestoreDefaultLocation}"
9991
Style="{StaticResource ButtonWithImageTextBlock}" />
10092
</Grid>
10193
</Button.Content>
10294
</Button>
103-
<Button Command="{Binding RestoreDefaultLocationCommand}"
104-
HorizontalAlignment="Left"
105-
Visibility="{Binding IsDefaultLocation, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
106-
Style="{StaticResource ImageWithTextButton}">
95+
<Button Command="{Binding ChangeLocationCommand}"
96+
Visibility="{Binding IsLocationChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
97+
HorizontalAlignment="Left">
98+
<Button.Style>
99+
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
100+
<Style.Triggers>
101+
<DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxLocation}" Value="True">
102+
<Setter Property="IsEnabled" Value="False" />
103+
</DataTrigger>
104+
</Style.Triggers>
105+
</Style>
106+
</Button.Style>
107107
<Button.Content>
108108
<Grid>
109109
<Grid.ColumnDefinitions>
@@ -112,12 +112,12 @@
112112
</Grid.ColumnDefinitions>
113113
<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
114114
<Rectangle.OpacityMask>
115-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOutline}" />
115+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
116116
</Rectangle.OpacityMask>
117117
</Rectangle>
118118
<TextBlock Grid.Column="1" Grid.Row="0"
119-
Text="{x:Static localization:Strings.RestoreDefaultLocation}"
120-
Style="{StaticResource ButtonWithImageTextBlock}" />
119+
Text="{x:Static localization:Strings.Change}"
120+
Style="{StaticResource ButtonWithImageTextBlock}" />
121121
</Grid>
122122
</Button.Content>
123123
</Button>
@@ -156,10 +156,14 @@
156156
</Style.Triggers>
157157
</Style>
158158
</Grid.Style>
159-
<Rectangle Grid.Column="0" Style="{StaticResource InfoImageRectangle}" Width="24" Height="24"
160-
HorizontalAlignment="Right" />
161-
<TextBlock Grid.Column="2" Text="{x:Static localization:Strings.LocationCannotBeChangedInThePortableVersion}"
162-
TextWrapping="Wrap" Style="{StaticResource InfoTextBlock}" />
159+
<Rectangle Grid.Column="0" Grid.Row="0"
160+
Style="{StaticResource InfoImageRectangle}"
161+
Width="24" Height="24"
162+
HorizontalAlignment="Right" />
163+
<TextBlock Grid.Column="2" Grid.Row="0"
164+
Text="{x:Static localization:Strings.LocationCannotBeChangedInThePortableVersion}"
165+
TextWrapping="Wrap"
166+
Style="{StaticResource InfoTextBlock}" />
163167
</Grid>
164168
<Button Grid.Column="2" Grid.Row="0"
165169
Command="{Binding OpenLocationCommand}"

‎Source/NETworkManager/Views/SettingsSettingsView.xaml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
1919
</UserControl.Resources>
2020
<StackPanel>
21-
<TextBlock Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Location}" />
21+
<TextBlock Style="{StaticResource HeaderTextBlock}"
22+
Text="{x:Static Member=localization:Strings.Location}" />
2223
<TextBox x:Name="TextBoxLocation"
2324
mah:TextBoxHelper.Watermark="{x:Static localization:Strings.EnterLocationDots}"
2425
mah:TextBoxHelper.ButtonCommand="{Binding BrowseLocationFolderCommand}"
@@ -67,19 +68,11 @@
6768
</Style.Triggers>
6869
</Style>
6970
</StackPanel.Style>
70-
<Button Command="{Binding ChangeLocationCommand}"
71-
Visibility="{Binding IsLocationChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
72-
HorizontalAlignment="Left"
73-
Margin="0,0,10,0" >
74-
<Button.Style>
75-
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
76-
<Style.Triggers>
77-
<DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxLocation}" Value="True">
78-
<Setter Property="IsEnabled" Value="False" />
79-
</DataTrigger>
80-
</Style.Triggers>
81-
</Style>
82-
</Button.Style>
71+
<Button Command="{Binding RestoreDefaultLocationCommand}"
72+
HorizontalAlignment="Left"
73+
Margin="0,0,10,0"
74+
Visibility="{Binding IsDefaultLocation, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
75+
Style="{StaticResource ImageWithTextButton}">
8376
<Button.Content>
8477
<Grid>
8578
<Grid.ColumnDefinitions>
@@ -88,19 +81,27 @@
8881
</Grid.ColumnDefinitions>
8982
<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
9083
<Rectangle.OpacityMask>
91-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
84+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderArrowLeftOutline}" />
9285
</Rectangle.OpacityMask>
9386
</Rectangle>
9487
<TextBlock Grid.Column="1" Grid.Row="0"
95-
Text="{x:Static localization:Strings.Change}"
96-
Style="{StaticResource ButtonWithImageTextBlock}" />
88+
Text="{x:Static localization:Strings.RestoreDefaultLocation}"
89+
Style="{StaticResource ButtonWithImageTextBlock}" />
9790
</Grid>
9891
</Button.Content>
9992
</Button>
100-
<Button Command="{Binding RestoreDefaultLocationCommand}"
101-
HorizontalAlignment="Left"
102-
Visibility="{Binding IsDefaultLocation, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
103-
Style="{StaticResource ImageWithTextButton}">
93+
<Button Command="{Binding ChangeLocationCommand}"
94+
Visibility="{Binding IsLocationChanged, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
95+
HorizontalAlignment="Left">
96+
<Button.Style>
97+
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
98+
<Style.Triggers>
99+
<DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxLocation}" Value="True">
100+
<Setter Property="IsEnabled" Value="False" />
101+
</DataTrigger>
102+
</Style.Triggers>
103+
</Style>
104+
</Button.Style>
104105
<Button.Content>
105106
<Grid>
106107
<Grid.ColumnDefinitions>
@@ -109,15 +110,16 @@
109110
</Grid.ColumnDefinitions>
110111
<Rectangle Style="{StaticResource ButtonWithImageRectangle}">
111112
<Rectangle.OpacityMask>
112-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FolderOutline}" />
113+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
113114
</Rectangle.OpacityMask>
114115
</Rectangle>
115116
<TextBlock Grid.Column="1" Grid.Row="0"
116-
Text="{x:Static localization:Strings.RestoreDefaultLocation}"
117+
Text="{x:Static localization:Strings.Change}"
117118
Style="{StaticResource ButtonWithImageTextBlock}" />
118119
</Grid>
119120
</Button.Content>
120121
</Button>
122+
121123
</StackPanel>
122124
<StackPanel Grid.Column="0" Grid.Row="0"
123125
Orientation="Horizontal"
@@ -153,10 +155,14 @@
153155
</Style.Triggers>
154156
</Style>
155157
</Grid.Style>
156-
<Rectangle Grid.Column="0" Style="{StaticResource InfoImageRectangle}" Width="24" Height="24"
157-
HorizontalAlignment="Right" />
158-
<TextBlock Grid.Column="2" Text="{x:Static localization:Strings.LocationCannotBeChangedInThePortableVersion}"
159-
TextWrapping="Wrap" Style="{StaticResource InfoTextBlock}" />
158+
<Rectangle Grid.Column="0" Grid.Row="0"
159+
Style="{StaticResource InfoImageRectangle}"
160+
Width="24" Height="24"
161+
HorizontalAlignment="Right" />
162+
<TextBlock Grid.Column="2" Grid.Row="0"
163+
Text="{x:Static localization:Strings.LocationCannotBeChangedInThePortableVersion}"
164+
TextWrapping="Wrap"
165+
Style="{StaticResource InfoTextBlock}" />
160166
</Grid>
161167
<Button Grid.Column="2" Grid.Row="0"
162168
Command="{Binding OpenLocationCommand}"

0 commit comments

Comments
 (0)