Skip to content

Commit 7f87ce3

Browse files
love-lingerlove-linger
committed
ux: move some configuration from GIT to GENERAL tab
1 parent 2bea686 commit 7f87ce3

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

‎src/Views/Preference.axaml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<TabItem.Header>
5353
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
5454
</TabItem.Header>
55-
<Grid Margin="8" RowDefinitions="32,32,32,32" ColumnDefinitions="Auto,*">
55+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
5656
<TextBlock Grid.Row="0" Grid.Column="0"
5757
Text="{DynamicResource Text.Preference.General.Locale}"
5858
HorizontalAlignment="Right"
@@ -66,10 +66,25 @@
6666
SelectedItem="{Binding Locale, Mode=TwoWay, Converter={x:Static c:StringConverters.ToLocale}}"/>
6767

6868
<TextBlock Grid.Row="1" Grid.Column="0"
69+
Text="{DynamicResource Text.Preference.Git.DefaultCloneDir}"
70+
HorizontalAlignment="Right"
71+
Margin="0,0,16,0"/>
72+
<TextBox Grid.Row="1" Grid.Column="1"
73+
Height="28"
74+
CornerRadius="3"
75+
Text="{Binding GitDefaultCloneDir, Mode=TwoWay}">
76+
<TextBox.InnerRightContent>
77+
<Button Classes="icon_button" Width="30" Height="30" Click="SelectDefaultCloneDir">
78+
<Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
79+
</Button>
80+
</TextBox.InnerRightContent>
81+
</TextBox>
82+
83+
<TextBlock Grid.Row="2" Grid.Column="0"
6984
Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
7085
HorizontalAlignment="Right"
7186
Margin="0,0,16,0"/>
72-
<NumericUpDown Grid.Row="1" Grid.Column="1"
87+
<NumericUpDown Grid.Row="2" Grid.Column="1"
7388
Minimum="50" Maximum="1000" Increment="1"
7489
Height="28"
7590
Padding="4"
@@ -78,11 +93,11 @@
7893
CornerRadius="3"
7994
Value="{Binding SubjectGuideLength, Mode=TwoWay}"/>
8095

81-
<TextBlock Grid.Row="2" Grid.Column="0"
96+
<TextBlock Grid.Row="3" Grid.Column="0"
8297
Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
8398
HorizontalAlignment="Right"
8499
Margin="0,0,16,0"/>
85-
<Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,64">
100+
<Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
86101
<Slider Grid.Column="0"
87102
Minimum="20000" Maximum="100000"
88103
TickPlacement="BottomRight" TickFrequency="5000"
@@ -97,10 +112,36 @@
97112
Text="{Binding MaxHistoryCommits}"/>
98113
</Grid>
99114

100-
<CheckBox Grid.Row="3" Grid.Column="1"
115+
<CheckBox Grid.Row="4" Grid.Column="1"
101116
Height="32"
102117
Content="{DynamicResource Text.Preference.General.Check4UpdatesOnStartup}"
103118
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=Check4UpdatesOnStartup, Mode=TwoWay}"/>
119+
120+
<CheckBox Grid.Row="5" Grid.Column="1"
121+
Content="{DynamicResource Text.Preference.Git.AutoFetch}"
122+
IsChecked="{Binding GitAutoFetch, Mode=TwoWay}"/>
123+
124+
<TextBlock Grid.Row="6" Grid.Column="0"
125+
IsVisible="{Binding GitAutoFetch}"
126+
Text="{DynamicResource Text.Preference.Git.AutoFetchInterval}"
127+
HorizontalAlignment="Right"
128+
Margin="0,0,16,0"/>
129+
<Grid Grid.Row="6" Grid.Column="1" Height="32" ColumnDefinitions="*,Auto" IsVisible="{Binding GitAutoFetch}">
130+
<NumericUpDown Grid.Column="0"
131+
Minimum="1" Maximum="60" Increment="1"
132+
Height="28"
133+
Padding="4"
134+
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
135+
CornerRadius="3"
136+
ParsingNumberStyle="Integer"
137+
FormatString="0"
138+
Value="{Binding GitAutoFetchInterval, Mode=TwoWay, FallbackValue=10}"/>
139+
140+
<TextBlock Grid.Column="1"
141+
VerticalAlignment="Center"
142+
Margin="5,0,0,0"
143+
Text="{DynamicResource Text.Preference.Git.AutoFetchIntervalSuffix}" />
144+
</Grid>
104145
</Grid>
105146
</TabItem>
106147

