Skip to content

Commit 774ec65

Browse files
love-lingerlove-linger
committed
ux: layout for font size settings
Signed-off-by: leo <[email protected]>
1 parent 79c1fb6 commit 774ec65

File tree

9 files changed

+39
-34
lines changed

9 files changed

+39
-34
lines changed

‎src/Resources/Locales/de_DE.axaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<x:String x:Key="Text.Cancel" xml:space="preserve">ABBRECHEN</x:String>
7474
<x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Auf diese Revision zurücksetzen</x:String>
7575
<x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Auf Vorgänger-Revision zurücksetzen</x:String>
76-
<x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generiere Commit-Nachricht</x:String>
76+
<x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">Generiere Commit-Nachricht</x:String>
7777
<x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">ANZEIGE MODUS ÄNDERN</x:String>
7878
<x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">Zeige als Datei- und Ordnerliste</x:String>
7979
<x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Zeige als Pfadliste</x:String>
@@ -429,7 +429,6 @@
429429
<x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modell</x:String>
430430
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
431431
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
432-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Standardschriftgröße</x:String>
433432
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Monospace-Schriftart</x:String>
434433
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Verwende die Monospace-Schriftart nur im Texteditor</x:String>
435434
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Design</x:String>

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,9 @@
434434
<x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Server</x:String>
435435
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APPEARANCE</x:String>
436436
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
437-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Default Font Size</x:String>
438-
<x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Editor Font Size</x:String>
437+
<x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
438+
<x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Default</x:String>
439+
<x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
439440
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Monospace Font</x:String>
440441
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Only use monospace font in text editor</x:String>
441442
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Theme</x:String>

‎src/Resources/Locales/es_ES.axaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,6 @@
438438
<x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Servidor</x:String>
439439
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APARIENCIA</x:String>
440440
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Fuente por defecto</x:String>
441-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Tamaño de fuente por defecto</x:String>
442-
<x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Tamaño de fuente del editor</x:String>
443441
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Fuente Monospace</x:String>
444442
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usar solo fuente monospace en el editor de texto</x:String>
445443
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Tema</x:String>

‎src/Resources/Locales/fr_FR.axaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@
371371
<x:String x:Key="Text.Preference" xml:space="preserve">Préférences</x:String>
372372
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">APPARENCE</x:String>
373373
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Police par défaut</x:String>
374-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Taille de police par défaut</x:String>
375374
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Police monospace</x:String>
376375
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">N'utiliser que des polices monospace pour l'éditeur de texte</x:String>
377376
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Thème</x:String>

‎src/Resources/Locales/pt_BR.axaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,6 @@
460460
<x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Servidor</x:String>
461461
<x:String x:Key="Text.Preference.AI" xml:space="preserve">INTELIGÊNCIA ARTIFICIAL</x:String>
462462
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Fonte Padrão</x:String>
463-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Tamanho da fonte padrão</x:String>
464-
<x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Tamanho da fonte do editor</x:String>
465463
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Fonte Monoespaçada</x:String>
466464
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usar fonte monoespaçada apenas no editor de texto</x:String>
467465
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Tema</x:String>

‎src/Resources/Locales/ru_RU.axaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,6 @@
438438
<x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">Сервер</x:String>
439439
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">ВИД</x:String>
440440
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Шрифт по-умолчанию</x:String>
441-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">Размер шрифта по-умолчанию</x:String>
442-
<x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">Размер шрифта редактора</x:String>
443441
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Моноширный шрифт</x:String>
444442
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">В текстовом редакторе используется только моноширный шрифт</x:String>
445443
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Тема</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,9 @@
437437
<x:String x:Key="Text.Preference.AI.Server" xml:space="preserve">服务地址</x:String>
438438
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">外观配置</x:String>
439439
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">缺省字体</x:String>
440-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">默认字体大小</x:String>
440+
<x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">字体大小</x:String>
441+
<x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">默认</x:String>
442+
<x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">代码编辑器</x:String>
441443
<x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">代码字体大小</x:String>
442444
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">等宽字体</x:String>
443445
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">仅在文本编辑器中使用等宽字体</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,9 @@
437437
<x:String x:Key="Text.Preference.AI.GenerateSubjectPrompt" xml:space="preserve">產生提交訊息提示詞</x:String>
438438
<x:String x:Key="Text.Preference.Appearance" xml:space="preserve">外觀設定</x:String>
439439
<x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">預設字型</x:String>
440-
<x:String x:Key="Text.Preference.Appearance.DefaultFontSize" xml:space="preserve">預設字型大小</x:String>
441-
<x:String x:Key="Text.Preference.Appearance.EditorFontSize" xml:space="preserve">程式碼字型大小</x:String>
440+
<x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">字型大小</x:String>
441+
<x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">預設</x:String>
442+
<x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">程式碼</x:String>
442443
<x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">等寬字型</x:String>
443444
<x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">僅在文字編輯器中使用等寬字型</x:String>
444445
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">佈景主題</x:String>

