Skip to content

Commit 8042091

Browse files
love-lingerlove-linger
committed
style: move some settings to Appearance tab
1 parent a992485 commit 8042091

File tree

5 files changed

+113
-88
lines changed

5 files changed

+113
-88
lines changed

‎src/SourceGit/Resources/Locales.Designer.cs‎

Lines changed: 36 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/SourceGit/Resources/Locales.en.resx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@
984984
<data xml:space="preserve" name="Text.Preference.General.AvatarServer">
985985
<value>Avatar Server</value>
986986
</data>
987-
<data xml:space="preserve" name="Text.Preference.General.Theme">
987+
<data xml:space="preserve" name="Text.Preference.Appearance.Theme">
988988
<value>Theme</value>
989989
</data>
990990
<data xml:space="preserve" name="Text.Preference.General.MaxHistoryCommits">
@@ -1290,13 +1290,16 @@
12901290
<data name="Text.Diff.SyntaxHighlight" xml:space="preserve">
12911291
<value>Syntax Highlighting</value>
12921292
</data>
1293-
<data name="Text.Preference.General.DefaultFont" xml:space="preserve">
1293+
<data name="Text.Preference.Appearance.DefaultFont" xml:space="preserve">
12941294
<value>Default FontFamily</value>
12951295
</data>
1296-
<data name="Text.Preference.General.MonospaceFont" xml:space="preserve">
1296+
<data name="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">
12971297
<value>Monospace FontFamily</value>
12981298
</data>
1299-
<data name="Text.Preference.General.DefaultFontSize" xml:space="preserve">
1299+
<data name="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">
13001300
<value>Default Font Size</value>
13011301
</data>
1302+
<data name="Text.Preference.Appearance" xml:space="preserve">
1303+
<value>APPEARANCE</value>
1304+
</data>
13021305
</root>

‎src/SourceGit/Resources/Locales.resx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@
984984
<data xml:space="preserve" name="Text.Preference.General.AvatarServer">
985985
<value>Avatar Server</value>
986986
</data>
987-
<data xml:space="preserve" name="Text.Preference.General.Theme">
987+
<data xml:space="preserve" name="Text.Preference.Appearance.Theme">
988988
<value>Theme</value>
989989
</data>
990990
<data xml:space="preserve" name="Text.Preference.General.MaxHistoryCommits">
@@ -1290,13 +1290,16 @@
12901290
<data name="Text.Diff.SyntaxHighlight" xml:space="preserve">
12911291
<value>Syntax Highlighting</value>
12921292
</data>
1293-
<data name="Text.Preference.General.DefaultFont" xml:space="preserve">
1293+
<data name="Text.Preference.Appearance.DefaultFont" xml:space="preserve">
12941294
<value>Default FontFamily</value>
12951295
</data>
1296-
<data name="Text.Preference.General.MonospaceFont" xml:space="preserve">
1296+
<data name="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">
12971297
<value>Monospace FontFamily</value>
12981298
</data>
1299-
<data name="Text.Preference.General.DefaultFontSize" xml:space="preserve">
1299+
<data name="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">
13001300
<value>Default Font Size</value>
13011301
</data>
1302+
<data name="Text.Preference.Appearance" xml:space="preserve">
1303+
<value>Appearance</value>
1304+
</data>
13021305
</root>

