diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index cae5d977f..7c747ae36 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -134,6 +134,16 @@ namespace Flow.Launcher.Infrastructure.UserSettings OnPropertyChanged(); } } + string _placeholderText { get; set; } = string.Empty; + public string PlaceholderText + { + get => _placeholderText; + set + { + _placeholderText = value; + OnPropertyChanged(); + } + } public int CustomExplorerIndex { get; set; } = 0; diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 656431e78..a9c5ab49f 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -202,8 +202,10 @@ Mica Alt This theme supports two(light/dark) modes. This theme supports Blur Transparent Background. - Placeholder Text - Display placeholder text when query is empty + Show placeholder + Display placeholder when query is empty + Placeholder text + Change placeholder text. Input empty will use: Type here to search Allow window size change Allow dragging the search window edges to change its size diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index b9e355e2f..82ac63b7d 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -224,7 +224,7 @@ FontSize="{Binding QueryBoxFontSize, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False" Style="{DynamicResource QuerySuggestionBoxStyle}" - Text="{DynamicResource queryTextBoxSuggestion}" + Text="{Binding PlaceholderText, Mode=OneWay}" Visibility="Collapsed" /> Settings.ShowPlaceholder = value; } + public string PlaceholderText + { + get => Settings.PlaceholderText; + set => Settings.PlaceholderText = value; + } + public bool UseClock { get => Settings.UseClock; diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml index 3abf46f09..462ea799e 100644 --- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml +++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml @@ -70,6 +70,7 @@ + - - - + + + + + + + + + diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs index c69fc4484..ec5b52c9d 100644 --- a/Flow.Launcher/ViewModel/MainViewModel.cs +++ b/Flow.Launcher/ViewModel/MainViewModel.cs @@ -765,6 +765,24 @@ namespace Flow.Launcher.ViewModel public double ClockPanelOpacity { get; set; } = 1; public double SearchIconOpacity { get; set; } = 1; + private string _placeholderText; + public string PlaceholderText + { + get => _placeholderText; + set + { + if (string.IsNullOrEmpty(value)) + { + _placeholderText = App.API.GetTranslation("queryTextBoxSuggestion"); + } + else + { + _placeholderText = value; + } + OnPropertyChanged(); + } + } + public double MainWindowWidth { get => Settings.WindowSize;