mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-03 03:19:08 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix added websearch twice issue.

Browse Source
This commit is contained in:
qianlifeng 2014-03-23 18:14:46 +08:00
parent 1a5bc2ddfe
commit d8536c20b0
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Wox.Infrastructure/Storage/BaseStorage.cs
View File

@ -36,6 +36,8 @@ namespace Wox.Infrastructure.Storage
} }
} }
protected virtual void LoadDefaultConfig() { }
private void Load() private void Load()
{ {
string configPath = Path.Combine(configFolder, ConfigName + fileSuffix); string configPath = Path.Combine(configFolder, ConfigName + fileSuffix);
@ -55,8 +57,13 @@ namespace Wox.Infrastructure.Storage
catch (Exception) catch (Exception)
{ {
//no-op //no-op
LoadDefaultConfig();
} }
} }
else
{
LoadDefaultConfig();
}
} }
public void Save() public void Save()

24
Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs
View File

@ -39,18 +39,6 @@ namespace Wox.Infrastructure.Storage.UserSettings
[JsonProperty] [JsonProperty]
public bool EnablePythonPlugins { get; set; } public bool EnablePythonPlugins { get; set; }
public UserSettingStorage()
{
EnablePythonPlugins = true;
Theme = "Dark";
ReplaceWinR = true;
WebSearches = LoadDefaultWebSearches();
ProgramSources = LoadDefaultProgramSources();
Hotkey = "Alt + Space";
QueryBoxFont = FontFamily.GenericSansSerif.Name;
ResultItemFont = FontFamily.GenericSansSerif.Name;
}
public List<WebSearch> LoadDefaultWebSearches() public List<WebSearch> LoadDefaultWebSearches()
{ {
List<WebSearch> webSearches = new List<WebSearch>(); List<WebSearch> webSearches = new List<WebSearch>();
@ -107,5 +95,17 @@ namespace Wox.Infrastructure.Storage.UserSettings
{ {
get { return "config"; } get { return "config"; }
} }
protected override void LoadDefaultConfig()
{
EnablePythonPlugins = true;
Theme = "Dark";
ReplaceWinR = true;
WebSearches = LoadDefaultWebSearches();
ProgramSources = LoadDefaultProgramSources();
Hotkey = "Alt + Space";
QueryBoxFont = FontFamily.GenericSansSerif.Name;
ResultItemFont = FontFamily.GenericSansSerif.Name;
}
} }
} }

2
Wox/MainWindow.xaml.cs
View File

@ -93,8 +93,6 @@ namespace Wox
//DwmDropShadow.DropShadowToWindow(this); //DwmDropShadow.DropShadowToWindow(this);
WindowIntelopHelper.DisableControlBox(this); WindowIntelopHelper.DisableControlBox(this);
throw new Exception();
} }
private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)