From 91e9d7431a110fd01f2486ecc8064d4c8587e413 Mon Sep 17 00:00:00 2001 From: bao-qian Date: Tue, 21 Jun 2016 00:17:55 +0100 Subject: [PATCH] MVVM refactoring for web search plugin, part 2 1. #486 2. rename --- .../{WebSearch.cs => SearchSource.cs} | 0 ...archSetting.xaml => SearchSourceSetting.xaml} | 0 ...tting.xaml.cs => SearchSourceSetting.xaml.cs} | 0 ...SearchesSetting.xaml => SettingsControl.xaml} | 0 ...esSetting.xaml.cs => SettingsControl.xaml.cs} | 0 ...{ISuggestionSource.cs => SuggestionSource.cs} | 1 - .../Wox.Plugin.WebSearch.csproj | 16 ++++++++-------- 7 files changed, 8 insertions(+), 9 deletions(-) rename Plugins/Wox.Plugin.WebSearch/{WebSearch.cs => SearchSource.cs} (100%) rename Plugins/Wox.Plugin.WebSearch/{WebSearchSetting.xaml => SearchSourceSetting.xaml} (100%) rename Plugins/Wox.Plugin.WebSearch/{WebSearchSetting.xaml.cs => SearchSourceSetting.xaml.cs} (100%) rename Plugins/Wox.Plugin.WebSearch/{WebSearchesSetting.xaml => SettingsControl.xaml} (100%) rename Plugins/Wox.Plugin.WebSearch/{WebSearchesSetting.xaml.cs => SettingsControl.xaml.cs} (100%) rename Plugins/Wox.Plugin.WebSearch/SuggestionSources/{ISuggestionSource.cs => SuggestionSource.cs} (91%) diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearch.cs b/Plugins/Wox.Plugin.WebSearch/SearchSource.cs similarity index 100% rename from Plugins/Wox.Plugin.WebSearch/WebSearch.cs rename to Plugins/Wox.Plugin.WebSearch/SearchSource.cs diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml b/Plugins/Wox.Plugin.WebSearch/SearchSourceSetting.xaml similarity index 100% rename from Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml rename to Plugins/Wox.Plugin.WebSearch/SearchSourceSetting.xaml diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs b/Plugins/Wox.Plugin.WebSearch/SearchSourceSetting.xaml.cs similarity index 100% rename from Plugins/Wox.Plugin.WebSearch/WebSearchSetting.xaml.cs rename to Plugins/Wox.Plugin.WebSearch/SearchSourceSetting.xaml.cs diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml similarity index 100% rename from Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml rename to Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml diff --git a/Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml.cs b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs similarity index 100% rename from Plugins/Wox.Plugin.WebSearch/WebSearchesSetting.xaml.cs rename to Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml.cs diff --git a/Plugins/Wox.Plugin.WebSearch/SuggestionSources/ISuggestionSource.cs b/Plugins/Wox.Plugin.WebSearch/SuggestionSources/SuggestionSource.cs similarity index 91% rename from Plugins/Wox.Plugin.WebSearch/SuggestionSources/ISuggestionSource.cs rename to Plugins/Wox.Plugin.WebSearch/SuggestionSources/SuggestionSource.cs index c56c892418..173efcfaa5 100644 --- a/Plugins/Wox.Plugin.WebSearch/SuggestionSources/ISuggestionSource.cs +++ b/Plugins/Wox.Plugin.WebSearch/SuggestionSources/SuggestionSource.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; namespace Wox.Plugin.WebSearch.SuggestionSources { - //todo rename file public abstract class SuggestionSource { public abstract Task> Suggestions(string query); diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj index f18715843c..2fb1182b65 100644 --- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj +++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj @@ -63,14 +63,14 @@ - - - - WebSearchesSetting.xaml + + + + SettingsControl.xaml - - WebSearchSetting.xaml + + SearchSourceSetting.xaml @@ -154,11 +154,11 @@ Designer PreserveNewest - + MSBuild:Compile Designer - + MSBuild:Compile Designer