Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use variable instead of global static method

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
Plugins/Wox.Plugin.Folder/FolderPlugin.cs
View File

@@ -12,20 +12,21 @@ namespace Wox.Plugin.Folder
{
private static List<string> driverNames;
private PluginInitContext context;
private FolderStorage _settings = FolderStorage.Instance;
public Control CreateSettingPanel()
{
return new FileSystemSettings(context.API);
return new FileSystemSettings(context.API, _settings);
}
public void Init(PluginInitContext context)
{
this.context = context;
InitialDriverList();
if (FolderStorage.Instance.FolderLinks == null)
if (_settings.FolderLinks == null)
{
FolderStorage.Instance.FolderLinks = new List<FolderLink>();
FolderStorage.Instance.Save();
_settings.FolderLinks = new List<FolderLink>();
_settings.Save();
}
}
@@ -33,7 +34,7 @@ namespace Wox.Plugin.Folder
{
string input = query.Search.ToLower();
List<FolderLink> userFolderLinks = FolderStorage.Instance.FolderLinks.Where(
List<FolderLink> userFolderLinks = _settings.FolderLinks.Where(
x => x.Nickname.StartsWith(input, StringComparison.OrdinalIgnoreCase)).ToList();
List<Result> results =
userFolderLinks.Select(

33
Plugins/Wox.Plugin.Folder/FolderPluginSettings.xaml.cs
View File

@@ -7,20 +7,21 @@ using DataFormats = System.Windows.DataFormats;
using DragDropEffects = System.Windows.DragDropEffects;
using DragEventArgs = System.Windows.DragEventArgs;
using MessageBox = System.Windows.MessageBox;
using UserControl = System.Windows.Controls.UserControl;
namespace Wox.Plugin.Folder
{
public partial class FileSystemSettings : UserControl
public partial class FileSystemSettings
{
private IPublicAPI woxAPI;
private FolderStorage _settings;
public FileSystemSettings(IPublicAPI woxAPI)
public FileSystemSettings(IPublicAPI woxAPI, FolderStorage settings)
{
this.woxAPI = woxAPI;
InitializeComponent();
lbxFolders.ItemsSource = FolderStorage.Instance.FolderLinks;
_settings = settings;
lbxFolders.ItemsSource = _settings.FolderLinks;
}
private void btnDelete_Click(object sender, RoutedEventArgs e)
@@ -32,9 +33,9 @@ namespace Wox.Plugin.Folder
if (MessageBox.Show(msg, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
FolderStorage.Instance.FolderLinks.Remove(selectedFolder);
_settings.FolderLinks.Remove(selectedFolder);
lbxFolders.Items.Refresh();
FolderStorage.Instance.Save();
_settings.Save();
}
}
else
@@ -53,10 +54,10 @@ namespace Wox.Plugin.Folder
folderBrowserDialog.SelectedPath = selectedFolder.Path;
if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
{
var link = FolderStorage.Instance.FolderLinks.First(x => x.Path == selectedFolder.Path);
var link = _settings.FolderLinks.First(x => x.Path == selectedFolder.Path);
link.Path = folderBrowserDialog.SelectedPath;
FolderStorage.Instance.Save();
_settings.Save();
}
lbxFolders.Items.Refresh();
@@ -78,13 +79,13 @@ namespace Wox.Plugin.Folder
Path = folderBrowserDialog.SelectedPath
};
if (FolderStorage.Instance.FolderLinks == null)
if (_settings.FolderLinks == null)
{
FolderStorage.Instance.FolderLinks = new List<FolderLink>();
_settings.FolderLinks = new List<FolderLink>();
}
FolderStorage.Instance.FolderLinks.Add(newFolder);
FolderStorage.Instance.Save();
_settings.FolderLinks.Add(newFolder);
_settings.Save();
}
lbxFolders.Items.Refresh();
@@ -96,9 +97,9 @@ namespace Wox.Plugin.Folder
if (files != null && files.Count() > 0)
{
if (FolderStorage.Instance.FolderLinks == null)
if (_settings.FolderLinks == null)
{
FolderStorage.Instance.FolderLinks = new List<FolderLink>();
_settings.FolderLinks = new List<FolderLink>();
}
foreach (string s in files)
@@ -110,8 +111,8 @@ namespace Wox.Plugin.Folder
Path = s
};
FolderStorage.Instance.FolderLinks.Add(newFolder);
FolderStorage.Instance.Save();
_settings.FolderLinks.Add(newFolder);
_settings.Save();
}
lbxFolders.Items.Refresh();