diff --git a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj index 9df040bd4e..0d5938634d 100644 --- a/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj +++ b/Plugins/Wox.Plugin.CMD/Wox.Plugin.CMD.csproj @@ -62,7 +62,7 @@ Properties\SolutionAssemblyInfo.cs - + CMDSetting.xaml diff --git a/Plugins/Wox.Plugin.Caculator/Main.cs b/Plugins/Wox.Plugin.Caculator/Main.cs index 315ffd2db0..35228ef14f 100644 --- a/Plugins/Wox.Plugin.Caculator/Main.cs +++ b/Plugins/Wox.Plugin.Caculator/Main.cs @@ -6,7 +6,7 @@ using YAMP; namespace Wox.Plugin.Caculator { - public class Calculator : IPlugin, IPluginI18n + public class Main : IPlugin, IPluginI18n { private static Regex regValidExpressChar = new Regex( @"^(" + @@ -20,7 +20,7 @@ namespace Wox.Plugin.Caculator private static ParseContext yampContext; private PluginInitContext context { get; set; } - static Calculator() + static Main() { yampContext = Parser.PrimaryContext; Parser.InteractiveMode = false; diff --git a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj index afb5b4a7e5..cb335d161c 100644 --- a/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj +++ b/Plugins/Wox.Plugin.Caculator/Wox.Plugin.Caculator.csproj @@ -51,7 +51,7 @@ Properties\SolutionAssemblyInfo.cs - + diff --git a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj index cf337922af..b690fd1c1a 100644 --- a/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj +++ b/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj @@ -46,7 +46,7 @@ Properties\SolutionAssemblyInfo.cs - + diff --git a/Plugins/Wox.Plugin.ControlPanel/Main.cs b/Plugins/Wox.Plugin.ControlPanel/Main.cs index 869bc40912..f7c0408bf7 100644 --- a/Plugins/Wox.Plugin.ControlPanel/Main.cs +++ b/Plugins/Wox.Plugin.ControlPanel/Main.cs @@ -7,7 +7,7 @@ using Wox.Infrastructure; namespace Wox.Plugin.ControlPanel { - public class ControlPanel : IPlugin, IPluginI18n + public class Main : IPlugin, IPluginI18n { private PluginInitContext context; private List controlPanelItems = new List(); diff --git a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj index b8349fde85..f2abb8e843 100644 --- a/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj +++ b/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj @@ -46,7 +46,7 @@ Properties\SolutionAssemblyInfo.cs - + diff --git a/Plugins/Wox.Plugin.Folder/Main.cs b/Plugins/Wox.Plugin.Folder/Main.cs index f6d56ed858..d62b176bb4 100644 --- a/Plugins/Wox.Plugin.Folder/Main.cs +++ b/Plugins/Wox.Plugin.Folder/Main.cs @@ -9,7 +9,7 @@ using Wox.Infrastructure.Storage; namespace Wox.Plugin.Folder { - public class FolderPlugin : IPlugin, ISettingProvider, IPluginI18n, ISavable + public class Main : IPlugin, ISettingProvider, IPluginI18n, ISavable { private static List driverNames; private PluginInitContext context; @@ -17,7 +17,7 @@ namespace Wox.Plugin.Folder private readonly Settings _settings; private readonly PluginJsonStorage _storage; - public FolderPlugin() + public Main() { _storage = new PluginJsonStorage(); _settings = _storage.Load(); diff --git a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj index be31c414ec..f9eef36698 100644 --- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj +++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj @@ -59,7 +59,7 @@ Properties\SolutionAssemblyInfo.cs - + FolderPluginSettings.xaml diff --git a/Plugins/Wox.Plugin.PluginIndicator/Main.cs b/Plugins/Wox.Plugin.PluginIndicator/Main.cs index 011d3bde0c..0dc809d4a9 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Main.cs +++ b/Plugins/Wox.Plugin.PluginIndicator/Main.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; using Wox.Core.Plugin; -using Wox.Core.UserSettings; namespace Wox.Plugin.PluginIndicator { - public class PluginIndicator : IPlugin, IPluginI18n + public class Main : IPlugin, IPluginI18n { private PluginInitContext context; diff --git a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj index 376efc89e4..f8670040db 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj +++ b/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj @@ -45,7 +45,7 @@ Properties\SolutionAssemblyInfo.cs - + diff --git a/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs b/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs index 09816fc413..0ab797d9c9 100644 --- a/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs +++ b/Plugins/Wox.Plugin.Program/FileChangeWatcher.cs @@ -43,7 +43,7 @@ namespace Wox.Plugin.Program { Task.Run(() => { - Programs.IndexPrograms(); + Main.IndexPrograms(); isIndexing = false; }); } diff --git a/Plugins/Wox.Plugin.Program/Main.cs b/Plugins/Wox.Plugin.Program/Main.cs index 7c2cb20043..bb0beb7f5f 100644 --- a/Plugins/Wox.Plugin.Program/Main.cs +++ b/Plugins/Wox.Plugin.Program/Main.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; -using System.IO; using System.Linq; -using System.Reflection; using System.Windows.Controls; using Wox.Infrastructure; using Wox.Infrastructure.Logger; @@ -14,7 +12,7 @@ using Stopwatch = Wox.Infrastructure.Stopwatch; namespace Wox.Plugin.Program { - public class Programs : ISettingProvider, IPlugin, IPluginI18n, IContextMenu, ISavable + public class Main : ISettingProvider, IPlugin, IPluginI18n, IContextMenu, ISavable { private static object lockObject = new object(); private static List _programs = new List(); @@ -34,7 +32,7 @@ namespace Wox.Plugin.Program private static Settings _settings; private readonly PluginJsonStorage _settingsStorage; - public Programs() + public Main() { _settingsStorage = new PluginJsonStorage(); _settings = _settingsStorage.Load(); diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs index 08c8b8d4f7..5f0430e2b0 100644 --- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs +++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml.cs @@ -34,7 +34,7 @@ namespace Wox.Plugin.Program Task.Run(() => { Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Visible; }); - Programs.IndexPrograms(); + Main.IndexPrograms(); Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Hidden; }); }); } diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj index 4b38f99d90..bb87edba4b 100644 --- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj @@ -65,7 +65,7 @@ - + ProgramSetting.xaml diff --git a/Plugins/Wox.Plugin.Sys/Main.cs b/Plugins/Wox.Plugin.Sys/Main.cs index 9e5f388126..01b7a2d262 100644 --- a/Plugins/Wox.Plugin.Sys/Main.cs +++ b/Plugins/Wox.Plugin.Sys/Main.cs @@ -13,7 +13,7 @@ using MessageBox = System.Windows.MessageBox; namespace Wox.Plugin.Sys { - public class Sys : IPlugin, ISettingProvider, IPluginI18n + public class Main : IPlugin, ISettingProvider, IPluginI18n { List availableResults = new List(); private PluginInitContext context; diff --git a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj index d847504218..65ad1aaa78 100644 --- a/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj +++ b/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj @@ -55,7 +55,7 @@ Properties\SolutionAssemblyInfo.cs - + SysSettings.xaml diff --git a/Plugins/Wox.Plugin.Url/Main.cs b/Plugins/Wox.Plugin.Url/Main.cs index 191b17dfca..80758c97fb 100644 --- a/Plugins/Wox.Plugin.Url/Main.cs +++ b/Plugins/Wox.Plugin.Url/Main.cs @@ -5,7 +5,7 @@ using System.Text.RegularExpressions; namespace Wox.Plugin.Url { - public class UrlPlugin : IPlugin, IPluginI18n + public class Main : IPlugin, IPluginI18n { //based on https://gist.github.com/dperini/729294 private const string urlPattern = "^" + diff --git a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj index be3a0827fb..758166253b 100644 --- a/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj +++ b/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj @@ -46,7 +46,7 @@ Properties\SolutionAssemblyInfo.cs - + diff --git a/Plugins/Wox.Plugin.WebSearch/Main.cs b/Plugins/Wox.Plugin.WebSearch/Main.cs index 8acf656d48..21c25856e3 100644 --- a/Plugins/Wox.Plugin.WebSearch/Main.cs +++ b/Plugins/Wox.Plugin.WebSearch/Main.cs @@ -11,7 +11,7 @@ using Wox.Plugin.WebSearch.SuggestionSources; namespace Wox.Plugin.WebSearch { - public class WebSearchPlugin : IPlugin, ISettingProvider, IPluginI18n, IMultipleActionKeywords, ISavable, IResultUpdated + public class Main : IPlugin, ISettingProvider, IPluginI18n, IMultipleActionKeywords, ISavable, IResultUpdated { public PluginInitContext Context { get; private set; } diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearch.cs b/Plugins/Wox.Plugin.WebSearch/WebSearch.cs index 8f513e0b38..cfc1555e2d 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearch.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearch.cs @@ -20,7 +20,7 @@ namespace Wox.Plugin.WebSearch set { _icon = value; - IconPath = Path.Combine(WebSearchPlugin.PluginDirectory, WebSearchPlugin.ImageDirectory, value); + IconPath = Path.Combine(Main.PluginDirectory, Main.ImageDirectory, value); } } @@ -31,7 +31,7 @@ namespace Wox.Plugin.WebSearch [JsonIgnore] internal string IconPath { get; private set; } = Path.Combine ( - WebSearchPlugin.PluginDirectory, WebSearchPlugin.ImageDirectory, DefaultIcon + Main.PluginDirectory, Main.ImageDirectory, DefaultIcon ); public string Url { get; set; } diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs b/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs index 5896c89fbc..fe8e21d15f 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs @@ -14,7 +14,7 @@ namespace Wox.Plugin.WebSearch private bool _isUpdate; private WebSearch _webSearch; private readonly PluginInitContext _context; - private readonly WebSearchPlugin _plugin; + private readonly Main _plugin; private readonly Settings _settings; public WebSearchSetting(WebSearchesSetting settingWidow, Settings settings) @@ -120,7 +120,7 @@ namespace Wox.Plugin.WebSearch private void SelectIconButtonOnClick(object sender, RoutedEventArgs e) { - var directory = Path.Combine(WebSearchPlugin.PluginDirectory, WebSearchPlugin.ImageDirectory); + var directory = Path.Combine(Main.PluginDirectory, Main.ImageDirectory); var dlg = new OpenFileDialog { InitialDirectory = directory, diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml.cs b/Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml.cs index 0768ee9aaf..44fd714c8c 100644 --- a/Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml.cs +++ b/Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml.cs @@ -12,9 +12,9 @@ namespace Wox.Plugin.WebSearch { private Settings _settings; public PluginInitContext Context { get; } - public WebSearchPlugin Plugin { get; } + public Main Plugin { get; } - public WebSearchesSetting(WebSearchPlugin plugin, Settings settings) + public WebSearchesSetting(Main plugin, Settings settings) { Context = plugin.Context; Plugin = plugin; diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj index 7207fc8f76..99d4a45e89 100644 --- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj +++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj @@ -65,7 +65,7 @@ WebSearchesSetting.xaml - + WebSearchSetting.xaml