From 8c2307d7818b41bf1d58717cdf381ea0c13a1b69 Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Tue, 27 Dec 2016 11:49:51 +0900
Subject: [PATCH 1/7] Tweak Theme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 微调 VS2012Light 配色，提高状态栏前景色区分度
---
 ElectronicObserver/Utility/Configuration.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ElectronicObserver/Utility/Configuration.cs b/ElectronicObserver/Utility/Configuration.cs
index c6cce9c78..399798086 100644
--- a/ElectronicObserver/Utility/Configuration.cs
+++ b/ElectronicObserver/Utility/Configuration.cs
@@ -374,13 +374,13 @@ public Color SubBackColor { get {
 				switch (ThemeID) {
 					case 0:  return SolarizedBase2.ColorData;
 					case 1:  return SolarizedBase02.ColorData;
-					default: return Color.Silver;
+					default: return Color.FromArgb(0xCC, 0xCE, 0xDB);
 				}}}
 				public Color SubForeColor { get {
 				switch (ThemeID) {
 					case 0:  return SolarizedBase00.ColorData;
 					case 1:  return SolarizedBase0.ColorData;
-					default: return Color.FromArgb(0x88, 0x88, 0x88);
+					default: return Color.FromArgb(0x6D, 0x6D, 0x6D);
 				}}}
 				public Pen SubBackColorPen { get {
 				switch (ThemeID) {

From ed7667cc0d24ff80e5bde3028bc6a30dee0ee232 Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Wed, 25 Jan 2017 21:18:51 +0900
Subject: [PATCH 2/7] Rework Theme Support

* Update Submodule
* Read color scheme from .json file
* Addition dll for each theme is no longer needed
---
 DockPanelSuite                                |   2 +-
 ElectronicObserver.sln                        |  19 +-
 ElectronicObserver/ElectronicObserver.csproj  |  30 +-
 .../Settings/ColorScheme.Solarized.json       |  79 ++
 .../Settings/ColorScheme.example.json         | 121 +++
 ElectronicObserver/Utility/Configuration.cs   | 827 ++++++++++--------
 ElectronicObserver/Window/FormCompass.cs      |   2 +-
 ElectronicObserver/Window/FormMain.cs         |  17 +-
 8 files changed, 666 insertions(+), 431 deletions(-)
 create mode 100644 ElectronicObserver/Settings/ColorScheme.Solarized.json
 create mode 100644 ElectronicObserver/Settings/ColorScheme.example.json

diff --git a/DockPanelSuite b/DockPanelSuite
index 6f83ec768..8f0fc9d42 160000
--- a/DockPanelSuite
+++ b/DockPanelSuite
@@ -1 +1 @@
-Subproject commit 6f83ec7681e670216ae408b61456083fff8ebe58
+Subproject commit 8f0fc9d4276dcf27bb9591814497a4b690521bff
diff --git a/ElectronicObserver.sln b/ElectronicObserver.sln
index 3a1e19ecd..8b2ae4eec 100644
--- a/ElectronicObserver.sln
+++ b/ElectronicObserver.sln
@@ -1,9 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElectronicObserver", "ElectronicObserver\ElectronicObserver.csproj", "{A9ABEC50-1BFC-4C69-87AE-C68DB6004F68}"
 	ProjectSection(ProjectDependencies) = postProject
 		{87A2B596-57D0-48BB-B522-895782D7A6FC} = {87A2B596-57D0-48BB-B522-895782D7A6FC}
+		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D} = {A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Browser", "Browser\Browser.csproj", "{87A2B596-57D0-48BB-B522-895782D7A6FC}"
@@ -12,11 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserLib", "BrowserLib\Br
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "DockPanelSuite\WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeVS2012Light", "DockPanelSuite\WinFormsUI\ThemeVS2012Light.csproj", "{4ED4FDB5-9FD0-49E6-876D-1635F727C755}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeSolarizedDark", "DockPanelSuite\WinFormsUI\ThemeSolarizedDark.csproj", "{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeSolarizedLight", "DockPanelSuite\WinFormsUI\ThemeSolarizedLight.csproj", "{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemeVS2012", "DockPanelSuite\WinFormsUI\ThemeVS2012.csproj", "{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -40,18 +39,10 @@ Global
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ED4FDB5-9FD0-49E6-876D-1635F727C755}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A965D7BB-5CDA-4531-AB67-58D4FA10AA6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50D6EDE2-B00E-4487-8426-9EF4D8D1D416}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ElectronicObserver/ElectronicObserver.csproj b/ElectronicObserver/ElectronicObserver.csproj
index afc1f46d1..b182641b7 100644
--- a/ElectronicObserver/ElectronicObserver.csproj
+++ b/ElectronicObserver/ElectronicObserver.csproj
@@ -600,9 +600,7 @@
       <DependentUpon>FormIntegrated.cs</DependentUpon>
     </Compile>
     <Compile Include="Window\Support\ControlHelper.cs" />
-    <Compile Include="Window\Support\CustomFloatWindowFactory.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="Window\Support\CustomFloatWindowFactory.cs" />
     <Compile Include="Window\Support\WindowPlacementManager.cs" />
     <EmbeddedResource Include="Window\Control\ImageLabel.resx">
       <DependentUpon>ImageLabel.cs</DependentUpon>
@@ -776,6 +774,12 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="Settings\ColorScheme.example.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Settings\ColorScheme.Solarized.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -789,7 +793,7 @@
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.5 %28x86 和 x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -811,27 +815,19 @@
       <Project>{8bb3e37d-09fb-40b9-958a-8cdcd18ef1f5}</Project>
       <Name>BrowserLib</Name>
     </ProjectReference>
+    <ProjectReference Include="..\DockPanelSuite\WinFormsUI\ThemeVS2012.csproj">
+      <Project>{a965d7bb-5cda-4531-ab67-58d4fa10aa6d}</Project>
+      <Name>ThemeVS2012</Name>
+    </ProjectReference>
     <ProjectReference Include="..\DockPanelSuite\WinFormsUI\WinFormsUI.csproj">
       <Project>{c75532c4-765b-418e-b09b-46d36b2abdb1}</Project>
       <Name>WinFormsUI</Name>
     </ProjectReference>
-    <ProjectReference Include="..\DockPanelSuite\WinFormsUI\ThemeVS2012Light.csproj">
-      <Project>{4ed4fdb5-9fd0-49e6-876d-1635f727c755}</Project>
-      <Name>ThemeVS2012Light</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\DockPanelSuite\WinFormsUI\ThemeSolarizedDark.csproj">
-      <Project>{a965d7bb-5cda-4531-ab67-58d4fa10aa6d}</Project>
-      <Name>ThemeSolarizedDark</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\DockPanelSuite\WinFormsUI\ThemeSolarizedLight.csproj">
-      <Project>{50d6ede2-b00e-4487-8426-9ef4d8d1d416}</Project>
-      <Name>ThemeSolarizedLight</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(TargetDir)*.*" "$(ProjectDir)..\output\"</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetDir)." "$(ProjectDir)..\output" /E</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ElectronicObserver/Settings/ColorScheme.Solarized.json b/ElectronicObserver/Settings/ColorScheme.Solarized.json
new file mode 100644
index 000000000..08793e23d
--- /dev/null
+++ b/ElectronicObserver/Settings/ColorScheme.Solarized.json
@@ -0,0 +1,79 @@
+// Solarized Light & Solarized Dark
+// Version 20170119
+// Based on "Solarized" by Ethan Schoonover (http://ethanschoonover.com/solarized)
+
+[{
+  "name": "Solarized Light",
+  "basicColors": { // SolarizedColors
+    "red":     "#dc322f",
+    "orange":  "#cb4b16",
+    "yellow":  "#b58900",
+    "green":   "#859900",
+    "cyan":    "#2aa198",
+    "blue":    "#268bd2",
+    "magenta": "#d33682",
+    "violet":  "#6c71c4"
+  },
+  "barColors": [[
+    "#c71015",
+    "#c71015",
+    "#FF8800",
+    "#FF8800",
+    "#FFBF00",
+    "#FFBF00",
+    "#469046",
+    "#469046",
+    "#268BD2",
+    "#a3c8a3",
+    "#FFD2D2",
+    "#EEE8D5"
+  ]],
+  "panelColors": {
+    "foreground":  "#586e75", // SolarizedBase01
+    "background":  "#fdf6e3", // SolarizedBase3
+    "foreground2": "#657b83", // SolarizedBase00
+    "background2": "#eee8d5", // SolarizedBase2
+    "quest": {
+      "processLT50":    "#d68d00",
+      "processLT80":    "#469046",
+      "processLT100":   "#3c897f"
+    }
+  }
+},{
+  "name": "Solarized Dark",
+  "basicColors": { // SolarizedColors
+    "red":     "#dc322f",
+    "orange":  "#cb4b16",
+    "yellow":  "#b58900",
+    "green":   "#859900",
+    "cyan":    "#2aa198",
+    "blue":    "#268bd2",
+    "magenta": "#d33682",
+    "violet":  "#6c71c4"
+  },
+  "barColors": [[
+    "#c71015",
+    "#c71015",
+    "#c94800",
+    "#c94800",
+    "#d68d00",
+    "#d68d00",
+    "#469046",
+    "#469046",
+    "#268BD2",
+    "#a3c8a3",
+    "#63080a",
+    "#073642"
+  ]],
+  "panelColors": {
+    "foreground":  "#93a1a1", // SolarizedBase1
+    "background":  "#002b36", // SolarizedBase03
+    "foreground2": "#839496", // SolarizedBase0
+    "background2": "#073642", // SolarizedBase02
+    "quest": {
+      "processLT50":    "#d68d00",
+      "processLT80":    "#469046",
+      "processLT100":   "#3c897f"
+    }
+  }
+}]
\ No newline at end of file
diff --git a/ElectronicObserver/Settings/ColorScheme.example.json b/ElectronicObserver/Settings/ColorScheme.example.json
new file mode 100644
index 000000000..29a1e1beb
--- /dev/null
+++ b/ElectronicObserver/Settings/ColorScheme.example.json
@@ -0,0 +1,121 @@
+// 除含有以双斜线开头的注释外，本文件是标准的 json 格式
+// 最外层是 array，内部每个配色主题为 object
+// [{第一个配色主题},{第二个配色主题},{第三个配色主题} ... ]
+
+[{
+  // 定义主题名，启动时会显示在日志中
+  "name": "VS2012 Light",
+
+// ######################################################
+// ## 颜色格式支持 #RGB / #RRGGBB 使用其他格式定义无效 ##
+// ######################################################
+
+  // 基本颜色 ( 后面的面板颜色优先于基本颜色 )
+  // 不排除未来这些基本颜色将被用作其他用途，请勿定义成和名称不符的颜色
+  "basicColors": {
+    "red":     "#F00",    // 红色 - 严重疲劳、大破、出击任务、elite 级深海
+    "orange":  "#FFA500", // 橙色 - 中等疲劳、中破、flagship 级深海
+    "yellow":  "#FF0",    // 黄色 - 轻微疲劳、小破、
+    "green":   "#0F0",    // 绿色 - 
+    "cyan":    "#0FF",    // 青色 - 装备改修等级
+    "blue":    "#00F",    // 蓝色 - 战意高扬、满血、任务进度 100%
+    "magenta": "#F0F",    // 洋红 - 航空队全灭 ( 残机数 0 )
+    "violet":  "#EE82EE"  // 紫色 - 改装任务
+  },
+  // 数值条颜色
+  "barColors": [[
+    "#FF0000", // 大破
+    "#FF0000", // 大破
+    "#FF8800", // 中破
+    "#FF8800", // 中破
+    "#FFCC00", // 小破
+    "#FFCC00", // 小破
+    "#00CC00", // 擦伤
+    "#00CC00", // 擦伤
+    "#0044CC", // 无伤
+    "#44FF00", // 未使用 ? (_barColorIncrement)
+    "#882222", // 造成伤害
+    "#888888"  // 背景色
+  ],[
+    // 开启 "更多阶数值条颜色" 时的定义
+    "#FF0000", // 大破
+    "#FF0000", // 大破
+    "#FF4400", // 中破
+    "#FF8800", // 中破
+    "#FFAA00", // 小破
+    "#EEEE00", // 小破
+    "#CCEE00", // 擦伤
+    "#00CC00", // 擦伤
+    "#0044CC", // 无伤
+    "#00FF44", //
+    "#882222", // 造成伤害
+    "#888888"  // 背景色
+  ]],
+  // 面板颜色
+  "panelColors": {
+    "foreground":  "#000000", // 主文字色 - 大部分文字颜色
+    "background":  "#F0F0F0", // 主背景色 - 各面板背景颜色
+    "foreground2": "#000000", // 副文字色 - 副背景色上的文字颜色
+    "background2": "#E3E3E3", // 副背景色 - 状态栏背景、各种分隔线
+
+//  ######################################################
+//  ##  以下颜色均存在默认值，在每行注释后的 [] 内标出  ##
+//  ######################################################
+
+  // 状态栏
+  "statusBarFG" : "#000000", // [foreground2] 状态栏文字色
+  "statusBarBG" : "#E3E3E3", // [background2] 状态栏背景色
+
+    // 主界面 - 标签页
+    // 注：自定义配色刚刚实现，以下三组颜色暂不建议设置为不同颜色
+    "tabActiveFG":    "#FFFFFF", // [foreground2] 活动前台标签页文字色
+    "tabActiveBG":    "#007ACC", // [background2] 活动前台标签页背景色
+    "tabLostFocusFG": "#FFFFFF", // [foreground2] 非活动前台标签页文字色
+    "tabLostFocusBG": "#007ACC", // [background2] 非活动前台标签页背景色
+    "tabHoverFG":     "#FFFFFF", // [foreground2] 光标悬停后台标签页文字色
+    "tabHoverBG":     "#1C97EA", // [background2] 光标悬停后台标签页背景色
+    // 视图 - 舰队
+    "fleet": {
+      "conditionVeryTired":   "#F08080", // [red]    严重疲劳
+      "conditionTired":       "#FFA07A", // [orange] 中等疲劳
+      "conditionLittleTired": "#FFE4B5", // [yellow] 轻微疲劳
+      "conditionSparkle":     "#90EE90", // [blue]   战意高扬
+      "equipmentLevel":       "#006666"  // [cyan]   装备改修值
+    },
+    // 视图 - 司令部
+    "hq": {
+      "empty": "place_holder"
+    },
+    // 视图 - 任务
+    "quest": {
+      "typeHensei":     "#AAFFAA", // [green]  编成类任务
+      "typeShutsugeki": "#FFCCCC", // [red]    出击类任务
+      "typeEnshu":      "#DDFFAA", // [green]  演习类任务
+      "typeEnsei":      "#DDFFAA", // [cyan]   远征类任务
+      "typeHokyu":      "#CCFFFF", // [yellow] 补给、入渠类任务
+      "typeKojo":       "#DDCCBB", // [orange] 工厂类任务
+      "typeKaiso":      "#DDCCFF", // [violet] 改装类任务
+      "processLT50":    "#FF8800", // [orange] 任务进度 <50%
+      "processLT80":    "#00CC00", // [green]  任务进度 <80%
+      "processLT100":   "#008800", // [cyan]   任务进度 <100%
+      "processDefault": "#0088FF"  // [blue]   任务进度 100%
+    },
+    // 视图 - 罗盘
+    "compass": {
+      "shipClass2": "#F00",    // [red]     elite
+      "shipClass3": "#FF8800", // [orange]  flagship
+      "shipClass4": "#0088FF", // [blue]    改 flagship / 后期型
+      "shipClass5": "#880000", // [magenta] 后期型 elite
+      "shipClass6": "#884400", // [yellow]  后期型 flagship
+      "eventKind3": "#000080", // [violet]  夜战
+      "eventKind6": "#006400", // [green]   航空战
+      "eventKind5": "#8B0000"  // [violet]  敌联合
+    },
+    // 视图 - 战斗
+    "battle": {
+      "barBossDamaged": "#FFE4E1", // [orange]      受损状态 BOSS
+      "barMVP":         "#FFE4B5", // [blue]        MVP
+      "barEscaped":     "#C0C0C0"  // [background2] 已退避
+    }
+  }
+}]
\ No newline at end of file
diff --git a/ElectronicObserver/Utility/Configuration.cs b/ElectronicObserver/Utility/Configuration.cs
index 399798086..c9d8620ac 100644
--- a/ElectronicObserver/Utility/Configuration.cs
+++ b/ElectronicObserver/Utility/Configuration.cs
@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -199,31 +200,12 @@ public bool BarColorMorphing {
 					}
 				}
 