‎src/Views/Preference.axaml‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<TabItem.Header>
122122
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Appearance}"/>
123123
</TabItem.Header>
124-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
124+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
125125
<TextBlock Grid.Row="0" Grid.Column="0"
126126
Text="{DynamicResource Text.Preference.Appearance.Theme}"
127127
HorizontalAlignment="Right"
@@ -158,34 +158,43 @@
158158
Text="{Binding MonospaceFontFamily, Mode=TwoWay}"/>
159159

160160
<TextBlock Grid.Row="3" Grid.Column="0"
161-
Text="{DynamicResource Text.Preference.Appearance.DefaultFontSize}"
161+
Text="{DynamicResource Text.Preference.Appearance.FontSize}"
162162
HorizontalAlignment="Right"
163163
Margin="0,0,16,0"/>
164-
<NumericUpDown Grid.Row="3" Grid.Column="1"
164+
<Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,8,*">
165+
<NumericUpDown Grid.Column="0"
165166
Minimum="10" Maximum="18" Increment="0.5"
166167
Height="28"
167168
Padding="4"
168169
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
169170
CornerRadius="3"
170-
Value="{Binding DefaultFontSize, Mode=TwoWay}"/>
171+
Value="{Binding DefaultFontSize, Mode=TwoWay}">
172+
<NumericUpDown.InnerLeftContent>
173+
<Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource Brush.Border1}">
174+
<TextBlock Margin="4,0" Text="{DynamicResource Text.Preference.Appearance.FontSize.Default}"/>
175+
</Border>
176+
</NumericUpDown.InnerLeftContent>
177+
</NumericUpDown>
178+
<NumericUpDown Grid.Column="2"
179+
Minimum="10" Maximum="18" Increment="0.5"
180+
Height="28"
181+
Padding="4"
182+
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
183+
CornerRadius="3"
184+
Value="{Binding EditorFontSize, Mode=TwoWay}">
185+
<NumericUpDown.InnerLeftContent>
186+
<Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource Brush.Border1}">
187+
<TextBlock Margin="4,0" Text="{DynamicResource Text.Preference.Appearance.FontSize.Editor}"/>
188+
</Border>
189+
</NumericUpDown.InnerLeftContent>
190+
</NumericUpDown>
191+
</Grid>
171192

172193
<TextBlock Grid.Row="4" Grid.Column="0"
173-
Text="{DynamicResource Text.Preference.Appearance.EditorFontSize}"
174-
HorizontalAlignment="Right"
175-
Margin="0,0,16,0"/>
176-
<NumericUpDown Grid.Row="4" Grid.Column="1"
177-
Minimum="10" Maximum="18" Increment="0.5"
178-
Height="28"
179-
Padding="4"
180-
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}"
181-
CornerRadius="3"
182-
Value="{Binding EditorFontSize, Mode=TwoWay}"/>
183-
184-
<TextBlock Grid.Row="5" Grid.Column="0"
185194
Text="{DynamicResource Text.Preference.Appearance.ThemeOverrides}"
186195
HorizontalAlignment="Right"
187196
Margin="0,0,16,0"/>
188-
<TextBox Grid.Row="5" Grid.Column="1"
197+
<TextBox Grid.Row="4" Grid.Column="1"
189198
Height="28"
190199
CornerRadius="3"
191200
Text="{Binding ThemeOverrides, Mode=TwoWay}">
@@ -196,16 +205,16 @@
196205
</TextBox.InnerRightContent>
197206
</TextBox>
198207

199-
<CheckBox Grid.Row="6" Grid.Column="1"
208+
<CheckBox Grid.Row="5" Grid.Column="1"
200209
Content="{DynamicResource Text.Preference.Appearance.OnlyUseMonoFontInEditor}"
201210
IsChecked="{Binding OnlyUseMonoFontInEditor, Mode=TwoWay}"/>
202211

203-
<CheckBox Grid.Row="7" Grid.Column="1"
212+
<CheckBox Grid.Row="6" Grid.Column="1"
204213
Height="32"
205214
Content="{DynamicResource Text.Preference.Appearance.UseFixedTabWidth}"
206215
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
207216

208-
<CheckBox Grid.Row="8" Grid.Column="1"
217+
<CheckBox Grid.Row="7" Grid.Column="1"
209218
Height="32"
210219
Content="{DynamicResource Text.Preference.Appearance.UseNativeWindowFrame}"
211220
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSystemWindowFrame, Mode=OneTime}"

0 commit comments

Comments
 (0)