Skip to content

Commit 6f093cf

Browse files
Jack251970Jack251970
authored
Merge branch 'dev' into 250223FluentTest2
2 parents 9a6175e + eb2a24d commit 6f093cf

File tree

13 files changed

+598
-180
lines changed

13 files changed

+598
-180
lines changed

‎Flow.Launcher/MainWindow.xaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@
331331
HorizontalAlignment="Center"
332332
VerticalAlignment="Bottom"
333333
StrokeThickness="2"
334-
Style="{DynamicResource PendingLineStyle}"
335334
Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
336335
X1="-100"
337336
X2="0"
@@ -377,8 +376,8 @@
377376
HorizontalAlignment="Stretch"
378377
Style="{DynamicResource SeparatorStyle}" />
379378
</ContentControl>
380-
381379
</Grid>
380+
382381
<Border Style="{DynamicResource WindowRadius}">
383382
<Border.Clip>
384383
<MultiBinding Converter="{StaticResource BorderClipConverter}">

‎Flow.Launcher/MainWindow.xaml.cs‎

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@
2929
using Windows.Win32;
3030
using Window = System.Windows.Window;
3131
using System.Linq;
32+
using System.Windows.Shapes;
3233

3334
namespace Flow.Launcher
3435
{
3536
public partial class MainWindow
3637
{
3738
#region Private Fields
38-
39+
3940
private readonly Storyboard _progressBarStoryboard = new Storyboard();
4041
private bool isProgressBarStoryboardPaused;
4142
private readonly Settings _settings;
@@ -65,21 +66,15 @@ public MainWindow(Settings settings, MainViewModel mainVM)
6566

6667
InitSoundEffects();
6768
DataObject.AddPastingHandler(QueryTextBox, OnPaste);
68-
this.Loaded += (_, _) =>
69+
70+
Loaded += (_, _) =>
6971
{
7072
var handle = new WindowInteropHelper(this).Handle;
7173
var win = HwndSource.FromHwnd(handle);
7274
win.AddHook(WndProc);
7375
};
7476
}
7577

76-
DispatcherTimer timer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 0, 0, 500), IsEnabled = false };
77-
78-
public MainWindow()
79-
{
80-
InitializeComponent();
81-
}
82-
8378
private int _initialWidth;
8479
private int _initialHeight;
8580

@@ -229,39 +224,9 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
229224
_viewModel.LastQuerySelected = true;
230225
}
231226

232-
if (_viewModel.ProgressBarVisibility == Visibility.Visible &&
233-
isProgressBarStoryboardPaused)
234-
{
235-
_progressBarStoryboard.Begin(ProgressBar, true);
236-
isProgressBarStoryboardPaused = false;
237-
}
238-
239227
if (_settings.UseAnimation)
240228
WindowAnimator();
241229
}
242-
else if (!isProgressBarStoryboardPaused)
243-
{
244-
_progressBarStoryboard.Stop(ProgressBar);
245-
isProgressBarStoryboardPaused = true;
246-
}
247-
});
248-
break;
249-
}
250-
case nameof(MainViewModel.ProgressBarVisibility):
251-
{
252-
Dispatcher.Invoke(() =>
253-
{
254-
if (_viewModel.ProgressBarVisibility == Visibility.Hidden && !isProgressBarStoryboardPaused)
255-
{
256-
_progressBarStoryboard.Stop(ProgressBar);
257-
isProgressBarStoryboardPaused = true;
258-
}
259-
else if (_viewModel.MainWindowVisibilityStatus &&
260-
isProgressBarStoryboardPaused)
261-
{
262-
_progressBarStoryboard.Begin(ProgressBar, true);
263-
isProgressBarStoryboardPaused = false;
264-
}
265230
});
266231
break;
267232
}
@@ -381,7 +346,6 @@ private void InitializeNotifyIcon()
381346
Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
382347
Visible = !_settings.HideNotifyIcon
383348
};
384-
385349
var openIcon = new FontIcon { Glyph = "\ue71e" };
386350
var open = new MenuItem
387351
{
@@ -392,7 +356,8 @@ private void InitializeNotifyIcon()
392356
var gamemodeIcon = new FontIcon { Glyph = "\ue7fc" };
393357
var gamemode = new MenuItem
394358
{
395-
Header = InternationalizationManager.Instance.GetTranslation("GameMode"), Icon = gamemodeIcon
359+
Header = InternationalizationManager.Instance.GetTranslation("GameMode"),
360+
Icon = gamemodeIcon
396361
};
397362
var positionresetIcon = new FontIcon { Glyph = "\ue73f" };
398363
var positionreset = new MenuItem
@@ -409,7 +374,8 @@ private void InitializeNotifyIcon()
409374
var exitIcon = new FontIcon { Glyph = "\ue7e8" };
410375
var exit = new MenuItem
411376
{
412-
Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit"), Icon = exitIcon
377+
Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit"),
378+
Icon = exitIcon
413379
};
414380

415381
open.Click += (o, e) => _viewModel.ToggleFlowLauncher();
@@ -476,17 +442,49 @@ private async void PositionReset()
476442

477443
private void InitProgressbarAnimation()
478444
{
445+
var progressBarStoryBoard = new Storyboard();
446+
479447
var da = new DoubleAnimation(ProgressBar.X2, ActualWidth + 100,
480448
new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
481449
var da1 = new DoubleAnimation(ProgressBar.X1, ActualWidth + 0,
482450
new Duration(new TimeSpan(0, 0, 0, 0, 1600)));
483451
Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)"));
484452
Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)"));
485-
_progressBarStoryboard.Children.Add(da);
486-
_progressBarStoryboard.Children.Add(da1);
487-
_progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever;
453+
progressBarStoryBoard.Children.Add(da);
454+
progressBarStoryBoard.Children.Add(da1);
455+
progressBarStoryBoard.RepeatBehavior = RepeatBehavior.Forever;
456+
457+
da.Freeze();
458+
da1.Freeze();
459+
460+
const string progressBarAnimationName = "ProgressBarAnimation";
461+
var beginStoryboard = new BeginStoryboard
462+
{
463+
Name = progressBarAnimationName, Storyboard = progressBarStoryBoard
464+
};
465+
466+
var stopStoryboard = new StopStoryboard()
467+
{
468+
BeginStoryboardName = progressBarAnimationName
469+
};
470+
471+
var trigger = new Trigger
472+
{
473+
Property = VisibilityProperty, Value = Visibility.Visible
474+
};
475+
trigger.EnterActions.Add(beginStoryboard);
476+
trigger.ExitActions.Add(stopStoryboard);
477+
478+
var progressStyle = new Style(typeof(Line))
479+
{
480+
BasedOn = FindResource("PendingLineStyle") as Style
481+
};
482+
progressStyle.RegisterName(progressBarAnimationName, beginStoryboard);
483+
progressStyle.Triggers.Add(trigger);
484+
485+
ProgressBar.Style = progressStyle;
486+
488487
_viewModel.ProgressBarVisibility = Visibility.Hidden;
489-
isProgressBarStoryboardPaused = true;
490488
}
491489

