Skip to content

Change hardcoded text to string #1610

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 3 commits into from
Dec 9, 2022
Merged

Change hardcoded text to string #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2b8118
Change Hardcoded Text to string
onesounds Dec 8, 2022
649b55f
Changed Hardcoded Text in WelcomeWindow Title
onesounds Dec 8, 2022
d34f1a3
Fix WelcomeWindowTitle
onesounds Dec 9, 2022
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
2 changes: 1 addition & 1 deletion Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ private Result ContextMenuTopMost(Result result)
Action = _ =>
{
_topMostRecord.AddOrUpdate(result);
App.API.ShowMsg("Success");
App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));
return false;
}
};
Expand Down
8 changes: 4 additions & 4 deletions Flow.Launcher/WelcomeWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Name="FlowWelcomeWindow"
Title="Welcome to Flow Launcher"
Activated="OnActivated"
Title="{DynamicResource Welcome_Page1_Title}"
Width="550"
Height="650"
MouseDown="window_MouseDown"
Activated="OnActivated"
Copy link
Member

@taooceros taooceros Dec 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this change?

Copy link
Contributor Author

@onesounds onesounds Dec 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by XamlStyler. activated and mouse down code both exist.

Copy link
Member

@jjw24 jjw24 Dec 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@onesounds have you tested welcome window is ok with this change?

Copy link
Contributor Author

@onesounds onesounds Dec 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I'm sure. I thought I didn't modify the title of the window, so I committed it once more, but it was correct that I modified it.

Background="{DynamicResource Color00B}"
Foreground="{DynamicResource PopupTextColor}"
MouseDown="window_MouseDown"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<!--#region TitleBar-->
Expand Down Expand Up @@ -48,7 +48,7 @@
VerticalAlignment="Center"
FontSize="12"
Foreground="{DynamicResource Color05B}"
Text="Welcome to Flow Launcher" />
Text="{DynamicResource Welcome_Page1_Title}" />

<Button
Grid.Column="4"
Expand Down