merge with master

This commit is contained in:
qianlifeng
2015-07-17 15:08:39 +08:00
25 changed files with 733 additions and 698 deletions

View File

@@ -101,6 +101,9 @@ namespace Wox.Core.UserSettings
[JsonProperty]
public string ProxyPassword { get; set; }
[JsonProperty]
public int MaxResultsToShow { get; set; }
protected override string ConfigFolder
{
get { return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Config"); }
@@ -114,7 +117,7 @@ namespace Wox.Core.UserSettings
public void IncreaseActivateTimes()
{
ActivateTimes++;
if (ActivateTimes % 15 == 0)
if (ActivateTimes%15 == 0)
{
Save();
}
@@ -135,6 +138,7 @@ namespace Wox.Core.UserSettings
HideWhenDeactive = false;
CustomPluginHotkeys = new List<CustomPluginHotkey>();
RememberLastLaunchLocation = false;
MaxResultsToShow = 6;
return this;
}
@@ -165,4 +169,4 @@ namespace Wox.Core.UserSettings
LayeredWindow = 1,
DWM = 2
}
}
}