492490
public void ResetAnimation()

‎Plugins/Flow.Launcher.Plugin.Sys/Command.cs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
using System.Text.Json.Serialization;
2+
3+
namespace Flow.Launcher.Plugin.Sys
4+
{
5+
public class Command : BaseModel
6+
{
7+
public string Key { get; set; }
8+
9+
private string name;
10+
[JsonIgnore]
11+
public string Name
12+
{
13+
get => name;
14+
set
15+
{
16+
name = value;
17+
OnPropertyChanged();
18+
}
19+
}
20+
21+
private string description;
22+
[JsonIgnore]
23+
public string Description
24+
{
25+
get => description;
26+
set
27+
{
28+
description = value;
29+
OnPropertyChanged();
30+
}
31+
}
32+
33+
private string keyword;
34+
public string Keyword
35+
{
36+
get => keyword;
37+
set
38+
{
39+
keyword = value;
40+
OnPropertyChanged();
41+
}
42+
}
43+
}
44+
}

‎Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<Window
2+
x:Class="Flow.Launcher.Plugin.Sys.CommandKeywordSettingWindow"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
Title="{DynamicResource lowlauncher_plugin_sys_command_keyword_setting_window_title}"
8+
Width="550"
9+
Background="{DynamicResource PopupBGColor}"
10+
Foreground="{DynamicResource PopupTextColor}"
11+
ResizeMode="NoResize"
12+
SizeToContent="Height"
13+
WindowStartupLocation="CenterScreen"
14+
mc:Ignorable="d">
15+
<WindowChrome.WindowChrome>
16+
<WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
17+
</WindowChrome.WindowChrome>
18+
<Grid>
19+
<Grid.RowDefinitions>
20+
<RowDefinition />
21+
<RowDefinition Height="80" />
22+
</Grid.RowDefinitions>
23+
24+
<StackPanel Grid.Row="0">
25+
<StackPanel>
26+
<Grid>
27+
<Grid.ColumnDefinitions>
28+
<ColumnDefinition Width="*" />
29+
<ColumnDefinition Width="Auto" />
30+
</Grid.ColumnDefinitions>
31+
<Button
32+
Grid.Column="1"
33+
Click="OnCancelButtonClick"
34+
Style="{StaticResource TitleBarCloseButtonStyle}">
35+
<Path
36+
Width="46"
37+
Height="32"
38+
Data="M 18,11 27,20 M 18,20 27,11"
39+
Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
40+
StrokeThickness="1">
41+
<Path.Style>
42+
<Style TargetType="Path">
43+
<Style.Triggers>
44+
<DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
45+
<Setter Property="Opacity" Value="0.5" />
46+
</DataTrigger>
47+
</Style.Triggers>
48+
</Style>
49+
</Path.Style>
50+
</Path>
51+
</Button>
52+
</Grid>
53+
</StackPanel>
54+
<StackPanel Margin="26 12 26 0">
55+
<StackPanel Margin="0 0 0 12">
56+
<TextBlock
57+
Grid.Column="0"
58+
Margin="0 0 0 0"
59+
FontSize="20"
60+
FontWeight="SemiBold"
61+
Text="{DynamicResource flowlauncher_plugin_sys_custom_command_keyword}"
62+
TextAlignment="Left" />
63+
</StackPanel>
64+
65+
<StackPanel>
66+
<TextBlock
67+
x:Name="CommandKeywordTips"
68+
FontSize="14"
69+
TextAlignment="Left"
70+
TextWrapping="WrapWithOverflow" />
71+
</StackPanel>
72+
73+
<Grid Margin="0 24 0 24">
74+
<Grid.ColumnDefinitions>
75+
<ColumnDefinition Width="Auto" />
76+
<ColumnDefinition Width="*" />
77+
<ColumnDefinition Width="Auto" />
78+
</Grid.ColumnDefinitions>
79+
<TextBlock
80+
Grid.Column="0"
81+
HorizontalAlignment="Right"
82+
VerticalAlignment="Center"
83+
FontSize="14"
84+
Text="{DynamicResource flowlauncher_plugin_sys_command_keyword}" />
85+
<TextBox
86+
x:Name="CommandKeyword"
87+
Grid.Column="1"
88+
Margin="10"
89+
HorizontalAlignment="Stretch" />
90+
<Button
91+
x:Name="btnTestActionKeyword"
92+
Grid.Row="1"
93+
Grid.Column="2"
94+
Margin="0 0 10 0"
95+
Padding="10 5 10 5"
96+
Click="OnResetButtonClick"
97+
Content="{DynamicResource flowlauncher_plugin_sys_reset}" />
98+
</Grid>
99+
</StackPanel>
100+
</StackPanel>
101+
<Border
102+
Grid.Row="1"
103+
Background="{DynamicResource PopupButtonAreaBGColor}"
104+
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
105+
BorderThickness="0 1 0 0">
106+
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
107+
<Button
108+
MinWidth="140"
109+
Margin="10 0 5 0"
110+
Click="OnCancelButtonClick"
111+
Content="{DynamicResource flowlauncher_plugin_sys_cancel}" />
112+
<Button
113+
MinWidth="140"
114+
Margin="5 0 10 0"
115+
Click="OnConfirmButtonClick"
116+
Content="{DynamicResource flowlauncher_plugin_sys_confirm}"
117+
Style="{DynamicResource AccentButtonStyle}" />
118+
</StackPanel>
119+
</Border>
120+
</Grid>
121+
</Window>

