Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some more clean up of ThemeSerializer.cs

Browse Source
This commit is contained in:
hiriumi
2016-05-27 22:59:57 -07:00
parent a51df79925
commit fe17123707
1 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mRemoteV1/Themes/ThemeSerializer.cs
View File

@@ -13,9 +13,8 @@ namespace mRemoteNG.Themes
{
public static void SaveToXmlFile(ThemeInfo themeInfo, string filename)
{
var themeList = new List<ThemeInfo>();
themeList.Add(themeInfo);
SaveToXmlFile(themeList, filename);
var themeList = new List<ThemeInfo> {themeInfo};
SaveToXmlFile(themeList, filename);
}
public static void SaveToXmlFile(List<ThemeInfo> themes, string filename)
@@ -97,21 +96,16 @@ namespace mRemoteNG.Themes
var themeNodes = xmlDocument.SelectNodes("/mRemoteNG/Theme");
var themes = new List<ThemeInfo>();
var themeInfo = default(ThemeInfo);
var themeType = (new ThemeInfo()).GetType();
var themeType = (new ThemeInfo()).GetType();
var colorType = (new Color()).GetType();
var colorName = "";
var colorValue = "";
var propertyInfo = default(PropertyInfo);
foreach (XmlNode themeNode in themeNodes)
foreach (XmlNode themeNode in themeNodes)
{
themeInfo = new ThemeInfo();
themeInfo.Name = themeNode.Attributes["Name"].Value;
foreach (XmlNode colorNode in themeNode.SelectNodes("./Color"))
var themeInfo = new ThemeInfo {Name = themeNode.Attributes?["Name"].Value};
foreach (XmlNode colorNode in themeNode.SelectNodes("./Color"))
{
colorName = colorNode.Attributes["Name"].Value;
colorValue = colorNode.Attributes["Value"].Value;
propertyInfo = themeType.GetProperty(colorName);
var colorName = colorNode.Attributes?["Name"].Value;
var colorValue = colorNode.Attributes?["Value"].Value;
var propertyInfo = themeType.GetProperty(colorName);
if (propertyInfo == null || !(propertyInfo.PropertyType == colorType))
{
continue;
@@ -126,27 +120,13 @@ namespace mRemoteNG.Themes
private static string EncodeColorName(Color color)
{
if (color.IsNamedColor)
{
return color.Name;
}
else
{
return Conversion.Hex(color.ToArgb()).PadLeft(8, '0');
}
}
private static Color DecodeColorName(string name)
{
var regex = new System.Text.RegularExpressions.Regex("^[0-9a-fA-F]{8}$");
if (regex.Match(name).Success)
{
return Color.FromArgb(Convert.ToInt32(name, 16));
}
else
{
return Color.FromName(name);
}
return color.IsNamedColor ? color.Name : Conversion.Hex(color.ToArgb()).PadLeft(8, '0');
}
private static Color DecodeColorName(string name)
{
var regex = new System.Text.RegularExpressions.Regex("^[0-9a-fA-F]{8}$");
return regex.Match(name).Success ? Color.FromArgb(Convert.ToInt32(name, 16)) : Color.FromName(name);
}
}
}