From 9e033d1673086d91416d9e73e55c8df0ec76631a Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Fri, 19 Aug 2016 23:24:21 +0100
Subject: [PATCH] rename

---
 .../AddProgramSource.xaml.cs                  | 11 ++-
 .../Wox.Plugin.Program/FileChangeWatcher.cs   |  2 +-
 Plugins/Wox.Plugin.Program/Main.cs            |  3 +-
 Plugins/Wox.Plugin.Program/Program.cs         |  4 -
 .../Wox.Plugin.Program/ProgramIndexCache.cs   |  1 -
 .../Wox.Plugin.Program/ProgramSetting.xaml    | 75 +++++++++++++++++--
 .../Wox.Plugin.Program/ProgramSetting.xaml.cs |  8 +-
 .../ProgramSources/AppPathsProgramSource.cs   |  2 +-
 .../ProgramSources/FileSystemProgramSource.cs |  5 +-
 .../ProgramSources/ProgramSource.cs           |  2 -
 .../ProgramSources/StartMenu.cs               |  4 -
 .../Wox.Plugin.Program/ProgramSources/UWP.cs  | 13 ++--
 .../ProgramSources/Win32.cs                   |  2 -
 .../Wox.Plugin.Program/ProgramSuffixes.xaml   | 13 +++-
 .../ProgramSuffixes.xaml.cs                   |  2 -
 Plugins/Wox.Plugin.Program/Settings.cs        |  5 +-
 16 files changed, 99 insertions(+), 53 deletions(-)

diff --git a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
index 91bbcbc6d4..3e09d62b84 100644
--- a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Windows;
+using System.Windows;
 using System.Windows.Forms;
 using Wox.Plugin.Program.ProgramSources;
 
@@ -10,7 +9,7 @@ namespace Wox.Plugin.Program
     /// </summary>
     public partial class AddProgramSource
     {
-        private FileSystemProgramSource _editing;
+        private UnregisteredPrograms _editing;
         private Settings _settings;
 
         public AddProgramSource(Settings settings)
@@ -20,7 +19,7 @@ namespace Wox.Plugin.Program
             Directory.Focus();
         }
 