‎Plugins/Flow.Launcher.Plugin.Sys/CommandKeywordSetting.xaml.cs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System.Windows;
2+
3+
namespace Flow.Launcher.Plugin.Sys
4+
{
5+
public partial class CommandKeywordSettingWindow
6+
{
7+
private readonly Command _oldSearchSource;
8+
private readonly PluginInitContext _context;
9+
10+
public CommandKeywordSettingWindow(PluginInitContext context, Command old)
11+
{
12+
_context = context;
13+
_oldSearchSource = old;
14+
InitializeComponent();
15+
CommandKeyword.Text = old.Keyword;
16+
CommandKeywordTips.Text = string.Format(_context.API.GetTranslation("flowlauncher_plugin_sys_custom_command_keyword_tip"), old.Name);
17+
}
18+
19+
private void OnCancelButtonClick(object sender, RoutedEventArgs e)
20+
{
21+
Close();
22+
}
23+
24+
private void OnConfirmButtonClick(object sender, RoutedEventArgs e)
25+
{
26+
var keyword = CommandKeyword.Text;
27+
if (string.IsNullOrEmpty(keyword))
28+
{
29+
var warning = _context.API.GetTranslation("flowlauncher_plugin_sys_input_command_keyword");
30+
_context.API.ShowMsgBox(warning);
31+
}
32+
else
33+
{
34+
_oldSearchSource.Keyword = keyword;
35+
Close();
36+
}
37+
}
38+
39+
private void OnResetButtonClick(object sender, RoutedEventArgs e)
40+
{
41+
// Key is the default value of this command
42+
CommandKeyword.Text = _oldSearchSource.Key;
43+
}
44+
}
45+
}

0 commit comments

Comments
 (0)