‎src/SourceGit/Resources/Locales.zh.resx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@
984984
<data xml:space="preserve" name="Text.Preference.General.AvatarServer">
985985
<value>头像服务</value>
986986
</data>
987-
<data xml:space="preserve" name="Text.Preference.General.Theme">
987+
<data xml:space="preserve" name="Text.Preference.Appearance.Theme">
988988
<value>主题</value>
989989
</data>
990990
<data xml:space="preserve" name="Text.Preference.General.MaxHistoryCommits">
@@ -1290,13 +1290,16 @@
12901290
<data name="Text.Diff.SyntaxHighlight" xml:space="preserve">
12911291
<value>语法高亮</value>
12921292
</data>
1293-
<data name="Text.Preference.General.DefaultFont" xml:space="preserve">
1293+
<data name="Text.Preference.Appearance.DefaultFont" xml:space="preserve">
12941294
<value>缺省字体</value>
12951295
</data>
1296-
<data name="Text.Preference.General.MonospaceFont" xml:space="preserve">
1296+
<data name="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">
12971297
<value>等宽字体</value>
12981298
</data>
1299-
<data name="Text.Preference.General.DefaultFontSize" xml:space="preserve">
1299+
<data name="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">
13001300
<value>默认字体大小</value>
13011301
</data>
1302+
<data name="Text.Preference.Appearance" xml:space="preserve">
1303+
<value>外观配置</value>
1304+
</data>
13021305
</root>

‎src/SourceGit/Views/Preference.axaml‎

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<TabItem.Header>
6868
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
6969
</TabItem.Header>
70-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
70+
<Grid Margin="8" RowDefinitions="32,32,32,32,32" ColumnDefinitions="Auto,*">
7171
<TextBlock Grid.Row="0" Grid.Column="0"
7272
Text="{DynamicResource Text.Preference.General.Locale}"
7373
HorizontalAlignment="Right"
@@ -96,10 +96,54 @@
9696
</ComboBox>
9797

9898
<TextBlock Grid.Row="2" Grid.Column="0"
99-
Text="{DynamicResource Text.Preference.General.Theme}"
99+
Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
100100
HorizontalAlignment="Right"
101101
Margin="0,0,16,0"/>
102-
<ComboBox Grid.Row="2" Grid.Column="1"
102+
<Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,64">
103+
<Slider Grid.Column="0"
104+
Minimum="20000" Maximum="100000"
105+
TickPlacement="BottomRight" TickFrequency="5000"
106+
IsSnapToTickEnabled="True"
107+
VerticalAlignment="Center"
108+
Foreground="{DynamicResource Brush.Border1}"
109+
Value="{Binding MaxHistoryCommits, Mode=TwoWay}">
110+
<Slider.Resources>
111+
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
112+
<GridLength x:Key="SliderPreContentMargin">0</GridLength>
113+
<GridLength x:Key="SliderPostContentMargin">0</GridLength>
114+
<CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
115+
<x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
116+
<x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
117+
</Slider.Resources>
118+
</Slider>
119+
120+
<TextBlock Grid.Column="1"
121+
HorizontalAlignment="Right" VerticalAlignment="Center"
122+
Foreground="{DynamicResource Brush.FG1}"
123+
Text="{Binding MaxHistoryCommits}"/>
124+
</Grid>
125+
126+
<CheckBox Grid.Row="3" Grid.Column="1"
127+
Content="{DynamicResource Text.Preference.General.RestoreTabs}"
128+
IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
129+
130+
<CheckBox Grid.Row="4" Grid.Column="1"
131+
Height="32"
132+
Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
133+
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
134+
</Grid>
135+
</TabItem>
136+
137+
<TabItem>
138+
<TabItem.Header>
139+
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Appearance}"/>
140+
</TabItem.Header>
141+
<Grid Margin="8" RowDefinitions="32,32,32,32" ColumnDefinitions="Auto,*">
142+
<TextBlock Grid.Row="0" Grid.Column="0"
143+
Text="{DynamicResource Text.Preference.Appearance.Theme}"
144+
HorizontalAlignment="Right"
145+
Margin="0,0,16,0"/>
146+
<ComboBox Grid.Row="0" Grid.Column="1"
103147
MinHeight="28"
104148
Padding="8,0"
105149
HorizontalAlignment="Stretch"
@@ -112,11 +156,11 @@
112156
</ComboBox.Items>
113157
</ComboBox>
114158