-				private void SetBarColorScheme() {
+				public void SetBarColorScheme() {
+					if ( BarColorSchemes == null ) return;
 					if ( !_barColorMorphing ) {
-						switch (ThemeID) {
-						case 0:
-							BarColorScheme = new List<SerializableColor>( DefaultBarColorScheme[4] );
-							break;
-						case 1:
-							BarColorScheme = new List<SerializableColor>( DefaultBarColorScheme[2] );
-							break;
-						default:
-							BarColorScheme = new List<SerializableColor>( DefaultBarColorScheme[0] );
-							break;
-						}
+						BarColorScheme = new List<SerializableColor>( BarColorSchemes[0] );
 					} else {
-						switch (ThemeID) {
-						case 0:
-							BarColorScheme = new List<SerializableColor>( DefaultBarColorScheme[5] );
-							break;
-						case 1:
-							BarColorScheme = new List<SerializableColor>( DefaultBarColorScheme[3] );
-							break;
-						default:
-							BarColorScheme = new List<SerializableColor>( DefaultBarColorScheme[1] );
-							break;
-						}
+						BarColorScheme = new List<SerializableColor>( BarColorSchemes[1] );
 					}
 				}
 
@@ -232,174 +214,54 @@ private void SetBarColorScheme() {
 				/// </summary>
 				public List<SerializableColor> BarColorScheme { get; private set; }
 
-
-				[IgnoreDataMember]
-				private readonly List<SerializableColor>[] DefaultBarColorScheme = new List<SerializableColor>[] {
-					new List<SerializableColor>() {
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF8800 ),
-						SerializableColor.UIntToColor( 0xFFFF8800 ),
-						SerializableColor.UIntToColor( 0xFFFFCC00 ),
-						SerializableColor.UIntToColor( 0xFFFFCC00 ),
-						SerializableColor.UIntToColor( 0xFF00CC00 ),
-						SerializableColor.UIntToColor( 0xFF00CC00 ),
-						SerializableColor.UIntToColor( 0xFF0044CC ),
-						SerializableColor.UIntToColor( 0xFF44FF00 ),
-						SerializableColor.UIntToColor( 0xFF882222 ),
-						SerializableColor.UIntToColor( 0xFF888888 ),
-					},
-					/*/// recognize
-					new List<SerializableColor>() {
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF6600 ),
-						SerializableColor.UIntToColor( 0xFFFF9900 ),
-						SerializableColor.UIntToColor( 0xFFFFCC00 ),
-						SerializableColor.UIntToColor( 0xFFEEEE00 ),
-						SerializableColor.UIntToColor( 0xFFAAEE00 ),
-						SerializableColor.UIntToColor( 0xFF00CC00 ),
-						SerializableColor.UIntToColor( 0xFF0044CC ),
-						SerializableColor.UIntToColor( 0xFF00FF44 ),
-						SerializableColor.UIntToColor( 0xFF882222 ),
-						SerializableColor.UIntToColor( 0xFF888888 ),
-					},
-					/*/// gradation
-					new List<SerializableColor>() {
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF4400 ),
-						SerializableColor.UIntToColor( 0xFFFF8800 ),
-						SerializableColor.UIntToColor( 0xFFFFAA00 ),
-						SerializableColor.UIntToColor( 0xFFEEEE00 ),
-						SerializableColor.UIntToColor( 0xFFCCEE00 ),
-						SerializableColor.UIntToColor( 0xFF00CC00 ),
-						SerializableColor.UIntToColor( 0xFF0044CC ),
-						SerializableColor.UIntToColor( 0xFF00FF44 ),
-						SerializableColor.UIntToColor( 0xFF882222 ),
-						SerializableColor.UIntToColor( 0xFF888888 ),
-					},
-					//*/
-					new List<SerializableColor>() { // SolarizedDark
-						SerializableColor.UIntToColor( 0xFFc71015 ), // Red
-						SerializableColor.UIntToColor( 0xFFc71015 ), // Red
-						SerializableColor.UIntToColor( 0xFFc94800 ), // Orange
-						SerializableColor.UIntToColor( 0xFFc94800 ), // Orange
-						SerializableColor.UIntToColor( 0xFFd68d00 ), // Yellow
-						SerializableColor.UIntToColor( 0xFFd68d00 ), // Yellow
-						SerializableColor.UIntToColor( 0xFF469046 ), // Green
-						SerializableColor.UIntToColor( 0xFF469046 ), // Green
-						// SerializableColor.UIntToColor( 0xFF105da7 ), // Blue
-						SerializableColor.UIntToColor( 0xFF268BD2 ), // SolarizedBlue
-						SerializableColor.UIntToColor( 0xFFa3c8a3 ), // Lighter Green
-						SerializableColor.UIntToColor( 0xFF63080a ), // Darker Red
-						SerializableColor.UIntToColor( 0xFF073642 ), // SolarizedBase02
-					},
-					new List<SerializableColor>() {
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF4400 ),
-						SerializableColor.UIntToColor( 0xFFFF8800 ),
-						SerializableColor.UIntToColor( 0xFFFFAA00 ),
-						SerializableColor.UIntToColor( 0xFFEEEE00 ),
-						SerializableColor.UIntToColor( 0xFFCCEE00 ),
-						SerializableColor.UIntToColor( 0xFF00CC00 ),
-						SerializableColor.UIntToColor( 0xFF0044CC ),
-						SerializableColor.UIntToColor( 0xFF00FF44 ),
-						SerializableColor.UIntToColor( 0xFF882222 ),
-						SerializableColor.UIntToColor( 0xFF888888 ),
-					},
-					new List<SerializableColor>() { // SolarizedLight
-						SerializableColor.UIntToColor( 0xFFc71015 ), // Red
-						SerializableColor.UIntToColor( 0xFFc71015 ), // Red
-						SerializableColor.UIntToColor( 0xFFFF8800 ), // MEDIUM DAMAGED
-						SerializableColor.UIntToColor( 0xFFFF8800 ), // MEDIUM DAMAGED
-						SerializableColor.UIntToColor( 0xFFFFBF00 ), // LITTLE DAMAGED
-						SerializableColor.UIntToColor( 0xFFFFBF00 ), // LITTLE DAMAGED
-						SerializableColor.UIntToColor( 0xFF469046 ), // Green
-						SerializableColor.UIntToColor( 0xFF469046 ), // Green
-						SerializableColor.UIntToColor( 0xFF268BD2 ), // SolarizedBlue
-						SerializableColor.UIntToColor( 0xFFa3c8a3 ), // Lighter Green
-						SerializableColor.UIntToColor( 0xFFFFD2D2 ), // DAMAGE RECEIVED
-						SerializableColor.UIntToColor( 0xFFEEE8D5 ), // SolarizedBase2
-					},
-					new List<SerializableColor>() {
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF0000 ),
-						SerializableColor.UIntToColor( 0xFFFF4400 ),
-						SerializableColor.UIntToColor( 0xFFFF8800 ),
-						SerializableColor.UIntToColor( 0xFFFFAA00 ),
-						SerializableColor.UIntToColor( 0xFFEEEE00 ),
-						SerializableColor.UIntToColor( 0xFFCCEE00 ),
-						SerializableColor.UIntToColor( 0xFF00CC00 ),
-						SerializableColor.UIntToColor( 0xFF0044CC ),
-						SerializableColor.UIntToColor( 0xFF00FF44 ),
-						SerializableColor.UIntToColor( 0xFF882222 ),
-						SerializableColor.UIntToColor( 0xFF888888 ),
-					},
-				};
-
 				#region - UI Colors -
 
-				public SerializableColor SolarizedBase03 { get; set; }
-				public SerializableColor SolarizedBase02 { get; set; }
-				public SerializableColor SolarizedBase01 { get; set; }
-				public SerializableColor SolarizedBase00 { get; set; }
-				public SerializableColor SolarizedBase0 { get; set; }
-				public SerializableColor SolarizedBase1 { get; set; }
-				public SerializableColor SolarizedBase2 { get; set; }
-				public SerializableColor SolarizedBase3 { get; set; }
-				public SerializableColor SolarizedYellow  { get; set; }
-				public SerializableColor SolarizedOrange  { get; set; }
-				public SerializableColor SolarizedRed     { get; set; }
-				public SerializableColor SolarizedMagenta { get; set; }
-				public SerializableColor SolarizedViolet  { get; set; }
-				public SerializableColor SolarizedBlue    { get; set; }
-				public SerializableColor SolarizedCyan    { get; set; }
-				public SerializableColor SolarizedGreen   { get; set; }
-				// 常用背景色、前景色
-				public Color BackColor { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBase3.ColorData;
-					case 1:  return SolarizedBase03.ColorData;
-					default: return SystemColors.Control;
-				}}}
-				public Color ForeColor { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBase01.ColorData;
-					case 1:  return SolarizedBase1.ColorData;
-					default: return SystemColors.ControlText;
-				}}}
-				public Color SubBackColor { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBase2.ColorData;
-					case 1:  return SolarizedBase02.ColorData;
-					default: return Color.FromArgb(0xCC, 0xCE, 0xDB);
-				}}}
-				public Color SubForeColor { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBase00.ColorData;
-					case 1:  return SolarizedBase0.ColorData;
-					default: return Color.FromArgb(0x6D, 0x6D, 0x6D);
-				}}}
-				public Pen SubBackColorPen { get {
-				switch (ThemeID) {
-					case 0:  return new Pen(SolarizedBase2.ColorData, 1);
-					case 1:  return new Pen(SolarizedBase02.ColorData, 1);
-					default: return Pens.Silver;
-				}}}
-				public Color Color_Red { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedRed.ColorData;
-					case 1:  return SolarizedRed.ColorData;
-					default: return Color.Red;
-				}}}
-				public Color Color_Magenta { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedMagenta.ColorData;
-					case 1:  return SolarizedMagenta.ColorData;
-					default: return Color.FromArgb( 0xFF, 0x00, 0xFF );
-				}}}
+				// 数值条 ( 耐久、燃料、弹药... ) 颜色
+				[IgnoreDataMember]
+				public List<SerializableColor>[] BarColorSchemes { get; set; }
+				// 面板颜色
+				[IgnoreDataMember]
+				public Color ForeColor { get; set; }
+				[IgnoreDataMember]
+				public Color BackColor { get; set; }
+				[IgnoreDataMember]
+				public Color SubForeColor { get; set; }
+				[IgnoreDataMember]
+				public Color SubBackColor { get; set; }
+				[IgnoreDataMember]
+				public Pen SubBackColorPen { get; set; }
+				// 状态栏颜色
+				[IgnoreDataMember]
+				public Color StatusBarForeColor { get; set; }
+				[IgnoreDataMember]
+				public Color StatusBarBackColor { get; set; }
+				// 标签页颜色 ( DockPanelSuite )
+				[IgnoreDataMember]
+				public string[] DockPanelSuiteStyles { get; set; }
+				// 基本颜色
+				[IgnoreDataMember]
+				public Color Color_Red { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Orange { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Yellow { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Green { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Cyan { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Blue { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Magenta { get; set; }
+				[IgnoreDataMember]
+				public Color Color_Violet { get; set; }
+
+				// 待整理
+				public Color Blink_ForeColor { get { return BackColor; } }
+				public Color Blink_SubForeColor { get { return SubBackColor; } }
+				public Color Blink_BackColorLightCoral { get { return Color_Red; } }
+				public Color Blink_BackColorLightGreen { get { return Color_Cyan; } }
+/*
 				public Color Blink_ForeColor { get {
 				switch (ThemeID) {
 					case 0:  return SolarizedBase3.ColorData;
@@ -408,196 +270,93 @@ public Color Blink_ForeColor { get {
 				}}}
 				public Color Blink_SubForeColor { get {
 				switch (ThemeID) {
-					case 0:  return SolarizedBase2.ColorData;
-					case 1:  return SolarizedBase02.ColorData;
+					//case 0:  return SolarizedBase2.ColorData;
+					//case 1:  return SolarizedBase02.ColorData;
 					default: return SystemColors.ControlText;
 				}}}
 				public Color Blink_BackColorLightCoral { get {
 				switch (ThemeID) {
-					case 0:  return SolarizedRed.ColorData;
-					case 1:  return SolarizedRed.ColorData;
+					//case 0:  return SolarizedRed.ColorData;
+					//case 1:  return SolarizedRed.ColorData;
 					default: return Color.LightCoral;
 				}}}
 				public Color Blink_BackColorLightGreen { get {
 				switch (ThemeID) {
-					case 0:  return SolarizedCyan.ColorData;
-					case 1:  return SolarizedCyan.ColorData;
+					//case 0:  return SolarizedCyan.ColorData;
+					//case 1:  return SolarizedCyan.ColorData;
 					default: return Color.LightGreen;
 				}}}
-				// 视图 - 舰队：疲劳度
-				public Color Fleet_ColorConditionVeryTired { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedRed.ColorData;
-					case 1:  return SolarizedRed.ColorData;
-					default: return Color.LightCoral;
-				}}}
-				public Color Fleet_ColorConditionTired { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedOrange.ColorData;
-					case 1:  return SolarizedOrange.ColorData;
-					default: return Color.LightSalmon;
-				}}}
-				public Color Fleet_ColorConditionLittleTired { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedYellow.ColorData;
-					case 1:  return SolarizedYellow.ColorData;
-					default: return Color.Moccasin;
-				}}}
-				public Color Fleet_ColorConditionSparkle { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBlue.ColorData;
-					case 1:  return SolarizedBlue.ColorData;
-					default: return Color.LightGreen;
-				}}}
-				// 视图 - 舰队：装备改修
-				public Color Fleet_equipmentLevelColor { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedCyan.ColorData;
-					case 1:  return SolarizedCyan.ColorData;
-					default: return Color.FromArgb(0x00, 0x66, 0x66);
-				}}}
-				// 视图 - 任务：任务种类
-				public Color Quest_Type1Color { get { // 编成
-				switch (ThemeID) {
-					case 0:  return SolarizedGreen.ColorData;
-					case 1:  return SolarizedGreen.ColorData;
-					default: return Color.FromArgb(0xAA, 0xFF, 0xAA);
-				}}}
-				public Color Quest_Type2Color { get { // 出击
-				switch (ThemeID) {
-					case 0:  return SolarizedRed.ColorData;
-					case 1:  return SolarizedRed.ColorData;
-					default: return Color.FromArgb(0xFF, 0xCC, 0xCC);
-				}}}
-				public Color Quest_Type3Color { get { // 演习
-				switch (ThemeID) {
-					case 0:  return SolarizedGreen.ColorData;
-					case 1:  return SolarizedGreen.ColorData;
-					default: return Color.FromArgb(0xDD, 0xFF, 0xAA);
-				}}}
-				public Color Quest_Type4Color { get { // 远征
-				switch (ThemeID) {
-					case 0:  return SolarizedCyan.ColorData;
-					case 1:  return SolarizedCyan.ColorData;
-					default: return Color.FromArgb(0xCC, 0xFF, 0xFF);
-				}}}
-				public Color Quest_Type5Color { get { // 补给、入渠
-				switch (ThemeID) {
-					case 0:  return SolarizedYellow.ColorData;
-					case 1:  return SolarizedYellow.ColorData;
-					default: return Color.FromArgb(0xFF, 0xFF, 0xCC);
-				}}}
-				public Color Quest_Type6Color { get { // 工厂
-				switch (ThemeID) {
-					case 0:  return SolarizedOrange.ColorData;
-					case 1:  return SolarizedOrange.ColorData;
-					default: return Color.FromArgb(0xDD, 0xCC, 0xBB);
-				}}}
-				public Color Quest_Type7Color { get { // 改装
-				switch (ThemeID) {
-					case 0:  return SolarizedViolet.ColorData;
-					case 1:  return SolarizedViolet.ColorData;
-					default: return Color.FromArgb(0xDD, 0xCC, 0xFF);
-				}}}
-				// 视图 - 任务：任务进度
-				public Color Quest_ColorProcessLT50 { get {
-				switch (ThemeID) {
-					case 0:  return Color.FromArgb( 0xD6, 0x8D, 0x00 ); // Orange
-					case 1:  return Color.FromArgb( 0xD6, 0x8D, 0x00 );
-					default: return Color.FromArgb( 0xFF, 0x88, 0x00 );
-				}}}
-				public Color Quest_ColorProcessLT80 { get {
-				switch (ThemeID) {
-					case 0:  return Color.FromArgb( 0x46, 0x90, 0x46 ); // Green
-					case 1:  return Color.FromArgb( 0x46, 0x90, 0x46 );
-					default: return Color.FromArgb( 0x00, 0xCC, 0x00 );
-				}}}
-				public Color Quest_ColorProcessLT100 { get {
-				switch (ThemeID) {
-					case 0:  return Color.FromArgb( 0x3C, 0x89, 0x7F ); // Cyan
-					case 1:  return Color.FromArgb( 0x3C, 0x89, 0x7F );
-					default: return Color.FromArgb( 0x00, 0x88, 0x00 );
-				}}}
-				public Color Quest_ColorProcessDefault { get {
-				switch (ThemeID) {
-					case 0:  return Color.FromArgb( 0x26, 0x8B, 0xD2 ); // Solarized Blue
-					case 1:  return Color.FromArgb( 0x26, 0x8B, 0xD2 );
-					default: return Color.FromArgb( 0x00, 0x88, 0xFF );
-				}}}
-				// 视图 - 罗盘：敌舰名、事件名
-				public Color Compass_ShipNameColor3 { get { // Flagship
-				switch (ThemeID) {
-					case 0:  return SolarizedOrange.ColorData;
-					case 1:  return SolarizedOrange.ColorData;
-					default: return Color.FromArgb(0xFF, 0x88, 0x00);
-				}}}
-				public Color Compass_ShipNameColor4 { get { // Latemodel, Flagship kai
-				switch (ThemeID) {
-					case 0:  return SolarizedBlue.ColorData;
-					case 1:  return SolarizedBlue.ColorData;
-					default: return Color.FromArgb(0x00, 0x88, 0xFF);
-				}}}
-				public Color Compass_ShipNameColor5 { get { // Latemodel Elite
-				switch (ThemeID) {
-					case 0:  return SolarizedMagenta.ColorData;
-					case 1:  return SolarizedMagenta.ColorData;
-					default: return Color.FromArgb(0x88, 0x00, 0x00);
-				}}}
-				public Color Compass_ShipNameColor6 { get { // Latemodel Flagship
-				switch (ThemeID) {
-					case 0:  return SolarizedYellow.ColorData;
-					case 1:  return SolarizedYellow.ColorData;
-					default: return Color.FromArgb(0x88, 0x44, 0x00);
-				}}}
-				public Color Compass_ColorTextEventKind3 { get { // Night Battle
-				switch (ThemeID) {
-					case 0:  return SolarizedViolet.ColorData;
-					case 1:  return SolarizedViolet.ColorData;
-					default: return Color.Navy;
-				}}}
-				public Color Compass_ColorTextEventKind6 { get { // Air Battle
-				switch (ThemeID) {
-					case 0:  return SolarizedGreen.ColorData;
-					case 1:  return SolarizedGreen.ColorData;
-					default: return Color.DarkGreen;
-				}}}
-				public Color Compass_ColorTextEventKind5 { get { // Enemy Combined
-				switch (ThemeID) {
-					case 0:  return SolarizedRed.ColorData;
-					case 1:  return SolarizedRed.ColorData;
-					default: return Color.DarkRed;
-				}}}
-				public Color Compass_ColoroverlayBrush { get { // 当舰载机数量叠加到飞机图标上时背景填充的色块
-				switch (ThemeID) {
-					case 0:  return Color.FromArgb(0xC0, 0xFD, 0xF6, 0xE3);
-					case 1:  return Color.FromArgb(0xC0, 0x00, 0x2B, 0x36);
-					default: return Color.FromArgb(0xC0, 0xF0, 0xF0, 0xF0);
-				}}}
+*/
+				// 视图 - 舰队
+				[IgnoreDataMember] // 严重疲劳
+				public Color Fleet_ColorConditionVeryTired { get; set; }
+				[IgnoreDataMember] // 中等疲劳
+				public Color Fleet_ColorConditionTired { get; set; }
+				[IgnoreDataMember] // 轻微疲劳
+				public Color Fleet_ColorConditionLittleTired { get; set; }
+				[IgnoreDataMember] // 战意高扬
+				public Color Fleet_ColorConditionSparkle { get; set; }
+				[IgnoreDataMember] // 装备改修值
+				public Color Fleet_equipmentLevelColor { get; set; }
+
+				// 视图 - 任务
+				[IgnoreDataMember] // 编成
+				public Color Quest_Type1Color { get; set; }
+				[IgnoreDataMember] // 出击
+				public Color Quest_Type2Color { get; set; }
+				[IgnoreDataMember] // 演习
+				public Color Quest_Type3Color { get; set; }
+				[IgnoreDataMember] // 远征
+				public Color Quest_Type4Color { get; set; }
+				[IgnoreDataMember] // 补给、入渠
+				public Color Quest_Type5Color { get; set; }
+				[IgnoreDataMember] // 工厂
+				public Color Quest_Type6Color { get; set; }
+				[IgnoreDataMember] // 改装
+				public Color Quest_Type7Color { get; set; }
+				[IgnoreDataMember] // 进度 <50%
+				public Color Quest_ColorProcessLT50 { get; set; }
+				[IgnoreDataMember] // 进度 <80%
+				public Color Quest_ColorProcessLT80 { get; set; }
+				[IgnoreDataMember] // 进度 <100%
+				public Color Quest_ColorProcessLT100 { get; set; }
+				[IgnoreDataMember] // 进度 100%
+				public Color Quest_ColorProcessDefault { get; set; }
+
+				// 视图 - 罗盘
+				[IgnoreDataMember] // 敌舰名 - elite
+				public Color Compass_ShipNameColor2 { get; set; }
+				[IgnoreDataMember] // 敌舰名 - flagship
+				public Color Compass_ShipNameColor3 { get; set; }
+				[IgnoreDataMember] // 敌舰名 - 改 flagship / 后期型
+				public Color Compass_ShipNameColor4 { get; set; }
+				[IgnoreDataMember] // 敌舰名 - 后期型 elite
+				public Color Compass_ShipNameColor5 { get; set; }
+				[IgnoreDataMember] // 敌舰名 - 后期型 flagship
+				public Color Compass_ShipNameColor6 { get; set; }
+				[IgnoreDataMember] // 事件类型 - 夜战
+				public Color Compass_ColorTextEventKind3 { get; set; }
+				[IgnoreDataMember] // 事件类型 - 航空战 / 长距离空袭战
+				public Color Compass_ColorTextEventKind6 { get; set; }
+				[IgnoreDataMember] // 事件类型 - 敌联合舰队
+				public Color Compass_ColorTextEventKind5 { get; set; }
+				[IgnoreDataMember] // 半透明背景色，当舰载机数量叠加到飞机图标上时背景填充的色块
+				public Color Compass_ColoroverlayBrush { get; set; }
+				// default: return Color.FromArgb(0xC0, 0xF0, 0xF0, 0xF0);
+
 				// 视图 - 战斗：血条背景色、血条文字色
-				public Color Battle_ColorHPBarsBossDamaged { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedOrange.ColorData;
-					case 1:  return SolarizedOrange.ColorData;
-					default: return Color.MistyRose;
-				}}}
-				public Color Battle_ColorHPBarsMVP { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedYellow.ColorData;
-					case 1:  return SolarizedYellow.ColorData;
-					default: return Color.Moccasin;
-				}}}
-				public Color Battle_ColorHPBarsEscaped { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBase1.ColorData;
-					case 1:  return SolarizedBase01.ColorData;
-					default: return Color.Silver;
-				}}}
+				[IgnoreDataMember] // 受损状态 BOSS
+				public Color Battle_ColorHPBarsBossDamaged { get; set; }
+				[IgnoreDataMember] // MVP
+				public Color Battle_ColorHPBarsMVP { get; set; }
+				[IgnoreDataMember] // 已退避
+				public Color Battle_ColorHPBarsEscaped { get; set; }
+
+				// 视图 - 舰队：入渠中计时器
 				public Color Battle_ColorHPTextRepair { get {
-				switch (ThemeID) {
-					case 0:  return SolarizedBase1.ColorData;
-					case 1:  return SolarizedBase01.ColorData;
-					default: return Color.FromArgb(0x00, 0x00, 0x88);
-				}}}
+					return SubBackColor;
+					// return Color.FromArgb(0x00, 0x00, 0x88);
+				}}
 				public bool RemoveBarShadow { get {
 				switch (ThemeID) {
 					case 0:  return true;
@@ -612,25 +371,8 @@ public ConfigUI() {
 					SubFont  = new Font( "Microsoft YaHei", 10, FontStyle.Regular, GraphicsUnit.Pixel );
 					JapFont  = new Font( "Meiryo UI", 12, FontStyle.Regular, GraphicsUnit.Pixel );
 					JapFont2 = new Font( "Meiryo UI", 10, FontStyle.Regular, GraphicsUnit.Pixel );
-					ThemeID = 0; // 0 - SolarizedLight; 1 - SolarizedDark; other - VS2012Light
+					ThemeID = 0;
 					BarColorMorphing = false;
-					// Solarized
-					SolarizedBase03 = new SerializableColor(0xFF002B36);
-					SolarizedBase02 = new SerializableColor(0xFF073642);
-					SolarizedBase01 = new SerializableColor(0xFF586E75);
-					SolarizedBase00 = new SerializableColor(0xFF657B83);
-					SolarizedBase0 = new SerializableColor(0xFF839496);
-					SolarizedBase1 = new SerializableColor(0xFF93A1A1);
-					SolarizedBase2 = new SerializableColor(0xFFEEE8D5);
-					SolarizedBase3 = new SerializableColor(0xFFFDF6E3);
-					SolarizedYellow  = new SerializableColor(0xFFB58900);
-					SolarizedOrange  = new SerializableColor(0xFFCB4B16);
-					SolarizedRed     = new SerializableColor(0xFFDC322F);
-					SolarizedMagenta = new SerializableColor(0xFFD33682); 
-					SolarizedViolet  = new SerializableColor(0xFF6C71C4);
-					SolarizedBlue    = new SerializableColor(0xFF268BD2);
-					SolarizedCyan    = new SerializableColor(0xFF2AA198);
-					SolarizedGreen   = new SerializableColor(0xFF859900);
 				}
 			}
 			/// <summary>UI</summary>
@@ -1615,6 +1357,321 @@ public void Load( Form mainForm ) {
 				}
 
 			}
+
+			// 读取配色主题 ( 默认值待编辑 )
+			dynamic json = DynamicJson.Parse(@"[{""name"":""VS2012Light""}]");
+			//if (File.Exists(@"Settings\ColorScheme.json")) {
+			try {
+				string s = String.Empty;
+				StringBuilder sb = new StringBuilder();
+				// 读取配色文件
+				using (StreamReader sr = File.OpenText(@"Settings\ColorScheme.json")) {
+					while ((s = sr.ReadLine()) != null) {
+						// 干掉注释，因为 DynamicJson 不支持注释
+						s = Regex.Replace(s, @"\/\/.*?$", string.Empty);
+						if (!String.IsNullOrWhiteSpace(s)) sb.Append(s);
+					}
+				}
+				json = DynamicJson.Parse(sb.ToString());
+			} catch (FileNotFoundException) {
+				Logger.Add(2, "", @"Settings\ColorScheme.json 不存在。");
+			} catch {
+				Logger.Add(2, "", @"解析 Settings\ColorScheme.json 失败。");
+			}
+			int themeId = Config.UI.ThemeID;
+			if (!json.IsDefined(themeId)) {
+				themeId = Config.UI.ThemeID = 0;
+				Logger.Add(2, "", "指定的 ThemeID 不存在。");
+			}
+			ThemeStyle = json[themeId];
+			Logger.Add(2, "", "载入配色主题 : " + ThemeStyle["name"]);
+			// 定义基本颜色
+			Config.UI.Color_Red     = ThemeColor("basicColors", "red");
+			Config.UI.Color_Orange  = ThemeColor("basicColors", "orange");
+			Config.UI.Color_Yellow  = ThemeColor("basicColors", "yellow");
+			Config.UI.Color_Green   = ThemeColor("basicColors", "green");
+			Config.UI.Color_Cyan    = ThemeColor("basicColors", "cyan");
+			Config.UI.Color_Blue    = ThemeColor("basicColors", "blue");
+			Config.UI.Color_Magenta = ThemeColor("basicColors", "magenta");
+			Config.UI.Color_Violet  = ThemeColor("basicColors", "violet");
+			// 定义面板颜色
+			Config.UI.ForeColor = ThemeColor("panelColors", "foreground");
+			Config.UI.BackColor = ThemeColor("panelColors", "background");
+			Config.UI.SubForeColor = ThemeColor("panelColors", "foreground2");
+			Config.UI.SubBackColor = ThemeColor("panelColors", "background2");
+			Config.UI.SubBackColorPen = new Pen(Config.UI.SubBackColor);
+			// 状态栏颜色
+			Config.UI.StatusBarForeColor = ThemeColor("panelColors", "statusBarFG");
+			Config.UI.StatusBarBackColor = ThemeColor("panelColors", "statusBarBG");
+			// 定义 UI (DockPanelSuite) 颜色
+			Config.UI.DockPanelSuiteStyles = new string[] {
+				ThemeColorHex("panelColors", "foreground"),
+				ThemeColorHex("panelColors", "background"),
+				ThemeColorHex("panelColors", "background2"),
+				ThemeColorHex("panelColors", "tabActiveFG"),
+				ThemeColorHex("panelColors", "tabActiveBG"),
+				ThemeColorHex("panelColors", "tabLostFocusFG"),
+				ThemeColorHex("panelColors", "tabLostFocusBG"),
+				ThemeColorHex("panelColors", "tabHoverFG"),
+				ThemeColorHex("panelColors", "tabHoverBG")
+			};
+			// 定义数值条颜色
+			Config.UI.BarColorSchemes = new List<SerializableColor>[] {
+				new List<SerializableColor>() {
+					ThemeBarColor(0, 0),
+					ThemeBarColor(0, 1),
+					ThemeBarColor(0, 2),
+					ThemeBarColor(0, 3),
+					ThemeBarColor(0, 4),
+					ThemeBarColor(0, 5),
+					ThemeBarColor(0, 6),
+					ThemeBarColor(0, 7),
+					ThemeBarColor(0, 8),
+					ThemeBarColor(0, 9),
+					ThemeBarColor(0, 10),
+					ThemeBarColor(0, 11)
+				},
+				new List<SerializableColor>() {
+					ThemeBarColor(1, 0),
+					ThemeBarColor(1, 1),
+					ThemeBarColor(1, 2),
+					ThemeBarColor(1, 3),
+					ThemeBarColor(1, 4),
+					ThemeBarColor(1, 5),
+					ThemeBarColor(1, 6),
+					ThemeBarColor(1, 7),
+					ThemeBarColor(1, 8),
+					ThemeBarColor(1, 9),
+					ThemeBarColor(1, 10),
+					ThemeBarColor(1, 11)
+				}
+			};
+			Config.UI.SetBarColorScheme();
+			// 设定各面板颜色
+			Config.UI.Fleet_ColorConditionVeryTired   = ThemePanelColor("fleet", "conditionVeryTired");
+			Config.UI.Fleet_ColorConditionTired       = ThemePanelColor("fleet", "conditionTired");
+			Config.UI.Fleet_ColorConditionLittleTired = ThemePanelColor("fleet", "conditionLittleTired");
+			Config.UI.Fleet_ColorConditionSparkle     = ThemePanelColor("fleet", "conditionSparkle");
+			Config.UI.Fleet_equipmentLevelColor = ThemePanelColor("fleet", "equipmentLevel");
+			Config.UI.Quest_Type1Color = ThemePanelColor("quest", "typeHensei");
+			Config.UI.Quest_Type2Color = ThemePanelColor("quest", "typeShutsugeki");
+			Config.UI.Quest_Type3Color = ThemePanelColor("quest", "typeEnshu");
+			Config.UI.Quest_Type4Color = ThemePanelColor("quest", "typeEnsei");
+			Config.UI.Quest_Type5Color = ThemePanelColor("quest", "typeHokyu");
+			Config.UI.Quest_Type6Color = ThemePanelColor("quest", "typeKojo");
+			Config.UI.Quest_Type7Color = ThemePanelColor("quest", "typeKaiso");
+			Config.UI.Quest_ColorProcessLT50 = ThemePanelColor("quest", "processLT50");
+			Config.UI.Quest_ColorProcessLT80 = ThemePanelColor("quest", "processLT80");
+			Config.UI.Quest_ColorProcessLT100 = ThemePanelColor("quest", "processLT100");
+			Config.UI.Quest_ColorProcessDefault = ThemePanelColor("quest", "processDefault");
+			Config.UI.Compass_ShipNameColor2 = ThemePanelColor("compass", "shipClass2");
+			Config.UI.Compass_ShipNameColor3 = ThemePanelColor("compass", "shipClass3");
+			Config.UI.Compass_ShipNameColor4 = ThemePanelColor("compass", "shipClass4");
+			Config.UI.Compass_ShipNameColor5 = ThemePanelColor("compass", "shipClass5");
+			Config.UI.Compass_ShipNameColor6 = ThemePanelColor("compass", "shipClass6");
+			Config.UI.Compass_ColorTextEventKind3 = ThemePanelColor("compass", "eventKind3");
+			Config.UI.Compass_ColorTextEventKind6 = ThemePanelColor("compass", "eventKind6");
+			Config.UI.Compass_ColorTextEventKind5 = ThemePanelColor("compass", "eventKind5");
+			Config.UI.Compass_ColoroverlayBrush = ThemePanelColor("compass", "overlayBrush");
+			Config.UI.Battle_ColorHPBarsBossDamaged = ThemePanelColor("battle", "barBossDamaged");
+			Config.UI.Battle_ColorHPBarsMVP = ThemePanelColor("battle", "barMVP");
+			Config.UI.Battle_ColorHPBarsEscaped = ThemePanelColor("battle", "barBossDamaged");
+		}
+
+		private dynamic ThemeStyle;
+
+		private Color ThemeColor(string type, string name) {
+			if (ThemeStyle.IsDefined(type) && ThemeStyle[type].IsDefined(name)) {
+				return ColorTranslator.FromHtml(ThemeStyle[type][name]);
+			} else {
+				switch (type + "_" + name) {
+					case "basicColors_red":
+						return Color.Red;
+					case "basicColors_orange":
+						return Color.Orange;
+					case "basicColors_yellow":
+						return Color.Yellow;
+					case "basicColors_green":
+						return Color.Green;
+					case "basicColors.cyan":
+						return Color.Cyan;
+					case "basicColors.blue":
+						return Color.Blue;
+					case "basicColors.magenta":
+						return Color.Magenta;
+					case "basicColors.violet":
+						return Color.Violet;
+					case "panelColors_foreground":
+						return SystemColors.ControlText;
+					case "panelColors_background":
+						return SystemColors.Control;
+					case "panelColors_foreground2":
+						return SystemColors.ControlText;
+					case "panelColors_background2":
+						return SystemColors.ControlLight;
+					case "panelColors_statusBarFG":
+						return Config.UI.SubForeColor;
+					case "panelColors_statusBarBG":
+						return Config.UI.SubBackColor;
+					default:
+						return Color.Magenta;
+				}
+			}
+		}
+
+		private Color ThemePanelColor(string form, string name) {
+			if (ThemeStyle.IsDefined("panelColors") && ThemeStyle["panelColors"].IsDefined(form) && ThemeStyle["panelColors"][form].IsDefined(name)) {
+				return ColorTranslator.FromHtml(ThemeStyle["panelColors"][form][name]);
+			} else {
+				switch (form + "_" + name) {
+					// 视图 - 舰队
+					case "fleet_conditionVeryTired":
+						return Config.UI.Color_Red;
+					case "fleet_conditionTired":
+						return Config.UI.Color_Orange;
+					case "fleet_conditionLittleTired":
+						return Config.UI.Color_Yellow;
+					case "fleet_conditionSparkle":
+						return Config.UI.Color_Blue;
+					case "fleet_equipmentLevel":
+						return Config.UI.Color_Cyan;
+					// 视图 - 司令部
+					// 视图 - 任务
+					case "quest_typeHensei":
+						return Config.UI.Color_Green;
+					case "quest_typeShutsugeki":
+						return Config.UI.Color_Red;
+					case "quest_typeEnshu":
+						return Config.UI.Color_Green;
+					case "quest_typeEnsei":
+						return Config.UI.Color_Cyan;
+					case "quest_typeHokyu":
+						return Config.UI.Color_Yellow;
+					case "quest_typeKojo":
+						return Config.UI.Color_Orange;
+					case "quest_typeKaiso":
+						return Config.UI.Color_Violet;
+					case "quest_processLT50":
+						return Config.UI.Color_Orange;
+					case "quest_processLT80":
+						return Config.UI.Color_Green;
+					case "quest_processLT100":
+						return Config.UI.Color_Cyan;
+					case "quest_processDefault":
+						return Config.UI.Color_Blue;
+					// 视图 - 罗盘
+					case "compass_shipClass2":
+						return Config.UI.Color_Red;
+					case "compass_shipClass3":
+						return Config.UI.Color_Orange;
+					case "compass_shipClass4":
+						return Config.UI.Color_Blue;
+					case "compass_shipClass5":
+						return Config.UI.Color_Magenta;
+					case "compass_shipClass6":
+						return Config.UI.Color_Yellow;
+					case "compass_eventKind3":
+						return Config.UI.Color_Violet;
+					case "compass_eventKind6":
+						return Config.UI.Color_Green;
+					case "compass_eventKind5":
+						return Config.UI.Color_Red;
+					case "compass_overlayBrush": // %75 透明度背景色
+						return Color.FromArgb(0xC0, Config.UI.BackColor);
+					// 视图 - 战斗
+					case "battle_barBossDamaged":
+						return Config.UI.Color_Orange;
+					case "battle_barMVP":
+						return Config.UI.Color_Blue;
+					case "battle_barEscaped":
+						return Config.UI.SubBackColor;
+					default:
+						return Color.Magenta;
+				}
+			}
+		}
+
+		private String ThemeColorHex(string type, string name) {
+			if (ThemeStyle.IsDefined(type) && ThemeStyle[type].IsDefined(name)) {
+				return ThemeStyle[type][name];
+			} else {
+				switch (type + "_" + name) {
+					case "panelColors_tabActiveFG":
+						return ThemeColorHex("panelColors", "foreground2");
+					case "panelColors_tabActiveBG":
+						return ThemeColorHex("panelColors", "background2");
+					case "panelColors_tabLostFocusFG":
+						return ThemeColorHex("panelColors", "foreground2");
+					case "panelColors_tabLostFocusBG":
+						return ThemeColorHex("panelColors", "background2");
+					case "panelColors_tabHoverFG":
+						return ThemeColorHex("panelColors", "foreground2");
+					case "panelColors_tabHoverBG":
+						return ThemeColorHex("panelColors", "background2");
+					default:
+						var c = ThemeColor(type, name);
+						return "#" + c.R.ToString("X2") + c.G.ToString("X2") + c.B.ToString("X2");
+				}
+			}
+		}
+
+		private Color ThemeBarColor(int type, int index) {
+			if (ThemeStyle.IsDefined("barColors") && ThemeStyle["barColors"].IsDefined(type) && ThemeStyle["barColors"][type].IsDefined(11)) {
+				return ColorTranslator.FromHtml(ThemeStyle["barColors"][type][index]);
+			} else {
+				switch (type + "_" + index) {
+					case "0_0":
+						return ColorTranslator.FromHtml("#FF0000");
+					case "0_1":
+						return ColorTranslator.FromHtml("#FF0000");
+					case "0_2":
+						return ColorTranslator.FromHtml("#FF8800");
+					case "0_3":
+						return ColorTranslator.FromHtml("#FF8800");
+					case "0_4":
+						return ColorTranslator.FromHtml("#FFCC00");
+					case "0_5":
+						return ColorTranslator.FromHtml("#FFCC00");
+					case "0_6":
+						return ColorTranslator.FromHtml("#00CC00");
+					case "0_7":
+						return ColorTranslator.FromHtml("#00CC00");
+					case "0_8":
+						return ColorTranslator.FromHtml("#0044CC");
+					case "0_9":
+						return ColorTranslator.FromHtml("#44FF00");
+					case "0_10":
+						return ColorTranslator.FromHtml("#882222");
+					case "0_11":
+						return ColorTranslator.FromHtml("#888888");
+					case "1_0":
+						return ColorTranslator.FromHtml("#FF0000");
+					case "1_1":
+						return ColorTranslator.FromHtml("#FF0000");
+					case "1_2":
+						return ColorTranslator.FromHtml("#FF4400");
+					case "1_3":
+						return ColorTranslator.FromHtml("#FF8800");
+					case "1_4":
+						return ColorTranslator.FromHtml("#FFAA00");
+					case "1_5":
+						return ColorTranslator.FromHtml("#EEEE00");
+					case "1_6":
+						return ColorTranslator.FromHtml("#CCEE00");
+					case "1_7":
+						return ColorTranslator.FromHtml("#00CC00");
+					case "1_8":
+						return ColorTranslator.FromHtml("#0044CC");
+					case "1_9":
+						return ColorTranslator.FromHtml("#00FF44");
+					case "1_10":
+						return ColorTranslator.FromHtml("#882222");
+					case "1_11":
+						return ColorTranslator.FromHtml("#888888");
+					default:
+						return Color.Magenta;
+				}
+			}
 		}
 
 		public void Save() {
diff --git a/ElectronicObserver/Window/FormCompass.cs b/ElectronicObserver/Window/FormCompass.cs
index d78bd0908..11fe94520 100644
--- a/ElectronicObserver/Window/FormCompass.cs
+++ b/ElectronicObserver/Window/FormCompass.cs
@@ -320,7 +320,7 @@ private static Color GetShipNameColor( ShipDataMaster ship ) {
 				default:
 					return Utility.Configuration.Config.UI.ForeColor;
 				case 2:		//elite
-					return Utility.Configuration.Config.UI.Color_Red;
+					return Utility.Configuration.Config.UI.Compass_ShipNameColor2;
 				case 3:		//flagship
 					return Utility.Configuration.Config.UI.Compass_ShipNameColor3;
 				case 4:		//latemodel / flagship kai
diff --git a/ElectronicObserver/Window/FormMain.cs b/ElectronicObserver/Window/FormMain.cs
index ff15ba174..fea9a570e 100644
--- a/ElectronicObserver/Window/FormMain.cs
+++ b/ElectronicObserver/Window/FormMain.cs
@@ -79,21 +79,12 @@ private async void FormMain_Load( object sender, EventArgs e ) {
 
 			Utility.Configuration.Instance.Load( this );
 
-			switch (Utility.Configuration.Config.UI.ThemeID) {
-			case 0:
-				this.MainDockPanel.Theme = new WeifenLuo.WinFormsUI.Docking.SolarizedLightTheme();
-				break;
-			case 1:
-				this.MainDockPanel.Theme = new WeifenLuo.WinFormsUI.Docking.SolarizedDarkTheme();
-				break;
-			default:
-				this.MainDockPanel.Theme = new WeifenLuo.WinFormsUI.Docking.VS2012LightTheme();
-				break;
-			}
+			this.MainDockPanel.Styles = Configuration.Config.UI.DockPanelSuiteStyles;
+			this.MainDockPanel.Theme = new WeifenLuo.WinFormsUI.Docking.VS2012Theme();
 			this.BackColor = this.StripMenu.BackColor = Utility.Configuration.Config.UI.BackColor;
 			this.ForeColor = this.StripMenu.ForeColor = Utility.Configuration.Config.UI.ForeColor;
-			this.StripStatus.BackColor = Utility.Configuration.Config.UI.SubBackColor;
-			this.StripStatus.ForeColor = Utility.Configuration.Config.UI.SubForeColor;
+			this.StripStatus.BackColor = Utility.Configuration.Config.UI.StatusBarBackColor;
+			this.StripStatus.ForeColor = Utility.Configuration.Config.UI.StatusBarForeColor;
 
 			Utility.Logger.Instance.LogAdded += new Utility.LogAddedEventHandler( ( Utility.Logger.LogData data ) => {
 				if ( InvokeRequired ) {

From e48ee7fa8c94bf35386dc658981c4399261137a5 Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Wed, 25 Jan 2017 21:21:44 +0900
Subject: [PATCH 3/7] Show Ranking Point Directly on HQ Panel

*No GUI option, need manually set ShowGrowthInsteadOfNextInHQ = true
---
 ElectronicObserver/Utility/Configuration.cs   |  4 +++
 .../Window/Control/ShipStatusLevel.cs         | 32 ++++++++++++++++---
 ElectronicObserver/Window/FormHeadquarters.cs | 29 +++++++++++++----
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/ElectronicObserver/Utility/Configuration.cs b/ElectronicObserver/Utility/Configuration.cs
index c9d8620ac..829e10df5 100644
--- a/ElectronicObserver/Utility/Configuration.cs
+++ b/ElectronicObserver/Utility/Configuration.cs
@@ -184,6 +184,9 @@ public class ConfigUI : ConfigPartBase {
 				// ThemeID
 				public int ThemeID { get; set; }
 
+				// 司令部显示战果
+				public bool ShowGrowthInsteadOfNextInHQ { get; set; }
+
 				[IgnoreDataMember]
 				private bool _barColorMorphing;
 
@@ -372,6 +375,7 @@ public ConfigUI() {
 					JapFont  = new Font( "Meiryo UI", 12, FontStyle.Regular, GraphicsUnit.Pixel );
 					JapFont2 = new Font( "Meiryo UI", 10, FontStyle.Regular, GraphicsUnit.Pixel );
 					ThemeID = 0;
+					ShowGrowthInsteadOfNextInHQ = false;
 					BarColorMorphing = false;
 				}
 			}
diff --git a/ElectronicObserver/Window/Control/ShipStatusLevel.cs b/ElectronicObserver/Window/Control/ShipStatusLevel.cs
index 6d63a0039..1858d383b 100644
--- a/ElectronicObserver/Window/Control/ShipStatusLevel.cs
+++ b/ElectronicObserver/Window/Control/ShipStatusLevel.cs
@@ -144,6 +144,16 @@ public string TextNext {
 			}
 		}
 
+		private string _textValueNext;
+		public string TextValueNext {
+			get { return _textValueNext; }
+			set {
+				_textValueNext = value;
+				_valueNextSizeCache = null;
+				PropertyChanged();
+			}
+		}
+
 
 		// size cache
 
@@ -178,10 +188,17 @@ private Size TextNextSizeCache {
 		private Size? _valueNextSizeCache;
 		private Size ValueNextSizeCache {
 			get {
-				return _valueNextSizeCache ??
-					( _valueNextSizeCache = TextNext == null ?
-						Size.Empty :
-						( TextRenderer.MeasureText( Math.Max( ValueNext, MaximumValueNext ).ToString(), SubFont, MaxSize, TextFormatText ) - new Size( (int)( MainFont.Size / 2.0 ), 0 ) ) ).Value;
+				if ( _textValueNext != "" ) {
+					return _valueNextSizeCache ??
+						( _valueNextSizeCache = TextNext == null ?
+							Size.Empty :
+							( TextRenderer.MeasureText( _textValueNext, SubFont, MaxSize, TextFormatText ) - new Size( (int)( MainFont.Size / 2.0 ), 0 ) ) ).Value;
+				} else {
+					return _valueNextSizeCache ??
+						( _valueNextSizeCache = TextNext == null ?
+							Size.Empty :
+							( TextRenderer.MeasureText( Math.Max( ValueNext, MaximumValueNext ).ToString(), SubFont, MaxSize, TextFormatText ) - new Size( (int)( MainFont.Size / 2.0 ), 0 ) ) ).Value;
+				}
 			}
 		}
 
@@ -211,6 +228,7 @@ public ShipStatusLevel() {
 			_valueNext = 0;
 			_maximumValueNext = 0;
 			_textNext = "next:";
+			_textValueNext = "";
 		}
 
 
@@ -245,7 +263,11 @@ private void ShipStatusLevel_Paint( object sender, PaintEventArgs e ) {
 
 			p.Y = basearea.Bottom - ValueNextSizeCache.Height + 1;
 			if ( TextNext != null ) {
-				TextRenderer.DrawText( e.Graphics, ValueNext.ToString(), SubFont, new Rectangle( p, ValueNextSizeCache ), SubFontColor, TextFormatText );
+				if ( TextValueNext == "" ) {
+					TextRenderer.DrawText( e.Graphics, ValueNext.ToString(), SubFont, new Rectangle( p, ValueNextSizeCache ), SubFontColor, TextFormatText );
+				} else {
+					TextRenderer.DrawText( e.Graphics, TextValueNext, SubFont, new Rectangle( p, ValueNextSizeCache ), SubFontColor, TextFormatText );
+				}
 				//e.Graphics.DrawRectangle( Pens.Orange, new Rectangle( p, ValueNextSizeCache ) );
 			}
 
diff --git a/ElectronicObserver/Window/FormHeadquarters.cs b/ElectronicObserver/Window/FormHeadquarters.cs
index 8d8786489..21a009de3 100644
--- a/ElectronicObserver/Window/FormHeadquarters.cs
+++ b/ElectronicObserver/Window/FormHeadquarters.cs
@@ -215,15 +215,32 @@ void Updated( string apiname, dynamic data ) {
 			HQLevel.Value = db.Admiral.Level;
 			{
 				StringBuilder tooltip = new StringBuilder();
-				if ( db.Admiral.Level < ExpTable.AdmiralExp.Max( e => e.Key ) ) {
-					HQLevel.TextNext = "next:";
-					HQLevel.ValueNext = ExpTable.GetNextExpAdmiral( db.Admiral.Exp );
-					tooltip.AppendFormat( "{0} / {1}\r\n", db.Admiral.Exp, ExpTable.AdmiralExp[db.Admiral.Level + 1].Total );
+				if ( Utility.Configuration.Config.UI.ShowGrowthInsteadOfNextInHQ ) {
+					HQLevel.TextNext = "Growth:";
+					var res1 = RecordManager.Instance.Resource.GetRecordPrevious();
+					var res2 = RecordManager.Instance.Resource.GetRecordDay();
+					if ( res1 != null && res2 != null ) {
+						HQLevel.TextValueNext = String.Format(
+							"{0:n2} / {1:n2}",
+							(db.Admiral.Exp - res1.HQExp) * 7 / 10000.0,
+							(db.Admiral.Exp - res2.HQExp) * 7 / 10000.0
+						);
+					} else {
+						HQLevel.TextValueNext = "N/A";
+					}
 				} else {
-					HQLevel.TextNext = "exp:";
-					HQLevel.ValueNext = db.Admiral.Exp;
+					if ( db.Admiral.Level < ExpTable.AdmiralExp.Max( e => e.Key ) ) {
+						HQLevel.TextNext = "next:";
+						HQLevel.ValueNext = ExpTable.GetNextExpAdmiral( db.Admiral.Exp );
+						tooltip.AppendFormat( "{0} / {1}\r\n", db.Admiral.Exp, ExpTable.AdmiralExp[db.Admiral.Level + 1].Total );
+					} else {
+						HQLevel.TextNext = "exp:";
+						HQLevel.ValueNext = db.Admiral.Exp;
+					}
 				}
 
+
+
 				//戦果ツールチップ
 				//fixme: もっとましな書き方はなかっただろうか
 				{

From 6a7cabefc74efaf4af4b90dd63d42f4f5d0c3558 Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Wed, 25 Jan 2017 21:25:51 +0900
Subject: [PATCH 4/7] Improve Akashi Timer

*No GUI option, set MaxAkashiPerHP = 0 to turn off.
---
 ElectronicObserver/Data/FleetData.cs          | 42 +++++++++++++++----
 ElectronicObserver/Utility/Configuration.cs   |  4 ++
 ElectronicObserver/Utility/Data/Calculator.cs | 18 ++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/ElectronicObserver/Data/FleetData.cs b/ElectronicObserver/Data/FleetData.cs
index 9e2f6efc3..6abba78c5 100644
--- a/ElectronicObserver/Data/FleetData.cs
+++ b/ElectronicObserver/Data/FleetData.cs
@@ -656,26 +656,52 @@ public static FleetStates UpdateFleetState( FleetData fleet, ImageLabel label, T
 					label.ImageIndex = (int)ResourceManager.IconContent.FleetAnchorageRepairing;
 
 					StringBuilder sb = new StringBuilder();
-					sb.AppendFormat( "开始时间 : {0}\r\n修理时间 :\r\n",
+					sb.AppendFormat( "开始时间 :\r\n{0}\r\n",
 						DateTimeHelper.TimeToCSVString( KCDatabase.Instance.Fleet.AnchorageRepairingTimer ) );
 
+					sb.Append("修理耗时 :\r\n");
 					for ( int i = 0; i < fleet.Members.Count; i++ ) {
 						var ship = fleet.MembersInstance[i];
 						if ( ship != null && ship.HPRate < 1.0 ) {
-							var totaltime = DateTimeHelper.FromAPITimeSpan( ship.RepairTime );
 							var unittime = Calculator.CalculateDockingUnitTime( ship );
-							sb.AppendFormat( "#{0} : {1:00}:{2:00}:{3:00} @ {4:00}:{5:00}:{6:00} x -{7} HP\r\n",
+							var totaltime = Calculator.CalculateDockingTotalTime(ship);
+							sb.AppendFormat(
+								"#{0} : {1:00}:{2:00}:00 @ {3:00}'{4:00}\" x -{5} HP\r\n",
 								i + 1,
 								(int)totaltime.TotalHours,
 								totaltime.Minutes,
-								totaltime.Seconds,
-								(int)unittime.TotalHours,
 								unittime.Minutes,
 								unittime.Seconds,
 								ship.HPMax - ship.HPCurrent
-								);
-						} else {
-							sb.Append( "#" ).Append( i + 1 ).Append( " : ----\r\n" );
+							);
+						}
+					}
+
+					if (Configuration.Config.UI.MaxAkashiPerHP != 0) {
+						sb.Append("每 HP 耗时 : (hh:mm)\r\n");
+						for ( int i = 0; i < fleet.Members.Count; i++ ) {
+							var ship = fleet.MembersInstance[i];
+							if ( ship != null && ship.HPRate < 1.0 ) {
+								sb.AppendFormat("#{0} : ", i + 1);
+								int hpToFix = ship.HPMax - ship.HPCurrent;
+								for (int hp = 1; hp <= hpToFix; hp++) {
+									var perhp = Calculator.CalculateDockingUnitTime(ship, hp);
+									sb.AppendFormat(
+										"{0:00}:{1:00}",
+										(int)perhp.Hours,
+										// (int)perhp.Hours > 0 ? String.Format("{0:00}", (int)perhp.Hours) : "",
+										perhp.Minutes
+									);
+									if (hp == hpToFix) {
+										sb.Append("\r\n");
+									} else if (hp == Configuration.Config.UI.MaxAkashiPerHP) {
+										sb.Append(" ...\r\n");
+										break;
+									} else {
+										sb.Append(" | ");
+									}
+								}
+							}
 						}
 					}
 
diff --git a/ElectronicObserver/Utility/Configuration.cs b/ElectronicObserver/Utility/Configuration.cs
index 829e10df5..9b3452689 100644
--- a/ElectronicObserver/Utility/Configuration.cs
+++ b/ElectronicObserver/Utility/Configuration.cs
@@ -187,6 +187,9 @@ public class ConfigUI : ConfigPartBase {
 				// 司令部显示战果
 				public bool ShowGrowthInsteadOfNextInHQ { get; set; }
 
+				// 明石 ToolTip 每 HP 耗时最大显示数量
+				public int MaxAkashiPerHP { get; set; }
+
 				[IgnoreDataMember]
 				private bool _barColorMorphing;
 
@@ -376,6 +379,7 @@ public ConfigUI() {
 					JapFont2 = new Font( "Meiryo UI", 10, FontStyle.Regular, GraphicsUnit.Pixel );
 					ThemeID = 0;
 					ShowGrowthInsteadOfNextInHQ = false;
+					MaxAkashiPerHP = 5;
 					BarColorMorphing = false;
 				}
 			}
diff --git a/ElectronicObserver/Utility/Data/Calculator.cs b/ElectronicObserver/Utility/Data/Calculator.cs
index f9ba89711..fce6fa70c 100644
--- a/ElectronicObserver/Utility/Data/Calculator.cs
+++ b/ElectronicObserver/Utility/Data/Calculator.cs
@@ -1444,6 +1444,24 @@ public static TimeSpan CalculateDockingUnitTime( ShipData ship ) {
 			return new TimeSpan( DateTimeHelper.FromAPITimeSpan( ship.RepairTime ).Add( TimeSpan.FromSeconds( -30 ) ).Ticks / ( ship.HPMax - ship.HPCurrent ) );
 		}
 
+		public static TimeSpan CalculateDockingUnitTime(ShipData ship, int hp) {
+			TimeSpan time = RoundUpToOneMinute(new TimeSpan(DateTimeHelper.FromAPITimeSpan(ship.RepairTime).Add(TimeSpan.FromSeconds(-30)).Ticks / (ship.HPMax - ship.HPCurrent) * hp));
+			if (hp == 1 && time.Ticks > TimeSpan.FromMinutes(20).Ticks) {
+				return TimeSpan.FromMinutes(20);
+			} else {
+				return time;
+			}
+		}
+
+		public static TimeSpan CalculateDockingTotalTime(ShipData ship) {
+			return RoundUpToOneMinute(new TimeSpan(DateTimeHelper.FromAPITimeSpan(ship.RepairTime).Add(TimeSpan.FromSeconds(-30)).Ticks));
+		}
+
+		private static TimeSpan RoundUpToOneMinute (TimeSpan time) {
+			var oneMinuteTicks = TimeSpan.FromSeconds(60).Ticks;
+			return new TimeSpan(((time.Ticks + oneMinuteTicks - 1) / oneMinuteTicks) * oneMinuteTicks);
+		}
+
 	}
 
 

From a8eb5c3a9d21e508df468cbb8e209d503252a0ad Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Wed, 25 Jan 2017 21:27:36 +0900
Subject: [PATCH 5/7] Add ShipGroup Filter for Fleet in Expedition

---
 ElectronicObserver/Data/ShipData.cs             | 17 +++++++++++++++++
 .../Data/ShipGroup/ExpressionData.cs            |  1 +
 2 files changed, 18 insertions(+)

diff --git a/ElectronicObserver/Data/ShipData.cs b/ElectronicObserver/Data/ShipData.cs
index b4cc8e2db..4eb8e89a9 100644
--- a/ElectronicObserver/Data/ShipData.cs
+++ b/ElectronicObserver/Data/ShipData.cs
@@ -665,6 +665,23 @@ public string FleetWithIndex {
 
 		}
 
+		// 远征中判定
+		public bool InExpedition {
+			get {
+				FleetManager fm = KCDatabase.Instance.Fleet;
+				foreach ( var f in fm.Fleets.Values ) {
+					if ( f.Members.Contains( MasterID ) ) {
+						if ( f.FleetID == 1 ) {
+							return false;
+						} else {
+							return (f.ExpeditionState != 0);
+						}
+					}
+				}
+				return false;
+			}
+		}
+
 
 		/// <summary>
 		/// ケッコン済みかどうか
diff --git a/ElectronicObserver/Data/ShipGroup/ExpressionData.cs b/ElectronicObserver/Data/ShipGroup/ExpressionData.cs
index e621b4452..47b7ff502 100644
--- a/ElectronicObserver/Data/ShipGroup/ExpressionData.cs
+++ b/ElectronicObserver/Data/ShipGroup/ExpressionData.cs
@@ -131,6 +131,7 @@ public enum ExpressionOperator {
 			{ ".IsLockedByEquipment", "有带锁装备" },
 			{ ".SallyArea", "出击海域" },
 			{ ".FleetWithIndex", "所属舰队" },
+			{ ".InExpedition", "远征中" },
 			{ ".IsMarried", "结婚" },
 			{ ".AirBattlePower", "航空威力" },
 			{ ".ShellingPower", "炮击威力" },

From b9aa5069a5fd9a41174656e2370b58efb49c4233 Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Wed, 25 Jan 2017 21:27:58 +0900
Subject: [PATCH 6/7] Minor tweaks

* Fix typo, etc
---
 ElectronicObserver/Window/FormFleet.cs              | 4 ++--
 ElectronicObserver/Window/FormShipGroup.Designer.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ElectronicObserver/Window/FormFleet.cs b/ElectronicObserver/Window/FormFleet.cs
index f80ab7c90..299b78e25 100644
--- a/ElectronicObserver/Window/FormFleet.cs
+++ b/ElectronicObserver/Window/FormFleet.cs
@@ -206,7 +206,7 @@ public void Update( FleetData fleet ) {
 						probStart * 0.6 );
 */
 					// 添加分歧点系数的补充说明
-					sb.AppendFormat( "2-5 旧 / 秋 / 新秋简易式\r\n　{0} / {1} / {2}\r\n\r\n新判定式 (33)\r\n分歧点系数 1: {3:f2}\r\n　2-5-H->BOSS	31 / 33\r\n分歧点系数 4: {4:f2}\r\n　3-5-G->BOSS	23 / 28\r\n　6-1-E->F(大鯨)	12 / 16\r\n　6-1-F->K	20 / 25\r\n分歧点系数 3: {5:f2}\r\n　6-2-F->I	43 / ?\r\n　6-2-H->BOSS	? / 40\r\n　6-3-H->BOSS	36 / 38\r\n\r\n触接开始率 : \r\n　确保 {6:p1} / 优势 {7:p1}\r\n",
+					sb.AppendFormat( "2-5 旧 / 秋 / 新秋简易式\r\n　{0} / {1} / {2}\r\n\r\n新判定式 (33)\r\n分歧点系数 1:	[ {3:f2} ]\r\n　2-5-H->BOSS	31 / 33\r\n分歧点系数 4:	[ {4:f2} ]\r\n　3-5-G->BOSS	23 / 28\r\n　6-1-E->F(大鯨)	12 / 16\r\n　6-1-F->K	20 / 25\r\n分歧点系数 3:	[ {5:f2} ]\r\n　6-2-F->I	43 / ?\r\n　6-2-H->BOSS	? / 40\r\n　6-3-H->BOSS	36 / 38\r\n\r\n触接开始率 : \r\n　确保 {6:p1} / 优势 {7:p1}\r\n",
 						fleet.GetSearchingAbilityString( 0 ),
 						fleet.GetSearchingAbilityString( 1 ),
 						fleet.GetSearchingAbilityString( 2 ),
@@ -491,7 +491,7 @@ public void Update( int shipMasterID ) {
 
 						if ( ship.RepairTime > 0 ) {
 							var span = DateTimeHelper.FromAPITimeSpan( ship.RepairTime );
-							sb.AppendFormat( "入渠时间 : {0} @ {1}",
+							sb.AppendFormat( "入渠耗时 : {0} @ {1}",
 								DateTimeHelper.ToTimeRemainString( span ),
 								DateTimeHelper.ToTimeRemainString( new TimeSpan( span.Add( new TimeSpan( 0, 0, -30 ) ).Ticks / ( ship.HPMax - ship.HPCurrent ) ) ) );
 						}
diff --git a/ElectronicObserver/Window/FormShipGroup.Designer.cs b/ElectronicObserver/Window/FormShipGroup.Designer.cs
index 789b10639..315d6ec49 100644
--- a/ElectronicObserver/Window/FormShipGroup.Designer.cs
+++ b/ElectronicObserver/Window/FormShipGroup.Designer.cs
@@ -407,7 +407,7 @@ private void InitializeComponent() {
 			// 
 			// ShipView_RepairTime
 			// 
-			this.ShipView_RepairTime.HeaderText = "入渠时间";
+			this.ShipView_RepairTime.HeaderText = "入渠耗时";
 			this.ShipView_RepairTime.Name = "ShipView_RepairTime";
 			this.ShipView_RepairTime.ReadOnly = true;
 			this.ShipView_RepairTime.Width = 60;
@@ -786,7 +786,7 @@ private void InitializeComponent() {
 			this.MenuGroup_ShowStatusBar.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.MenuGroup_ShowStatusBar.Name = "MenuGroup_ShowStatusBar";
 			this.MenuGroup_ShowStatusBar.Size = new System.Drawing.Size(191, 22);
-			this.MenuGroup_ShowStatusBar.Text = "显示滚动条";
+			this.MenuGroup_ShowStatusBar.Text = "显示状态栏";
 			this.MenuGroup_ShowStatusBar.CheckedChanged += new System.EventHandler(this.MenuGroup_ShowStatusBar_CheckedChanged);
 			// 
 			// splitContainer1

From ae8dccfec63db8a624fc0d68f2ddb4c5ca6f62e1 Mon Sep 17 00:00:00 2001
From: RadarNyan <RadarNyan@moe9th.com>
Date: Wed, 25 Jan 2017 21:34:14 +0900
Subject: [PATCH 7/7] Version 2.5.2

---
 .../Utility/SoftwareInformation.cs            |  2 +-
 VERSION                                       | 30 ++++++++++---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs
index 09a641bd2..76cd6d057 100644
--- a/ElectronicObserver/Utility/SoftwareInformation.cs
+++ b/ElectronicObserver/Utility/SoftwareInformation.cs
@@ -54,7 +54,7 @@ public static string VersionEnglish {
 		/// </summary>
 		public static DateTime UpdateTime {
 			get {
-				return DateTimeHelper.CSVStringToTime( "2016/12/26 10:24:11" );
+				return DateTimeHelper.CSVStringToTime( "2017/01/25 21:28:18" );
 			}
 		}
 
diff --git a/VERSION b/VERSION
index cf2c5cf6a..51b98ea43 100644
--- a/VERSION
+++ b/VERSION
@@ -1,15 +1,17 @@
-2016/12/26 10:24:11
-2.5.2-m1
-合并原版 v2.5.2
-( 以下 v2.5.1-a1 已加入 )
-日志：修正远征获取家具箱时显示间距过大
-主题：根据用户反馈调整浅色主题血条配色
+2017/01/25 21:28:18
+2.5.2-m2
+主题：可通过 Settings\ColorScheme.json 自定义配色
+　　　配色文件格式请参考 ColorScheme.example.json
+　　　旧版本自带配色文件为 ColorScheme.Solarized.json
 
-对应原版：2.5.2
-修正演习喷式航空战未对应
-调整对空系计算公式
-对空炮火：联合舰队补正、联合舰队阵形补正
-( 以下 v2.5.1-a1 已合并 )
-部分喷式飞机相关功能
-固定舰名宽度时可自定义宽度
-修复夜间触接报错、补强格机枪参与计算 ( 2016/12/22 维护 )
+司令部：增加直接显示战果的选项 ( 需手动编辑配置文件将
+　　　　ShowGrowthInsteadOfNextInHQ 设为 true 以开启 )
+舰队：优化索敌值 Tooltip 排版 ( 33 式索敌值用 [] 标出 )
+舰队编成：筛选条件新增 "远征中"
+　　　　　修正错译 "显示滚动条" => "显示状态栏"
+舰队一览：优化泊地修理 Tooltip 排版，修理耗时进位到整分钟
+　　　　　泊地修理 Tooltip 增加每 HP 耗时显示 ( 最大显示 5，
+　　　　　可通过配置文件中 MaxAkashiPerHP 调整，设 0 关闭 )
+
+其他各种用语微调 ( "时间" => "耗时" 等 )
+注：配置文件中新增的隐藏设置项需运行一次新版后才会写入