Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 03:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

ResultItem -> Result, part 2

Browse Source 
part of refactoring for PR #494
This commit is contained in:
bao-qian
2016-02-21 15:19:42 +00:00
parent 4197580b04
commit eb8aa195c2
10 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Wox.Core/Resource/Theme.cs
View File

@@ -87,10 +87,10 @@ namespace Wox.Core.Resource
Style resultSubItemSelectedStyle = dict["ItemSubTitleSelectedStyle"] as Style;
if (resultItemStyle != null && resultSubItemStyle != null && resultSubItemSelectedStyle != null && resultItemSelectedStyle != null)
{
Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(UserSettingStorage.Instance.ResultItemFont));
Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultItemFontStyle));
Setter fontWeight = new Setter(TextBlock.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultItemFontWeight));
Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultItemFontStretch));
Setter fontFamily = new Setter(TextBlock.FontFamilyProperty, new FontFamily(UserSettingStorage.Instance.ResultFont));
Setter fontStyle = new Setter(TextBlock.FontStyleProperty, FontHelper.GetFontStyleFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultFontStyle));
Setter fontWeight = new Setter(TextBlock.FontWeightProperty, FontHelper.GetFontWeightFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultFontWeight));
Setter fontStretch = new Setter(TextBlock.FontStretchProperty, FontHelper.GetFontStretchFromInvariantStringOrNormal(UserSettingStorage.Instance.ResultFontStretch));
Setter[] setters = { fontFamily, fontStyle, fontWeight, fontStretch };
Array.ForEach(new[] { resultItemStyle, resultSubItemStyle, resultItemSelectedStyle, resultSubItemSelectedStyle }, o => Array.ForEach(setters, p => o.Setters.Add(p)));

14
Wox.Core/UserSettings/UserSettingStorage.cs
View File

@@ -44,16 +44,16 @@ namespace Wox.Core.UserSettings
public string QueryBoxFontStretch { get; set; }
[JsonProperty]
public string ResultItemFont { get; set; }
public string ResultFont { get; set; }
[JsonProperty]
public string ResultItemFontStyle { get; set; }
public string ResultFontStyle { get; set; }
[JsonProperty]
public string ResultItemFontWeight { get; set; }
public string ResultFontWeight { get; set; }
[JsonProperty]
public string ResultItemFontStretch { get; set; }
public string ResultFontStretch { get; set; }
[JsonProperty]
public double WindowLeft { get; set; }
@@ -126,7 +126,7 @@ namespace Wox.Core.UserSettings
CustomizedPluginConfigs = new List<CustomizedPluginConfig>();
Hotkey = "Alt + Space";
QueryBoxFont = FontFamily.GenericSansSerif.Name;
ResultItemFont = FontFamily.GenericSansSerif.Name;
ResultFont = FontFamily.GenericSansSerif.Name;
Opacity = 1;
OpacityMode = OpacityMode.Normal;
LeaveCmdOpen = false;
@@ -147,9 +147,9 @@ namespace Wox.Core.UserSettings
{
storage.QueryBoxFont = FontFamily.GenericSansSerif.Name;
}
if (storage.ResultItemFont == null)
if (storage.ResultFont == null)
{
storage.ResultItemFont = FontFamily.GenericSansSerif.Name;
storage.ResultFont = FontFamily.GenericSansSerif.Name;
}
if (storage.Language == null)
{