115-
<TextBlock Grid.Row="3" Grid.Column="0"
116-
Text="{DynamicResource Text.Preference.General.DefaultFont}"
159+
<TextBlock Grid.Row="1" Grid.Column="0"
160+
Text="{DynamicResource Text.Preference.Appearance.DefaultFont}"
117161
HorizontalAlignment="Right"
118162
Margin="0,0,16,0"/>
119-
<ComboBox Grid.Row="3" Grid.Column="1"
163+
<ComboBox Grid.Row="1" Grid.Column="1"
120164
MinHeight="28"
121165
Padding="8,0"
122166
HorizontalAlignment="Stretch"
@@ -131,11 +175,11 @@
131175
</ComboBox.ItemTemplate>
132176
</ComboBox>
133177

134-
<TextBlock Grid.Row="4" Grid.Column="0"
135-
Text="{DynamicResource Text.Preference.General.MonospaceFont}"
178+
<TextBlock Grid.Row="2" Grid.Column="0"
179+
Text="{DynamicResource Text.Preference.Appearance.MonospaceFont}"
136180
HorizontalAlignment="Right"
137181
Margin="0,0,16,0"/>
138-
<ComboBox Grid.Row="4" Grid.Column="1"
182+
<ComboBox Grid.Row="2" Grid.Column="1"
139183
MinHeight="28"
140184
Padding="8,0"
141185
HorizontalAlignment="Stretch"
@@ -150,11 +194,11 @@
150194
</ComboBox.ItemTemplate>
151195
</ComboBox>
152196

153-
<TextBlock Grid.Row="5" Grid.Column="0"
154-
Text="{DynamicResource Text.Preference.General.DefaultFontSize}"
197+
<TextBlock Grid.Row="3" Grid.Column="0"
198+
Text="{DynamicResource Text.Preference.Appearance.DefaultFontSize}"
155199
HorizontalAlignment="Right"
156200
Margin="0,0,16,0"/>
157-
<NumericUpDown Grid.Row="5" Grid.Column="1"
201+
<NumericUpDown Grid.Row="3" Grid.Column="1"
158202
Minimum="10" Maximum="16" Increment="0.5"
159203
Height="28"
160204
Padding="4"
@@ -174,43 +218,6 @@
174218
</Style>
175219
</NumericUpDown.Styles>
176220
</NumericUpDown>
177-
178-
<TextBlock Grid.Row="6" Grid.Column="0"
179-
Text="{DynamicResource Text.Preference.General.MaxHistoryCommits}"
180-
HorizontalAlignment="Right"
181-
Margin="0,0,16,0"/>
182-
<Grid Grid.Row="6" Grid.Column="1" ColumnDefinitions="*,64">
183-
<Slider Grid.Column="0"
184-
Minimum="20000" Maximum="100000"
185-
TickPlacement="BottomRight" TickFrequency="5000"
186-
IsSnapToTickEnabled="True"
187-
VerticalAlignment="Center"
188-
Foreground="{DynamicResource Brush.Border1}"
189-
Value="{Binding MaxHistoryCommits, Mode=TwoWay}">
190-
<Slider.Resources>
191-
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
192-
<GridLength x:Key="SliderPreContentMargin">0</GridLength>
193-
<GridLength x:Key="SliderPostContentMargin">0</GridLength>
194-
<CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
195-
<x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
196-
<x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
197-
</Slider.Resources>
198-
</Slider>
199-
200-
<TextBlock Grid.Column="1"
201-
HorizontalAlignment="Right" VerticalAlignment="Center"
202-
Foreground="{DynamicResource Brush.FG1}"
203-
Text="{Binding MaxHistoryCommits}"/>
204-
</Grid>
205-
206-
<CheckBox Grid.Row="7" Grid.Column="1"
207-
Content="{DynamicResource Text.Preference.General.RestoreTabs}"
208-
IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
209-
210-
<CheckBox Grid.Row="8" Grid.Column="1"
211-
Height="32"
212-
Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
213-
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
214221
</Grid>
215222
</TabItem>
216223

0 commit comments

Comments
 (0)