mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Refactor ActionKeywords UI and improve keyword handling
Updated `ActionKeywords.xaml` to use a new `Grid` layout, enhancing the structure and flexibility of the UI. Removed a couple of layers of nested grids and stackpanels. Changed tbOldActionKeyword from a TextBlock to a TextBox so user can copy the text. Modified `ActionKeywords.xaml.cs` so the old keywords are already filled in, in the TextBox.
This commit is contained in:
Stefan Roelofs
parent
34f2b7d7f7
commit
9d5a58c395
2 changed files with 115 additions and 113 deletions
|
|
@ -14,102 +14,101 @@
|
||||||
<WindowChrome.WindowChrome>
|
<WindowChrome.WindowChrome>
|
||||||
<WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
|
<WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
|
||||||
</WindowChrome.WindowChrome>
|
</WindowChrome.WindowChrome>
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
|
<RowDefinition />
|
||||||
<RowDefinition />
|
<RowDefinition />
|
||||||
<RowDefinition Height="80" />
|
<RowDefinition Height="80" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid>
|
<Grid.ColumnDefinitions>
|
||||||
<StackPanel Grid.Row="0">
|
<ColumnDefinition Width="Auto" />
|
||||||
<StackPanel>
|
<ColumnDefinition Width="*" />
|
||||||
<Grid>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<Button
|
|
||||||
Grid.Column="4"
|
|
||||||
Click="BtnCancel_OnClick"
|
|
||||||
Style="{StaticResource TitleBarCloseButtonStyle}">
|
|
||||||
<Path
|
|
||||||
Width="46"
|
|
||||||
Height="32"
|
|
||||||
Data="M 18,11 27,20 M 18,20 27,11"
|
|
||||||
Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
|
|
||||||
StrokeThickness="1">
|
|
||||||
<Path.Style>
|
|
||||||
<Style TargetType="Path">
|
|
||||||
<Style.Triggers>
|
|
||||||
<DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
|
|
||||||
<Setter Property="Opacity" Value="0.5" />
|
|
||||||
</DataTrigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
|
||||||
</Path.Style>
|
|
||||||
</Path>
|
|
||||||
</Button>
|
|
||||||
</Grid>
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Margin="26 12 26 0">
|
|
||||||
<StackPanel Grid.Row="0" Margin="0 0 0 12">
|
|
||||||
<TextBlock
|
|
||||||
Grid.Column="0"
|
|
||||||
Margin="0 0 0 0"
|
|
||||||
FontSize="20"
|
|
||||||
FontWeight="SemiBold"
|
|
||||||
Text="{DynamicResource actionKeywordsTitle}"
|
|
||||||
TextAlignment="Left" />
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel>
|
|
||||||
<TextBlock
|
|
||||||
FontSize="14"
|
|
||||||
Text="{DynamicResource actionkeyword_tips}"
|
|
||||||
TextAlignment="Left"
|
|
||||||
TextWrapping="WrapWithOverflow" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<StackPanel Margin="0 18 0 0" Orientation="Horizontal">
|
<Button
|
||||||
<TextBlock
|
Grid.Row="0"
|
||||||
Grid.Row="0"
|
Grid.Column="1"
|
||||||
Grid.Column="1"
|
HorizontalAlignment="Right"
|
||||||
HorizontalAlignment="Left"
|
Click="BtnCancel_OnClick"
|
||||||
VerticalAlignment="Center"
|
Style="{StaticResource TitleBarCloseButtonStyle}">
|
||||||
FontSize="14"
|
<Path
|
||||||
Text="{DynamicResource currentActionKeywords}" />
|
Width="46"
|
||||||
<TextBlock
|
Height="32"
|
||||||
x:Name="tbOldActionKeyword"
|
Data="M 18,11 27,20 M 18,20 27,11"
|
||||||
Grid.Row="0"
|
Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
|
||||||
Grid.Column="1"
|
StrokeThickness="1">
|
||||||
Margin="14 10 10 10"
|
<Path.Style>
|
||||||
HorizontalAlignment="Left"
|
<Style TargetType="Path">
|
||||||
VerticalAlignment="Center"
|
<Style.Triggers>
|
||||||
FontSize="14"
|
<DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
|
||||||
FontWeight="SemiBold"
|
<Setter Property="Opacity" Value="0.5" />
|
||||||
Foreground="{DynamicResource Color05B}" />
|
</DataTrigger>
|
||||||
</StackPanel>
|
</Style.Triggers>
|
||||||
<StackPanel Margin="0 0 0 10" Orientation="Horizontal">
|
</Style>
|
||||||
<TextBlock
|
</Path.Style>
|
||||||
Grid.Row="1"
|
</Path>
|
||||||
Grid.Column="1"
|
</Button>
|
||||||
HorizontalAlignment="Left"
|
|
||||||
VerticalAlignment="Center"
|
<TextBlock
|
||||||
FontSize="14"
|
|
||||||
Text="{DynamicResource newActionKeyword}" />
|
|
||||||
<TextBox
|
|
||||||
x:Name="tbAction"
|
|
||||||
Width="105"
|
|
||||||
Margin="10 10 15 10"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
VerticalAlignment="Center" />
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
|
||||||
<Border
|
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
Margin="26 12 26 12"
|
||||||
|
FontSize="20"
|
||||||
|
FontWeight="SemiBold"
|
||||||
|
Text="{DynamicResource actionKeywordsTitle}"
|
||||||
|
TextAlignment="Left" />
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
Margin="26 0 26 18"
|
||||||
|
FontSize="14"
|
||||||
|
Text="{DynamicResource actionkeyword_tips}"
|
||||||
|
TextAlignment="Left"
|
||||||
|
TextWrapping="WrapWithOverflow" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="3"
|
||||||
|
Grid.Column="0"
|
||||||
|
Margin="26 0 10 0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontSize="14"
|
||||||
|
Text="{DynamicResource currentActionKeywords}" />
|
||||||
|
<TextBox
|
||||||
|
x:Name="tbOldActionKeyword"
|
||||||
|
Grid.Row="3"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="10 10 26 10"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontSize="14"
|
||||||
|
FontWeight="SemiBold"
|
||||||
|
Foreground="{DynamicResource Color05B}"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="List of old keyword(s)" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="4"
|
||||||
|
Grid.Column="0"
|
||||||
|
Margin="26 0 10 0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontSize="14"
|
||||||
|
Text="{DynamicResource newActionKeyword}" />
|
||||||
|
<TextBox
|
||||||
|
x:Name="tbAction"
|
||||||
|
Grid.Row="4"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="10 10 26 10"
|
||||||
|
VerticalAlignment="Center" />
|
||||||
|
|
||||||
|
<Border
|
||||||
|
Grid.Row="5"
|
||||||
|
Grid.Column="0"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
Background="{DynamicResource PopupButtonAreaBGColor}"
|
Background="{DynamicResource PopupButtonAreaBGColor}"
|
||||||
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
|
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
|
||||||
BorderThickness="0 1 0 0">
|
BorderThickness="0 1 0 0">
|
||||||
|
|
@ -118,14 +117,14 @@
|
||||||
x:Name="btnCancel"
|
x:Name="btnCancel"
|
||||||
Width="145"
|
Width="145"
|
||||||
Height="30"
|
Height="30"
|
||||||
Margin="10 0 5 0"
|
Margin="10 0 10 0"
|
||||||
Click="BtnCancel_OnClick"
|
Click="BtnCancel_OnClick"
|
||||||
Content="{DynamicResource cancel}" />
|
Content="{DynamicResource cancel}" />
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnDone"
|
x:Name="btnDone"
|
||||||
Width="145"
|
Width="145"
|
||||||
Height="30"
|
Height="30"
|
||||||
Margin="5 0 10 0"
|
Margin="10 0 10 0"
|
||||||
Click="btnDone_OnClick"
|
Click="btnDone_OnClick"
|
||||||
Style="{StaticResource AccentButtonStyle}">
|
Style="{StaticResource AccentButtonStyle}">
|
||||||
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
|
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,9 @@ namespace Flow.Launcher
|
||||||
|
|
||||||
private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
|
private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords.ToArray());
|
tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords);
|
||||||
|
tbAction.Text = tbOldActionKeyword.Text;
|
||||||
|
tbAction.SelectAll();
|
||||||
tbAction.Focus();
|
tbAction.Focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -33,38 +35,39 @@ namespace Flow.Launcher
|
||||||
{
|
{
|
||||||
var oldActionKeywords = _plugin.Metadata.ActionKeywords;
|
var oldActionKeywords = _plugin.Metadata.ActionKeywords;
|
||||||
|
|
||||||
var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator).ToList();
|
var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator)
|
||||||
newActionKeywords.RemoveAll(string.IsNullOrEmpty);
|
.Where(s => !string.IsNullOrEmpty(s))
|
||||||
newActionKeywords = newActionKeywords.Distinct().ToList();
|
.Distinct()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
newActionKeywords = newActionKeywords.Count > 0 ? newActionKeywords : new() { Query.GlobalPluginWildcardSign };
|
newActionKeywords = newActionKeywords.Count > 0 ? newActionKeywords : new() { Query.GlobalPluginWildcardSign };
|
||||||
|
|
||||||
var addedActionKeywords = newActionKeywords.Except(oldActionKeywords).ToList();
|
var addedActionKeywords = newActionKeywords.Except(oldActionKeywords).ToList();
|
||||||
var removedActionKeywords = oldActionKeywords.Except(newActionKeywords).ToList();
|
var removedActionKeywords = oldActionKeywords.Except(newActionKeywords).ToList();
|
||||||
if (!addedActionKeywords.Any(App.API.ActionKeywordAssigned))
|
|
||||||
|
if (addedActionKeywords.Any(App.API.ActionKeywordAssigned))
|
||||||
{
|
{
|
||||||
if (oldActionKeywords.Count != newActionKeywords.Count)
|
App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
|
||||||
{
|
return;
|
||||||
ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var sortedOldActionKeywords = oldActionKeywords.OrderBy(s => s).ToList();
|
if (oldActionKeywords.Count != newActionKeywords.Count)
|
||||||
var sortedNewActionKeywords = newActionKeywords.OrderBy(s => s).ToList();
|
{
|
||||||
|
ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
|
var sortedOldActionKeywords = oldActionKeywords.OrderBy(s => s).ToList();
|
||||||
{
|
var sortedNewActionKeywords = newActionKeywords.OrderBy(s => s).ToList();
|
||||||
// User just changes the sequence of action keywords
|
|
||||||
App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
|
if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
|
||||||
}
|
{
|
||||||
else
|
// User just changes the sequence of action keywords
|
||||||
{
|
App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
|
||||||
ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
|
ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue