From 12fdeffddd219284833434de95066c8f52b055f9 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 28 Nov 2021 07:37:08 +0900
Subject: [PATCH] Adjust Popup Layout Adjust Button Size

---
 Flow.Launcher/PriorityChangeWindow.xaml       |   2 -
 .../AddProgramSource.xaml                     | 142 ++++++++++++++++--
 .../AddProgramSource.xaml.cs                  |   5 +
 .../Languages/en.xaml                         |   7 +-
 .../ProgramSuffixes.xaml                      | 114 ++++++++++++--
 .../ProgramSuffixes.xaml.cs                   |   5 +-
 .../Views/ProgramSetting.xaml                 | 111 ++++++++------
 7 files changed, 297 insertions(+), 89 deletions(-)

diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index d8fda81e3..408f8a3cd 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -105,14 +105,12 @@
                 <Button
                     x:Name="btnCancel"
                     Width="100"
-                    Height="30"
                     Margin="0,0,5,0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnDone"
                     Width="100"
-                    Height="30"
                     Margin="5,0,0,0"
                     Click="btnDone_OnClick">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
index 3d0f2761b..b31cd7894 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
+++ b/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="10"
+                    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>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs
index 481f6879f..045d363b3 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs
@@ -42,6 +42,11 @@ namespace Flow.Launcher.Plugin.Program
             }
         }
 
+        private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
         private void ButtonAdd_OnClick(object sender, RoutedEventArgs e)
         {
             string s = Directory.Text;
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index 1ea8ecb4b..78dc2e979 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -19,12 +19,12 @@
     <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_hidelnkpath">Hide Apps 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">Enable Program Description</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>
@@ -33,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>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
index 9f0053426..5af43867b 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
+++ b/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>
 
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs
index 6b1f072f1..2a10928e6 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs
@@ -18,7 +18,10 @@ namespace Flow.Launcher.Plugin.Program
             _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);
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 4979bf66a..95074c850 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -5,12 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:program="clr-namespace:Flow.Launcher.Plugin.Program"
-    Height="550"
+    Height="520"
     DataContext="{Binding RelativeSource={RelativeSource Self}}"
     mc:Ignorable="d">
     <Grid Margin="0">
         <Grid.RowDefinitions>
-            <RowDefinition Height="240" />
+            <RowDefinition Height="170" />
             <RowDefinition Height="*" />
             <RowDefinition Height="60" />
         </Grid.RowDefinitions>
@@ -19,38 +19,49 @@
             HorizontalAlignment="Stretch"
             Orientation="Vertical">
             <StackPanel Width="Auto" Orientation="Vertical">
-                <CheckBox
-                    Name="StartMenuEnabled"
-                    Margin="70,10,10,10"
-                    Content="{DynamicResource flowlauncher_plugin_program_index_start}"
-                    IsChecked="{Binding EnableStartMenuSource}"
-                    ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
-                <Separator />
-                <CheckBox
-                    Name="RegistryEnabled"
-                    Margin="70,10,10,10"
-                    Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
-                    IsChecked="{Binding EnableRegistrySource}"
-                    ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
-                <Separator />
-                <CheckBox
-                    Name="HideLnkEnabled"
-                    Margin="70,10,10,10"
-                    Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
-                    IsChecked="{Binding EnableHideLnkPath}"
-                    ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
-                <Separator />
-                <CheckBox
-                    Name="DescriptionEnabled"
-                    Margin="70,10,10,10"
-                    Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
-                    IsChecked="{Binding EnableDescription}"
-                    ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
-                <Separator />
+                <StackPanel Width="Auto" Orientation="Horizontal">
+                    <CheckBox
+                        Name="StartMenuEnabled"
+                        Width="200"
+                        Margin="70,8,10,8"
+                        Content="{DynamicResource flowlauncher_plugin_program_index_start}"
+                        IsChecked="{Binding EnableStartMenuSource}"
+                        ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
+                    <CheckBox
+                        Name="RegistryEnabled"
+                        Margin="70,8,10,8"
+                        Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
+                        IsChecked="{Binding EnableRegistrySource}"
+                        ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
+                </StackPanel>
+
+                <Separator
+                    Height="1"
+                    BorderBrush="{DynamicResource Color03B}"
+                    BorderThickness="1" />
+                <StackPanel Width="Auto" Orientation="Horizontal">
+                    <CheckBox
+                        Name="HideLnkEnabled"
+                        Width="200"
+                        Margin="70,8,10,8"
+                        Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
+                        IsChecked="{Binding EnableHideLnkPath}"
+                        ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
+                    <CheckBox
+                        Name="DescriptionEnabled"
+                        Margin="70,8,10,8"
+                        Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
+                        IsChecked="{Binding EnableDescription}"
+                        ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
+                </StackPanel>
+                <Separator
+                    Height="1"
+                    BorderBrush="{DynamicResource Color03B}"
+                    BorderThickness="1" />
             </StackPanel>
             <StackPanel
                 Width="Auto"
-                Margin="20,6,0,6"
+                Margin="10,6,0,0"
                 HorizontalAlignment="Left"
                 Orientation="Horizontal">
                 <Button
@@ -74,12 +85,30 @@
                     HorizontalAlignment="Right"
                     Click="btnReindex_Click"
                     Content="{DynamicResource flowlauncher_plugin_program_reindex}" />
+                <StackPanel
+                    x:Name="indexingPanel"
+                    HorizontalAlignment="Left"
+                    Orientation="Horizontal"
+                    Visibility="Hidden">
+                    <ProgressBar
+                        x:Name="progressBarIndexing"
+                        Width="80"
+                        Height="20"
+                        IsIndeterminate="True"
+                        Maximum="100"
+                        Minimum="0" />
+                    <TextBlock
+                        Height="20"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Center"
+                        Text="{DynamicResource flowlauncher_plugin_program_indexing}" />
+                </StackPanel>
             </StackPanel>
         </StackPanel>
         <ListView
             x:Name="programSourceView"
             Grid.Row="1"
-            Margin="20,10,20,0"
+            Margin="20,0,20,0"
             AllowDrop="True"
             BorderBrush="DarkGray"
             BorderThickness="1"
@@ -128,24 +157,6 @@
             Grid.Row="2"
             Grid.RowSpan="1"
             Margin="0,0,20,10">
-            <StackPanel
-                x:Name="indexingPanel"
-                HorizontalAlignment="Left"
-                Orientation="Horizontal"
-                Visibility="Hidden">
-                <ProgressBar
-                    x:Name="progressBarIndexing"
-                    Width="80"
-                    Height="20"
-                    IsIndeterminate="True"
-                    Maximum="100"
-                    Minimum="0" />
-                <TextBlock
-                    Height="20"
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Center"
-                    Text="{DynamicResource flowlauncher_plugin_program_indexing}" />
-            </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button
                     x:Name="btnProgramSourceStatus"