Use variable instead of global static method

1. introduce variable
2. part of #389
3. refactoring program suffix in program plugin
4. 全局变量一时爽,代码重构火葬场
This commit is contained in:
bao-qian
2016-03-28 03:09:57 +01:00
parent c596039453
commit b22a4501cc
36 changed files with 402 additions and 343 deletions

View File

@@ -18,18 +18,20 @@ namespace Wox.Plugin.WebSearch
private WebSearch _updateWebSearch;
private readonly PluginInitContext _context;
private readonly WebSearchPlugin _plugin;
private WebSearchStorage _settings;
public WebSearchSetting(WebSearchesSetting settingWidow)
public WebSearchSetting(WebSearchesSetting settingWidow, WebSearchStorage settings)
{
_plugin = settingWidow.Plugin;
_context = settingWidow.Context;
_settingWindow = settingWidow;
InitializeComponent();
_settings = settings;
}
public void UpdateItem(WebSearch webSearch)
{
_updateWebSearch = WebSearchStorage.Instance.WebSearches.FirstOrDefault(o => o == webSearch);
_updateWebSearch = _settings.WebSearches.FirstOrDefault(o => o == webSearch);
if (_updateWebSearch == null || string.IsNullOrEmpty(_updateWebSearch.Url))
{
@@ -110,7 +112,7 @@ namespace Wox.Plugin.WebSearch
MessageBox.Show(exception.Message);
return;
}
WebSearchStorage.Instance.WebSearches.Add(new WebSearch
_settings.WebSearches.Add(new WebSearch
{
ActionKeyword = newActionKeyword,
Enabled = cbEnable.IsChecked ?? false,
@@ -120,7 +122,7 @@ namespace Wox.Plugin.WebSearch
});
}
WebSearchStorage.Instance.Save();
_settings.Save();
_settingWindow.ReloadWebSearchView();
Close();
}