Skip to content

Commit 33392f6

Browse files
committed
Merge remote-tracking branch 'origin/250405-KoreanIME' into 250405-KoreanIME
2 parents 62e32dc + 5c55d29 commit 33392f6

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
6+
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
67
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
78
xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
89
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
910
xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
1011
xmlns:ui="http://schemas.modernwpf.com/2019"
11-
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
1212
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
1313
Title="General"
1414
d:DataContext="{d:DesignInstance settingsViewModels:SettingsPaneGeneralViewModel}"
@@ -32,7 +32,7 @@
3232
Style="{StaticResource PageTitle}"
3333
Text="{DynamicResource general}"
3434
TextAlignment="left" />
35-
35+
3636
<cc:ExCard
3737
Title="{DynamicResource startFlowLauncherOnSystemStartup}"
3838
Margin="0 8 0 0"
@@ -317,27 +317,32 @@
317317
SelectedValue="{Binding Language}"
318318
SelectedValuePath="LanguageCode" />
319319
</cc:Card>
320-
<cc:InfoBar Margin="0 12 0 0"
321-
Title="{DynamicResource KoreanImeTitle}"
322-
Closable="False"
323-
IsIconVisible="True"
324-
Length="Long"
325-
Message="{DynamicResource KoreanImeGuide}"
326-
Type="Warning" />
327-
<cc:CardGroup Margin="0 4 0 0">
320+
<Border Visibility="{Binding KoreanIMERegistryKeyExists, Converter={StaticResource BoolToVisibilityConverter}}">
321+
<cc:InfoBar
322+
Title="{DynamicResource KoreanImeTitle}"
323+
Margin="0 12 0 0"
324+
Closable="False"
325+
IsIconVisible="True"
326+
Length="Long"
327+
Message="{DynamicResource KoreanImeGuide}"
328+
Type="Info"
329+
Visibility="{Binding LegacyKoreanIMEEnabled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Inverted, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
330+
</Border>
331+
<cc:CardGroup Margin="0 4 0 0" Visibility="{Binding KoreanIMERegistryKeyExists, Converter={StaticResource BoolToVisibilityConverter}}">
328332
<cc:Card
329333
Title="{DynamicResource KoreanImeRegistry}"
330-
Icon="&#xe88b;" Sub="{DynamicResource KoreanImeRegistryTooltip}">
334+
Icon="&#xe88b;"
335+
Sub="{DynamicResource KoreanImeRegistryTooltip}">
331336
<ui:ToggleSwitch
332337
IsOn="{Binding LegacyKoreanIMEEnabled}"
333338
OffContent="{DynamicResource disable}"
334339
OnContent="{DynamicResource enable}" />
335340
</cc:Card>
336341
<cc:Card
337342
Title="{DynamicResource KoreanImeOpenLink}"
338-
Sub="{DynamicResource KoreanImeOpenLinkTooltip}"
339-
Icon="&#xf7b9;">
340-
<Button Content="{DynamicResource KoreanImeOpenLinkButton}" Command="{Binding OpenImeSettingsCommand}"/>
343+
Icon="&#xf7b9;"
344+
Sub="{DynamicResource KoreanImeOpenLinkTooltip}">
345+
<Button Command="{Binding OpenImeSettingsCommand}" Content="{DynamicResource KoreanImeOpenLinkButton}" />
341346
</cc:Card>
342347
</cc:CardGroup>
343348
</VirtualizingStackPanel>

0 commit comments

Comments
 (0)