-        public AddProgramSource(FileSystemProgramSource edit, Settings settings)
+        public AddProgramSource(UnregisteredPrograms edit, Settings settings)
         {
             _editing = edit;
             _settings = settings;
@@ -50,10 +49,10 @@ namespace Wox.Plugin.Program
 
             if(_editing == null)
             {
-                var source = new FileSystemProgramSource
+                var source = new UnregisteredPrograms
                 {
                     Location = Directory.Text,
-                    MaxDepth = max,
+                    MaxDepth = max
                 };
                 _settings.ProgramSources.Add(source);
             }
diff --git a/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs b/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs
index b8aab05b25..025ed47c97 100644
--- a/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs
+++ b/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs
@@ -10,7 +10,7 @@ namespace Wox.Plugin.Program
     {
         private static readonly List<string> WatchedPath = new List<string>();
         // todo remove previous watcher events
-        public static void AddAll(List<FileSystemProgramSource> sources, string[] suffixes)
+        public static void AddAll(List<UnregisteredPrograms> sources, string[] suffixes)
         {
             foreach (var s in sources)
             {
diff --git a/Plugins/Wox.Plugin.Program/Main.cs b/Plugins/Wox.Plugin.Program/Main.cs
index 3807ee4130..d5d249e1cf 100644
--- a/Plugins/Wox.Plugin.Program/Main.cs
+++ b/Plugins/Wox.Plugin.Program/Main.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Windows.Controls;
 using Wox.Infrastructure;
@@ -162,7 +161,7 @@ namespace Wox.Plugin.Program
             }
             if (_settings.EnableRegistrySource)
             {
-                var source3 = new AppPathsProgramSource();
+                var source3 = new AppPathsPrograms();
                 sources.Add(source3);
             }
 
diff --git a/Plugins/Wox.Plugin.Program/Program.cs b/Plugins/Wox.Plugin.Program/Program.cs
index eea6c55f17..721e2ec717 100644
--- a/Plugins/Wox.Plugin.Program/Program.cs
+++ b/Plugins/Wox.Plugin.Program/Program.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Text.RegularExpressions;
-using System.Threading;
-using Wox.Infrastructure;
-using Wox.Plugin.Program.ProgramSources;
 
 namespace Wox.Plugin.Program
 {
diff --git a/Plugins/Wox.Plugin.Program/ProgramIndexCache.cs b/Plugins/Wox.Plugin.Program/ProgramIndexCache.cs
index d3b075a783..11c0c41163 100644
--- a/Plugins/Wox.Plugin.Program/ProgramIndexCache.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramIndexCache.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Wox.Infrastructure.Storage;
 
 namespace Wox.Plugin.Program
 {
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
index 760bd0779f..a1d1405939 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml
@@ -14,11 +14,11 @@
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Stretch">
             <StackPanel Orientation="Vertical" Width="310">
-                <CheckBox Name="StartMenuEnabled" Click="StartMenuEnabled_Click" Margin="5" Content="{DynamicResource wox_plugin_program_index_start}"></CheckBox>
-                <CheckBox Name="RegistryEnabled" Click="RegistryEnabled_Click"  Margin="5" Content="{DynamicResource wox_plugin_program_index_registry}"></CheckBox>
+                <CheckBox Name="StartMenuEnabled" Click="StartMenuEnabled_Click" Margin="5" Content="{DynamicResource wox_plugin_program_index_start}" />
+                <CheckBox Name="RegistryEnabled" Click="RegistryEnabled_Click"  Margin="5" Content="{DynamicResource wox_plugin_program_index_registry}" />
             </StackPanel>
-            <Button Height="30" HorizontalAlignment="Right" x:Name="btnProgramSuffixes" Width="130" Click="BtnProgramSuffixes_OnClick" Content="{DynamicResource wox_plugin_program_suffixes}"></Button>
-            <Button Height="30" HorizontalAlignment="Right" Margin="10 0 0 0" x:Name="btnReindex" Width="100" Click="btnReindex_Click" Content="{DynamicResource wox_plugin_program_reindex}"></Button>
+            <Button Height="30" HorizontalAlignment="Right" x:Name="btnProgramSuffixes" Width="130" Click="BtnProgramSuffixes_OnClick" Content="{DynamicResource wox_plugin_program_suffixes}" />
+            <Button Height="30" HorizontalAlignment="Right" Margin="10 0 0 0" x:Name="btnReindex" Width="100" Click="btnReindex_Click" Content="{DynamicResource wox_plugin_program_reindex}" />
         </StackPanel>
         <ListView x:Name="programSourceView" Grid.Row="1" AllowDrop="True"
             DragEnter="programSourceView_DragEnter"
@@ -44,8 +44,8 @@
         </ListView>
         <DockPanel  Grid.Row="2">
             <StackPanel x:Name="indexingPanel" Visibility="Hidden" HorizontalAlignment="Left" Orientation="Horizontal">
-                <ProgressBar x:Name="progressBarIndexing" Height="20" Width="80" Minimum="0" Maximum="100" IsIndeterminate="True"></ProgressBar>
-                <TextBlock Margin="10 0 0 0" Height="20" HorizontalAlignment="Center" Text="{DynamicResource wox_plugin_program_indexing}"></TextBlock>
+                <ProgressBar x:Name="progressBarIndexing" Height="20" Width="80" Minimum="0" Maximum="100" IsIndeterminate="True" />
+                <TextBlock Margin="10 0 0 0" Height="20" HorizontalAlignment="Center" Text="{DynamicResource wox_plugin_program_indexing}" />
             </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button x:Name="btnDeleteProgramSource" Click="btnDeleteProgramSource_OnClick" Width="100" Margin="10" Content="{DynamicResource wox_plugin_program_delete}"/>
@@ -55,3 +55,66 @@
         </DockPanel>
     </Grid>
 </UserControl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
index 6f2f777969..163d12f128 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs
@@ -51,7 +51,7 @@ namespace Wox.Plugin.Program
 
         private void btnDeleteProgramSource_OnClick(object sender, RoutedEventArgs e)
         {
-            var selectedProgramSource = programSourceView.SelectedItem as FileSystemProgramSource;
+            var selectedProgramSource = programSourceView.SelectedItem as UnregisteredPrograms;
             if (selectedProgramSource != null)
             {
                 string msg = string.Format(context.API.GetTranslation("wox_plugin_program_delete_program_source"), selectedProgramSource.Location);
@@ -71,7 +71,7 @@ namespace Wox.Plugin.Program
 
         private void btnEditProgramSource_OnClick(object sender, RoutedEventArgs e)
         {
-            var selectedProgramSource = programSourceView.SelectedItem as FileSystemProgramSource;
+            var selectedProgramSource = programSourceView.SelectedItem as UnregisteredPrograms;
             if (selectedProgramSource != null)
             {
                 var add = new AddProgramSource(selectedProgramSource, _settings);
@@ -120,9 +120,9 @@ namespace Wox.Plugin.Program
                 {
                     if (Directory.Exists(s))
                     {
-                        _settings.ProgramSources.Add(new FileSystemProgramSource
+                        _settings.ProgramSources.Add(new UnregisteredPrograms
                         {
-                            Location = s,
+                            Location = s
                         });
 
                         ReIndexing();
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/AppPathsProgramSource.cs b/Plugins/Wox.Plugin.Program/ProgramSources/AppPathsProgramSource.cs
index d4bcd54612..6f37847dd7 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/AppPathsProgramSource.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/AppPathsProgramSource.cs
@@ -7,7 +7,7 @@ using Microsoft.Win32;
 namespace Wox.Plugin.Program.ProgramSources
 {
     [Serializable]
-    public class AppPathsProgramSource : Win32
+    public class AppPathsPrograms : Win32
     {
         public override List<Program> LoadPrograms()
         {
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs b/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
index d63b6af6b5..1418cea5ba 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/FileSystemProgramSource.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using Wox.Infrastructure.Exception;
-using Wox.Infrastructure.Logger;
 
 namespace Wox.Plugin.Program.ProgramSources
 {
     [Serializable]
-    public class FileSystemProgramSource : Win32
+    public class UnregisteredPrograms : Win32
     {
         public string Location { get; set; } = "";
 
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/ProgramSource.cs b/Plugins/Wox.Plugin.Program/ProgramSources/ProgramSource.cs
index 8a15348328..2a6c6a43b8 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/ProgramSource.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/ProgramSource.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 
 namespace Wox.Plugin.Program.ProgramSources
 {
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/StartMenu.cs b/Plugins/Wox.Plugin.Program/ProgramSources/StartMenu.cs
index f14ad16038..2ee63ac2d4 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/StartMenu.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/StartMenu.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Wox.Plugin.Program.ProgramSources
 {
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/UWP.cs b/Plugins/Wox.Plugin.Program/ProgramSources/UWP.cs
index f10abcb866..11c9cc818e 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/UWP.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/UWP.cs
@@ -5,18 +5,18 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Windows.ApplicationModel;
-using Windows.Management.Deployment;
 using Windows.ApplicationModel.Core;
+using Windows.Foundation;
+using Windows.Management.Deployment;
 using Windows.Storage.Streams;
 using AppxPackaing;
 using Shell;
 using Wox.Infrastructure.Logger;
 using IStream = AppxPackaing.IStream;
-using Size = Windows.Foundation.Size;
+using Rect = System.Windows.Rect;
 
 namespace Wox.Plugin.Program.ProgramSources
 {
@@ -26,14 +26,12 @@ namespace Wox.Plugin.Program.ProgramSources
         public string FullName { get; }
         public string FamilyName { get; }
 
-
         public string DisplayName { get; set; }
         public string Description { get; set; }
         public string PublisherDisplayName { get; set; }
         public string Location { get; set; }
 
         public Application[] Apps { get; set; }
-
         public Package Package { get; }
 
         public int Score { get; set; }
@@ -96,7 +94,6 @@ namespace Wox.Plugin.Program.ProgramSources
             }
         }
 
-
         private void InitializeAppDisplayInfo(Package package)
         {
             IReadOnlyList<AppListEntry> apps;
@@ -328,12 +325,12 @@ namespace Wox.Plugin.Program.ProgramSources
         private enum Stgm : uint
         {
             Read = 0x0,
-            ShareExclusive = 0x10,
+            ShareExclusive = 0x10
         }
 
         private enum Hresult : uint
         {
-            Ok = 0x0000,
+            Ok = 0x0000
         }
 
         [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
diff --git a/Plugins/Wox.Plugin.Program/ProgramSources/Win32.cs b/Plugins/Wox.Plugin.Program/ProgramSources/Win32.cs
index e23b5683b4..cbd89f7103 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSources/Win32.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSources/Win32.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Wox.Infrastructure.Exception;
 using Wox.Infrastructure.Logger;
 
diff --git a/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml
index c7ebe048d4..03d399a197 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml
+++ b/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml
@@ -9,9 +9,16 @@
         WindowStartupLocation="CenterScreen"
              d:DesignHeight="400" d:DesignWidth="300">
     <StackPanel>
-        <TextBlock Margin="10 10 0 0" Foreground="Gray" Text="{DynamicResource wox_plugin_program_only_index_tip}"></TextBlock>
-        <TextBlock Margin="10 10 0 0" Foreground="Gray" Text="{DynamicResource wox_plugin_program_split_by_tip}"></TextBlock>
+        <TextBlock Margin="10 10 0 0" Foreground="Gray" Text="{DynamicResource wox_plugin_program_only_index_tip}" />
+        <TextBlock Margin="10 10 0 0" Foreground="Gray" Text="{DynamicResource wox_plugin_program_split_by_tip}" />
         <TextBox x:Name="tbSuffixes" Margin="10"/>
-        <Button HorizontalAlignment="Right" Height="30" Width="80" Click="ButtonBase_OnClick" Margin="10" Content="{DynamicResource wox_plugin_program_update}"></Button>
+        <Button HorizontalAlignment="Right" Height="30" Width="80" Click="ButtonBase_OnClick" Margin="10" Content="{DynamicResource wox_plugin_program_update}" />
     </StackPanel>
 </Window>
+
+
+
+
+
+
+
diff --git a/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml.cs
index 2dfe9d37e2..6f52bacd0d 100644
--- a/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml.cs
+++ b/Plugins/Wox.Plugin.Program/ProgramSuffixes.xaml.cs
@@ -1,6 +1,4 @@
 using System.Windows;
-using System.Linq;
-using Wox.Plugin.Program.ProgramSources;
 
 namespace Wox.Plugin.Program
 {
diff --git a/Plugins/Wox.Plugin.Program/Settings.cs b/Plugins/Wox.Plugin.Program/Settings.cs
index 949f9eabe1..6eb0754fcc 100644
--- a/Plugins/Wox.Plugin.Program/Settings.cs
+++ b/Plugins/Wox.Plugin.Program/Settings.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Wox.Plugin.Program.ProgramSources;
 
 namespace Wox.Plugin.Program
 {
     public class Settings
     {
-        public List<FileSystemProgramSource> ProgramSources { get; set; } = new List<FileSystemProgramSource>();
+        public List<UnregisteredPrograms> ProgramSources { get; set; } = new List<UnregisteredPrograms>();
         public string[] ProgramSuffixes { get; set; } = {"bat", "appref-ms", "exe", "lnk"};
 
         public bool EnableStartMenuSource { get; set; } = true;