Skip to content

Commit 5276e98

Browse files
committed
Add option to preferences dialog
1 parent 7ddbb19 commit 5276e98

File tree

4 files changed

+21
-1
lines changed

4 files changed

+21
-1
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@
460460
<x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Theme Overrides</x:String>
461461
<x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>
462462
<x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Use native window frame</x:String>
463+
<x:String x:Key="Text.Preference.Appearance.SystemTrayIcon" xml:space="preserve">System tray icon (needs restart)</x:String>
463464
<x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
464465
<x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Install Path</x:String>
465466
<x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Input path for diff/merge tool</x:String>

src/Resources/Locales/ru_RU.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@
461461
<x:String x:Key="Text.Preference.Appearance.ThemeOverrides" xml:space="preserve">Переопределение темы</x:String>
462462
<x:String x:Key="Text.Preference.Appearance.UseFixedTabWidth" xml:space="preserve">Использовать фиксированную ширину табуляции в строке заголовка.</x:String>
463463
<x:String x:Key="Text.Preference.Appearance.UseNativeWindowFrame" xml:space="preserve">Использовать системное окно</x:String>
464+
<x:String x:Key="Text.Preference.Appearance.SystemTrayIcon" xml:space="preserve">Иконка в системном лотке (нужен перезапуск)</x:String>
464465
<x:String x:Key="Text.Preference.DiffMerge" xml:space="preserve">ИНСТРУМЕНТ РАЗЛИЧИЙ/СЛИЯНИЯ</x:String>
465466
<x:String x:Key="Text.Preference.DiffMerge.Path" xml:space="preserve">Путь установки</x:String>
466467
<x:String x:Key="Text.Preference.DiffMerge.Path.Placeholder" xml:space="preserve">Введите путь для инструмента различия/слияния</x:String>

src/Views/Preference.axaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<TabItem.Header>
149149
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.Appearance}"/>
150150
</TabItem.Header>
151-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
151+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
152152
<TextBlock Grid.Row="0" Grid.Column="0"
153153
Text="{DynamicResource Text.Preference.Appearance.Theme}"
154154
HorizontalAlignment="Right"
@@ -247,6 +247,13 @@
247247
IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSystemWindowFrame, Mode=OneTime}"
248248
IsVisible="{OnPlatform False, Linux=True}"
249249
IsCheckedChanged="OnUseNativeWindowFrameChanged"/>
250+
251+
<CheckBox Grid.Row="{OnPlatform 7, Linux=8}" Grid.Column="1"
252+
Height="32"
253+
Content="{DynamicResource Text.Preference.Appearance.SystemTrayIcon}"
254+
IsChecked="{Binding Path=SystemTrayIcon, Mode=OneTime}"
255+
IsVisible="True"
256+
IsCheckedChanged="OnSystemTrayIconCheckedChanged"/>
250257
</Grid>
251258
</TabItem>
252259

src/Views/Preference.axaml.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,17 @@ private void OnUseNativeWindowFrameChanged(object sender, RoutedEventArgs e)
327327

328328
e.Handled = true;
329329
}
330+
private void OnSystemTrayIconCheckedChanged(object sender, RoutedEventArgs e)
331+
{
332+
if (sender is CheckBox box)
333+
{
334+
ViewModels.Preference.Instance.SystemTrayIcon = box.IsChecked == true;
335+
var dialog = new ConfirmRestart();
336+
App.OpenDialog(dialog);
337+
}
338+
339+
e.Handled = true;
340+
}
330341

331342
private void OnAddOpenAIService(object sender, RoutedEventArgs e)
332343
{

0 commit comments

Comments
 (0)