dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-26 04:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: The default terminal only shows on Windows.

Browse source
This commit is contained in:
walterlv 2024-04-08 20:15:18 +08:00
parent 26f2a1435a
commit 0dc970dcdd
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Resources/Locales/en_US.axaml
View file

@ -254,7 +254,7 @@
<x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Theme</x:String> <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Theme</x:String>
<x:String x:Key="Text.Preference.General" xml:space="preserve">GENERAL</x:String> <x:String x:Key="Text.Preference.General" xml:space="preserve">GENERAL</x:String>
<x:String x:Key="Text.Preference.General.AvatarServer" xml:space="preserve">Avatar Server</x:String> <x:String x:Key="Text.Preference.General.AvatarServer" xml:space="preserve">Avatar Server</x:String>
<x:String x:Key="Text.Preference.General.DefaultTerminal" xml:space="preserve">Default Terminal/Shell</x:String> <x:String x:Key="Text.Preference.General.DefaultTerminal" xml:space="preserve">Default Terminal</x:String>
<x:String x:Key="Text.Preference.General.DefaultTerminalOrShell" xml:space="preserve">System Default</x:String> <x:String x:Key="Text.Preference.General.DefaultTerminalOrShell" xml:space="preserve">System Default</x:String>
<x:String x:Key="Text.Preference.General.DefaultTerminalOrShell.wt" xml:space="preserve">Windows Terminal</x:String> <x:String x:Key="Text.Preference.General.DefaultTerminalOrShell.wt" xml:space="preserve">Windows Terminal</x:String>
<x:String x:Key="Text.Preference.General.DefaultTerminalOrShell.git-bash" xml:space="preserve">Git Bash</x:String> <x:String x:Key="Text.Preference.General.DefaultTerminalOrShell.git-bash" xml:space="preserve">Git Bash</x:String>

15
src/Views/Preference.axaml
View file

@ -73,7 +73,7 @@
<TabItem.Header> <TabItem.Header>
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/> <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
</TabItem.Header> </TabItem.Header>
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*"> <Grid Margin="8" RowDefinitions="32,32,Auto,32,32,32,32" ColumnDefinitions="Auto,*">
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
Text="{DynamicResource Text.Preference.General.Locale}" Text="{DynamicResource Text.Preference.General.Locale}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
@ -100,15 +100,18 @@
<sys:String>https://cravatar.cn/avatar/</sys:String> <sys:String>https://cravatar.cn/avatar/</sys:String>
</ComboBox.Items> </ComboBox.Items>
</ComboBox> </ComboBox>
<TextBlock Grid.Row="2" Grid.Column="0" <Border Grid.Row="2" Grid.Column="0" Height="32"
Text="{DynamicResource Text.Preference.General.DefaultTerminal}" IsVisible="{OnPlatform False, Windows=True}">
HorizontalAlignment="Right" <TextBlock Text="{DynamicResource Text.Preference.General.DefaultTerminal}"
Margin="0,0,16,0"/> HorizontalAlignment="Right"
Margin="0,0,16,0"/>
</Border>
<ComboBox Grid.Row="2" Grid.Column="1" <ComboBox Grid.Row="2" Grid.Column="1"
MinHeight="28" MinHeight="28"
Padding="8,0" Padding="8,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
IsVisible="{OnPlatform False, Windows=True}"
ItemsSource="{Binding #me.ExternalTerminals}" ItemsSource="{Binding #me.ExternalTerminals}"
SelectedItem="{Binding DefaultTerminal, Mode=TwoWay}"> SelectedItem="{Binding DefaultTerminal, Mode=TwoWay}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>