@@ -194,7 +235,7 @@
194235
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Git}"/>
195236
</TabItem.Header>
196237

197-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
238+
<Grid Margin="8" RowDefinitions="32,32,32,32,32" ColumnDefinitions="Auto,*">
198239
<TextBlock Grid.Row="0" Grid.Column="0"
199240
Text="{DynamicResource Text.Preference.Git.Path}"
200241
HorizontalAlignment="Right"
@@ -227,45 +268,30 @@
227268
</StackPanel>
228269

229270
<TextBlock Grid.Row="2" Grid.Column="0"
230-
Text="{DynamicResource Text.Preference.Git.DefaultCloneDir}"
231-
HorizontalAlignment="Right"
232-
Margin="0,0,16,0"/>
233-
<TextBox Grid.Row="2" Grid.Column="1"
234-
Height="28"
235-
CornerRadius="3"
236-
Text="{Binding GitDefaultCloneDir, Mode=TwoWay}">
237-
<TextBox.InnerRightContent>
238-
<Button Classes="icon_button" Width="30" Height="30" Click="SelectDefaultCloneDir">
239-
<Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
240-
</Button>
241-
</TextBox.InnerRightContent>
242-
</TextBox>
243-
244-
<TextBlock Grid.Row="3" Grid.Column="0"
245271
Text="{DynamicResource Text.Preference.Git.User}"
246272
HorizontalAlignment="Right"
247273
Margin="0,0,16,0"/>
248-
<TextBox Grid.Row="3" Grid.Column="1"
274+
<TextBox Grid.Row="2" Grid.Column="1"
249275
Height="28"
250276
CornerRadius="3"
251277
Text="{Binding #ThisControl.DefaultUser, Mode=TwoWay}"
252278
Watermark="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
253279

254-
<TextBlock Grid.Row="4" Grid.Column="0"
280+
<TextBlock Grid.Row="3" Grid.Column="0"
255281
Text="{DynamicResource Text.Preference.Git.Email}"
256282
HorizontalAlignment="Right"
257283
Margin="0,0,16,0"/>
258-
<TextBox Grid.Row="4" Grid.Column="1"
284+
<TextBox Grid.Row="3" Grid.Column="1"
259285
Height="28"
260286
CornerRadius="3"
261287
Text="{Binding #ThisControl.DefaultEmail, Mode=TwoWay}"
262288
Watermark="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
263289

264-
<TextBlock Grid.Row="5" Grid.Column="0"
290+
<TextBlock Grid.Row="4" Grid.Column="0"
265291
Text="{DynamicResource Text.Preference.Git.CRLF}"
266292
HorizontalAlignment="Right"
267293
Margin="0,0,16,0"/>
268-
<ComboBox Grid.Row="5" Grid.Column="1"
294+
<ComboBox Grid.Row="4" Grid.Column="1"
269295
MinHeight="28"
270296
Padding="8,0"
271297
HorizontalAlignment="Stretch"
@@ -280,32 +306,6 @@
280306
</DataTemplate>
281307
</ComboBox.ItemTemplate>
282308
</ComboBox>
283-
284-
<CheckBox Grid.Row="6" Grid.Column="1"
285-
Content="{DynamicResource Text.Preference.Git.AutoFetch}"
286-
IsChecked="{Binding GitAutoFetch, Mode=TwoWay}"/>
287-
288-
<TextBlock Grid.Row="7" Grid.Column="0"
289-
IsVisible="{Binding GitAutoFetch}"
290-
Text="{DynamicResource Text.Preference.Git.AutoFetchInterval}"
291-
HorizontalAlignment="Right"
292-
Margin="0,0,16,0"/>
293-
<Grid Grid.Row="7" Grid.Column="1" Height="32" ColumnDefinitions="*,Auto" IsVisible="{Binding GitAutoFetch}">
294-
<NumericUpDown Grid.Column="0"
295-
Minimum="1" Maximum="60" Increment="1"
296-
Height="28"
297-
Padding="4"
298-
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
299-
CornerRadius="3"
300-
ParsingNumberStyle="Integer"
301-
FormatString="0"
302-
Value="{Binding GitAutoFetchInterval, Mode=TwoWay, FallbackValue=10}"/>
303-
304-
<TextBlock Grid.Column="1"
305-
VerticalAlignment="Center"
306-
Margin="5,0,0,0"
307-
Text="{DynamicResource Text.Preference.Git.AutoFetchIntervalSuffix}" />
308-
</Grid>
309309
</Grid>
310310
</TabItem>
311311

0 commit comments

Comments
 (0)