Skip to content

Fix issue with multilingual display #3683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 9, 2025
Merged

Fix issue with multilingual display #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fef743
Fix Always Preview Binding
onesounds Jun 9, 2025
219e003
Adjust Welcome Window Size and text overflow
onesounds Jun 9, 2025
8fac98d
Fix HotkeyDialog Button Size
onesounds Jun 9, 2025
2fd5b38
Remove unused data context binding
Jack251970 Jun 9, 2025
f75a11c
Manually trigger string update
Jack251970 Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Flow.Launcher/HotkeyControlDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@
BorderThickness="0 1 0 0"
CornerRadius="0 0 8 8">
<StackPanel
Margin="10"
Margin="10 9 10 10"
HorizontalAlignment="Center"
Orientation="Horizontal">
<Button
x:Name="OverwriteBtn"
Height="30"
MinHeight="36"
MinWidth="100"
Margin="0 0 4 0"
Click="Overwrite"
Expand All @@ -139,26 +139,26 @@
Visibility="Collapsed" />
<Button
x:Name="SaveBtn"
Height="30"
MinHeight="36"
MinWidth="100"
Margin="0 0 4 0"
Click="Save"
Content="{DynamicResource commonSave}"
Style="{StaticResource AccentButtonStyle}" />
<Button
Height="30"
MinHeight="36"
MinWidth="100"
Margin="4 0 4 0"
Click="Reset"
Content="{DynamicResource commonReset}" />
<Button
Height="30"
MinHeight="36"
MinWidth="100"
Margin="4 0 4 0"
Click="Delete"
Content="{DynamicResource commonDelete}" />
<Button
Height="30"
MinHeight="36"
MinWidth="100"
Margin="4 0 0 0"
Click="Cancel"
Expand Down
6 changes: 3 additions & 3 deletions Flow.Launcher/Resources/Pages/WelcomePage1.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="250" />
<RowDefinition />
<RowDefinition Height="340"/>
</Grid.RowDefinitions>

<Border Grid.Row="0" HorizontalAlignment="Stretch">
Expand Down Expand Up @@ -140,7 +140,7 @@
</Border>


<Canvas Grid.Row="1" Height="288">
<Canvas Grid.Row="1" Height="338">
<Image
Name="wizard"
Canvas.Right="30"
Expand All @@ -156,7 +156,7 @@
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page1_Title}" />
Text="{DynamicResource Welcome_Page1_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock
Margin="0 10 24 0"
FontSize="14"
Expand Down
10 changes: 5 additions & 5 deletions Flow.Launcher/Resources/Pages/WelcomePage2.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="250" />
<RowDefinition />
<RowDefinition Height="340"/>
</Grid.RowDefinitions>

<Border Grid.Row="0" HorizontalAlignment="Stretch">
Expand Down Expand Up @@ -89,12 +89,12 @@
</StackPanel>
</Border>

<StackPanel Grid.Row="1" Margin="24 20 24 20">
<StackPanel>
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
<StackPanel Margin="24 20 24 20">
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page2_Title}" />
Text="{DynamicResource Welcome_Page2_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock
Margin="0 10 0 0"
FontSize="14"
Expand All @@ -119,7 +119,7 @@
WindowTitle="{DynamicResource flowlauncherHotkey}" />
</StackPanel>

</StackPanel>
</ScrollViewer>
</Grid>
</ScrollViewer>
</ui:Page>
2 changes: 1 addition & 1 deletion Flow.Launcher/Resources/Pages/WelcomePage4.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page4_Title}" />
Text="{DynamicResource Welcome_Page4_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock
Margin="0 10 0 10"
FontSize="14"
Expand Down
10 changes: 5 additions & 5 deletions Flow.Launcher/Resources/Pages/WelcomePage5.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="250" />
<RowDefinition />
<RowDefinition Height="340"/>
</Grid.RowDefinitions>

<Border Grid.Row="0" HorizontalAlignment="Stretch">
Expand All @@ -79,18 +79,18 @@
</StackPanel>
</Border>

<StackPanel Grid.Row="1" Margin="24 20 24 20">
<StackPanel Grid.Row="1" Margin="24 20 24 20" >
<StackPanel>
<TextBlock
FontSize="20"
FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page5_Title}" />
Text="{DynamicResource Welcome_Page5_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock
Margin="0 10 0 0"
FontSize="14"
Text="{DynamicResource Welcome_Page5_Text01}"
TextWrapping="WrapWithOverflow" />
<StackPanel Margin="0 30 0 0" Orientation="Horizontal">
<StackPanel Margin="0 20 0 0" Orientation="Horizontal">
<CheckBox
Checked="OnAutoStartupChecked"
Content="{DynamicResource startFlowLauncherOnSystemStartup}"
Expand All @@ -109,7 +109,7 @@
<Button
Width="150"
Height="40"
Margin="0 60 0 0"
Margin="0 102 0 0"
HorizontalAlignment="Right"
Click="BtnCancel_OnClick"
Content="{DynamicResource done}"
Expand Down
2 changes: 2 additions & 0 deletions Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ private void UpdateEnumDropdownLocalizations()
DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
// Since we are using Binding instead of DynamicResource, we need to manually trigger the update
OnPropertyChanged(nameof(AlwaysPreviewToolTip));
}

public string Language
Expand Down
3 changes: 1 addition & 2 deletions Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
Title="{DynamicResource AlwaysPreview}"
Margin="0 14 0 0"
Icon="&#xe8a1;"
Sub="{DynamicResource AlwaysPreviewToolTip}">
Sub="{Binding AlwaysPreviewToolTip}">
<ui:ToggleSwitch
IsOn="{Binding Settings.AlwaysPreview}"
OffContent="{DynamicResource disable}"
Expand Down Expand Up @@ -352,7 +352,6 @@
Title="{DynamicResource KoreanImeTitle}"
Margin="0 14 0 0"
Closable="False"
DataContext="{Binding RelativeSource={RelativeSource AncestorType=Border}, Path=DataContext}"
IsIconVisible="True"
Length="Long"
Message="{DynamicResource KoreanImeGuide}"
Expand Down
6 changes: 3 additions & 3 deletions Flow.Launcher/WelcomeWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
Name="FlowWelcomeWindow"
Title="{DynamicResource Welcome_Page1_Title}"
Width="550"
Height="650"
Height="700"
MinWidth="550"
MinHeight="650"
MinHeight="700"
MaxWidth="550"
MaxHeight="650"
MaxHeight="700"
d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}"
Activated="OnActivated"
Background="{DynamicResource Color00B}"
Expand Down
Loading