Hide Apps Path & Adjust program plugin setting panel

Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml

@@ -1,22 +1,132 @@
-<Window x:Class="Flow.Launcher.Plugin.Program.AddProgramSource"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             Width="400"
-             Height="130"
-             WindowStartupLocation="CenterScreen">
+<Window
+    x:Class="Flow.Launcher.Plugin.Program.AddProgramSource"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource flowlauncher_plugin_program_directory}"
+    Width="400"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="80" />
+        </Grid.RowDefinitions>
+
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <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 Margin="0,0,0,12">
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="0,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource flowlauncher_plugin_program_directory}"
+                        TextAlignment="Left" />
+                </StackPanel>
+                <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                    <TextBox
+                        Name="Directory"
+                        Width="268"
+                        Margin="0,7"
+                        VerticalAlignment="Center" />
+                    <Button
+                        Width="70"
+                        Margin="10"
+                        HorizontalAlignment="Right"
+                        Click="BrowseButton_Click"
+                        Content="{DynamicResource flowlauncher_plugin_program_browse}" />
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Margin="0,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+
+                <Button
+                    Width="100"
+                    Margin="5,0,0,0"
+                    HorizontalAlignment="Right"
+                    Click="ButtonAdd_OnClick"
+                    Content="{DynamicResource flowlauncher_plugin_program_update}" />
+            </StackPanel>
+        </Border>
+    </Grid>
+    <!--
     <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal">
-            <Label Content="{DynamicResource flowlauncher_plugin_program_directory}" Margin="15,10"/>
-            <TextBox Name="Directory" VerticalAlignment="Center" Width="278" Margin="10,7" />
+            <Label Margin="15,10" Content="{DynamicResource flowlauncher_plugin_program_directory}" />
+            <TextBox
+                Name="Directory"
+                Width="278"
+                Margin="10,7"
+                VerticalAlignment="Center" />
         </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Click="BrowseButton_Click" Content="{DynamicResource flowlauncher_plugin_program_browse}" 
-                HorizontalAlignment="Right" Margin="10" Height="31" Width="70"   />
-            <Button Click="ButtonAdd_OnClick"  Content="{DynamicResource flowlauncher_plugin_program_update}" 
-                HorizontalAlignment="Right" Margin="10" Height="31" Width="70"  />
+        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+            <Button
+                Width="70"
+                Height="31"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Click="BrowseButton_Click"
+                Content="{DynamicResource flowlauncher_plugin_program_browse}" />
+            <Button
+                Width="70"
+                Height="31"
+                Margin="10"
+                HorizontalAlignment="Right"
+                Click="ButtonAdd_OnClick"
+                Content="{DynamicResource flowlauncher_plugin_program_update}" />
         </StackPanel>
     </StackPanel>
+    -->
 </Window>

Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs

@@ -42,6 +42,11 @@ private void BrowseButton_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
         private void ButtonAdd_OnClick(object sender, RoutedEventArgs e)
         {
             string s = Directory.Text;

Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml

@@ -1,8 +1,9 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <!--Program setting-->
+    <!--  Program setting  -->
     <system:String x:Key="flowlauncher_plugin_program_delete">Delete</system:String>
     <system:String x:Key="flowlauncher_plugin_program_edit">Edit</system:String>
     <system:String x:Key="flowlauncher_plugin_program_add">Add</system:String>
@@ -16,12 +17,14 @@
     <system:String x:Key="flowlauncher_plugin_program_index_start_tooltip">When enabled, Flow will load programs from the start menu</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_registry">Index Registry</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_registry_tooltip">When enabled, Flow will load programs from the registry</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_enable_description">Enable Program Description</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_hidelnkpath">Hide app path</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_hidelnkpath_tooltip">For executable files such as UWP or lnk, hide the file path from being visible</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_description">Search in Program Description</system:String>
     <system:String x:Key="flowlauncher_plugin_program_enable_description_tooltip">Disabling this will also stop Flow from searching via the program desciption</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_header">Suffixes</system:String>
     <system:String x:Key="flowlauncher_plugin_program_max_depth_header">Max Depth</system:String>
 
-    <system:String x:Key="flowlauncher_plugin_program_directory">Directory:</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_directory">Directory</system:String>
     <system:String x:Key="flowlauncher_plugin_program_browse">Browse</system:String>
     <system:String x:Key="flowlauncher_plugin_program_file_suffixes">File Suffixes:</system:String>
     <system:String x:Key="flowlauncher_plugin_program_max_search_depth">Maximum Search Depth (-1 is unlimited):</system:String>
@@ -30,8 +33,7 @@
     <system:String x:Key="flowlauncher_plugin_program_delete_program_source">Are you sure you want to delete the selected program sources?</system:String>
 
     <system:String x:Key="flowlauncher_plugin_program_update">OK</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_only_index_tip">Flow Launcher will only index files that end with the following suffixes:</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_split_by_tip">(Each suffix should split by ';' )</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_only_index_tip">Flow Launcher will only index files that end with the following suffixes. (Each suffix should split by ';' )</system:String>
     <system:String x:Key="flowlauncher_plugin_program_update_file_suffixes">Successfully updated file suffixes</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_cannot_empty">File suffixes can't be empty</system:String>
 
@@ -50,7 +52,7 @@
     <system:String x:Key="flowlauncher_plugin_program_tooltip_customizedexplorer">You can customized the explorer used for opening the container folder by inputing the Environmental Variable of the explorer you want to use. It will be useful to use CMD to test whether the Environmental Variable is avaliable.</system:String>
     <system:String x:Key="flowlauncher_plugin_program_tooltip_args">Enter the customized args you want to add for your customized explorer. %s for parent directory, %f for full path (which only works for win32). Check the explorer's website for details.</system:String>
 
-    <!--Dialogs-->
+    <!--  Dialogs  -->
     <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success">Success</system:String>
     <system:String x:Key="flowlauncher_plugin_program_disable_dlgtitle_success_message">Successfully disabled this program from displaying in your query</system:String>
     <system:String x:Key="flowlauncher_plugin_program_run_as_administrator_not_supported_message">This app is not intended to be run as administrator</system:String>

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -147,10 +147,15 @@ public static async Task IndexPrograms()
             var t1 = Task.Run(IndexWin32Programs);
             var t2 = Task.Run(IndexUwpPrograms);
             await Task.WhenAll(t1, t2).ConfigureAwait(false);
+            ResetCache();
+            _settings.LastIndexTime = DateTime.Today;
+        }
+
+        internal static void ResetCache()
+        {
             var oldCache = cache;
             cache = new MemoryCache(cacheOptions);
             oldCache.Dispose();
-            _settings.LastIndexTime = DateTime.Today;
         }
 
         public Control CreateSettingPanel()

Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml

@@ -1,19 +1,101 @@
-<Window x:Class="Flow.Launcher.Plugin.Program.ProgramSuffixes"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-                Width="400"
-                Height="180"
-        WindowStartupLocation="CenterScreen"
-             d:DesignHeight="400" d:DesignWidth="300">
-    <StackPanel>
-        <TextBlock Margin="10 10 0 0" Foreground="Gray" Text="{DynamicResource flowlauncher_plugin_program_only_index_tip}" />
-        <TextBlock Margin="10 10 0 0" Foreground="Gray" Text="{DynamicResource flowlauncher_plugin_program_split_by_tip}" />
-        <TextBox x:Name="tbSuffixes" Margin="10"/>
-        <Button HorizontalAlignment="Right" Height="30" Width="80" Click="ButtonBase_OnClick" Margin="0 0 10 0" Content="{DynamicResource flowlauncher_plugin_program_update}" />
-    </StackPanel>
+<Window
+    x:Class="Flow.Launcher.Plugin.Program.ProgramSuffixes"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource flowlauncher_plugin_program_suffixes}"
+    Width="400"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    ResizeMode="NoResize"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="80" />
+        </Grid.RowDefinitions>
+
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <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 Margin="0,0,0,12">
+                    <TextBlock
+                        Grid.Column="0"
+                        Margin="0,0,0,0"
+                        FontFamily="Segoe UI"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{DynamicResource flowlauncher_plugin_program_suffixes}"
+                        TextAlignment="Left" />
+                </StackPanel>
+                <TextBlock
+                    FontSize="14"
+                    Text="{DynamicResource flowlauncher_plugin_program_only_index_tip}"
+                    TextWrapping="Wrap" />
+                <TextBox x:Name="tbSuffixes" Margin="0,20,0,20" />
+            </StackPanel>
+        </StackPanel>
+        <Border
+            Grid.Row="1"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0,1,0,0">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Height="30"
+                    Margin="0,0,5,0"
+                    Click="BtnCancel_OnClick"
+                    Content="{DynamicResource cancel}" />
+
+                <Button
+                    Width="100"
+                    Height="30"
+                    Margin="5,0,0,0"
+                    HorizontalAlignment="Right"
+                    Click="ButtonBase_OnClick"
+                    Content="{DynamicResource flowlauncher_plugin_program_update}" />
+            </StackPanel>
+        </Border>
+    </Grid>
 </Window>
 
 

Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs

@@ -18,7 +18,10 @@ public ProgramSuffixes(PluginInitContext context, Settings settings)
             _settings = settings;
             tbSuffixes.Text = string.Join(Settings.SuffixSeperator.ToString(), _settings.ProgramSuffixes);
         }
-
+        private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
             var suffixes = tbSuffixes.Text.Split(Settings.SuffixSeperator, StringSplitOptions.RemoveEmptyEntries);

Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs

@@ -314,7 +314,7 @@ public Result Result(string query, IPublicAPI api)
                 var result = new Result
                 {
                     Title = title,
-                    SubTitle = Package.Location,
+                    SubTitle = Main._settings.HideAppsPath ? string.Empty : Package.Location,
                     Icon = Logo,
                     Score = matchResult.Score,
                     TitleHighlightData = matchResult.MatchData,

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -97,7 +97,7 @@ public Result Result(string query, IPublicAPI api)
             var result = new Result
             {
                 Title = title,
-                SubTitle = LnkResolvedPath ?? FullPath,
+                SubTitle = Main._settings.HideAppsPath ? string.Empty : LnkResolvedPath ?? FullPath,
                 IcoPath = IcoPath,
                 Score = matchResult.Score,
                 TitleHighlightData = matchResult.MatchData,

Plugins/Flow.Launcher.Plugin.Program/Settings.cs

@@ -13,7 +13,8 @@ public class Settings
 
         public bool EnableStartMenuSource { get; set; } = true;
 
-        public bool EnableDescription { get; set; } = true;
+        public bool EnableDescription { get; set; } = false;
+        public bool HideAppsPath { get; set; } = true;
         public bool EnableRegistrySource { get; set; } = true;
         public string CustomizedExplorer { get; set; } = Explorer;
         public string CustomizedArgs { get; set; } = ExplorerArgs;