diff --git a/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs b/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs
index b864914e4..54ee97f5c 100644
--- a/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs
+++ b/source/Grabacr07.KanColleViewer/Models/Settings/GeneralSettings.cs
@@ -1,48 +1,48 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using MetroTrilithon.Serialization;
-
-namespace Grabacr07.KanColleViewer.Models.Settings
-{
- public static class GeneralSettings
- {
- ///
- /// カルチャ設定を取得します。
- ///
- public static SerializableProperty Culture { get; }
- = new SerializableProperty(GetKey(), Providers.Roaming) { AutoSave = true };
-
- ///
- /// アプリケーションがプロキシ モード (ブラウザーを表示せず、プロキシとしてのみ使用するモード) で動作するかどうかを示す設定値を取得します。
- ///
- public static SerializableProperty IsProxyMode { get; }
- = new SerializableProperty(GetKey(), Providers.Roaming, false);
-
- ///
- /// アプリケーション終了時の確認動作を示す設定値を取得します。
- ///
- public static SerializableProperty ExitConfirmationType { get; }
- = new SerializableProperty(GetKey(), Providers.Roaming, Models.ExitConfirmationType.None) { AutoSave = true };
-
- ///
- /// ブラウザーの拡大鏡を示す設定値を取得します。
- ///
- public static SerializableProperty BrowserZoomFactor { get; }
- = new SerializableProperty(GetKey(), Providers.Local, 1.0);
-
- ///
- /// ユーザー スタイル シート設定を取得します。
- ///
- public static SerializableProperty UserStyleSheet { get; }
- = new SerializableProperty(GetKey(), Providers.Roaming, Properties.Settings.Default.OverrideStyleSheet) { AutoSave = true };
-
-
- private static string GetKey([CallerMemberName] string propertyName = "")
- {
- return nameof(GeneralSettings) + "." + propertyName;
- }
- }
-}
+ｻｿusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using MetroTrilithon.Serialization;
+
+namespace Grabacr07.KanColleViewer.Models.Settings
+{
+ public static class GeneralSettings
+ {
+ ///
+ /// 繧ｫ繝ｫ繝√Ε險ｭ螳壹ｒ蜿門ｾ励＠縺ｾ縺吶
+ ///
+ public static SerializableProperty Culture { get; }
+ = new SerializableProperty(GetKey(), Providers.Roaming) { AutoSave = true };
+
+ ///
+ /// 繧｢繝励Μ繧ｱ繝ｼ繧ｷ繝ｧ繝ｳ縺後励Ο繧ｭ繧ｷ 繝｢繝ｼ繝 (繝悶Λ繧ｦ繧ｶ繝ｼ繧定｡ｨ遉ｺ縺帙★縲√励Ο繧ｭ繧ｷ縺ｨ縺励※縺ｮ縺ｿ菴ｿ逕ｨ縺吶ｋ繝｢繝ｼ繝) 縺ｧ蜍穂ｽ懊☆繧九°縺ｩ縺縺九ｒ遉ｺ縺呵ｨｭ螳壼､繧貞叙蠕励＠縺ｾ縺吶
+ ///
+ public static SerializableProperty IsProxyMode { get; }
+ = new SerializableProperty(GetKey(), Providers.Roaming, false);
+
+ ///
+ /// 繧｢繝励Μ繧ｱ繝ｼ繧ｷ繝ｧ繝ｳ邨ゆｺ譎ゅｮ遒ｺ隱榊虚菴懊ｒ遉ｺ縺呵ｨｭ螳壼､繧貞叙蠕励＠縺ｾ縺吶
+ ///
+ public static SerializableProperty ExitConfirmationType { get; }
+ = new SerializableProperty(GetKey(), Providers.Roaming, Models.ExitConfirmationType.None) { AutoSave = true };
+
+ ///
+ /// 繝悶Λ繧ｦ繧ｶ繝ｼ縺ｮ諡｡螟ｧ髀｡繧堤､ｺ縺呵ｨｭ螳壼､繧貞叙蠕励＠縺ｾ縺吶
+ ///
+ public static SerializableProperty BrowserZoomFactor { get; }
+ = new SerializableProperty(GetKey(), Providers.Local, 1.0);
+
+ ///
+ /// 繝ｦ繝ｼ繧ｶ繝ｼ 繧ｹ繧ｿ繧､繝ｫ 繧ｷ繝ｼ繝郁ｨｭ螳壹ｒ蜿門ｾ励＠縺ｾ縺吶
+ ///
+ public static SerializableProperty UserStyleSheet { get; }
+ = new SerializableProperty(GetKey(), Providers.Roaming, Properties.Settings.Default.OverrideStyleSheet) { AutoSave = true };
+
+
+ private static string GetKey([CallerMemberName] string propertyName = "")
+ {
+ return nameof(GeneralSettings) + "." + propertyName;
+ }
+ }
+}
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
index f5ed4ae0d..c706d7ce3 100644
--- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -52,4 +52,4 @@
// 縺吶∋縺ｦ縺ｮ蛟､繧呈欠螳壹☆繧九°縲∽ｸ九ｮ繧医≧縺ｫ '*' 繧剃ｽｿ縺｣縺ｦ繝薙Ν繝峨♀繧医ｳ繝ｪ繝薙ず繝ｧ繝ｳ逡ｪ蜿ｷ繧
// 譌｢螳壼､縺ｫ縺吶ｋ縺薙→縺後〒縺阪∪縺:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.5.0")]
+[assembly: AssemblyVersion("4.1.6.0")]
diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Settings/UserStyleSheetSettingsViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Settings/UserStyleSheetSettingsViewModel.cs
index fb89d8dd1..8483ae8da 100644
--- a/source/Grabacr07.KanColleViewer/ViewModels/Settings/UserStyleSheetSettingsViewModel.cs
+++ b/source/Grabacr07.KanColleViewer/ViewModels/Settings/UserStyleSheetSettingsViewModel.cs
@@ -1,68 +1,83 @@
-ｻｿusing Grabacr07.KanColleViewer.Models.Settings;
-using Grabacr07.KanColleWrapper;
-using Livet;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using MetroTrilithon.Mvvm;
-
-namespace Grabacr07.KanColleViewer.ViewModels.Settings
-{
- public class UserStyleSheetSettingsViewModel : ViewModel
- {
- private bool isBackToDefaultValue;
-
- #region UserStyleSheet 螟画峩騾夂衍繝励Ο繝代ユ繧｣
-
- private string _UserStyleSheet;
-
- public string UserStyleSheet
- {
- get { return this._UserStyleSheet; }
- set
- {
- this.isBackToDefaultValue = false;
- if (this._UserStyleSheet != value)
- {
- this._UserStyleSheet = value;
- this.RaisePropertyChanged();
- }
- }
- }
-
- #endregion
-
-
- public void Initialize()
- {
- GeneralSettings.UserStyleSheet.Subscribe(x => this.UserStyleSheet = x).AddTo(this);
-
- if (!GeneralSettings.UserStyleSheet.Provider.IsLoaded)
- GeneralSettings.UserStyleSheet.Provider.Load();
- this.isBackToDefaultValue = !GeneralSettings.UserStyleSheet.Provider.TryGetValue(GeneralSettings.UserStyleSheet.Key, out this._UserStyleSheet);
- this._UserStyleSheet = GeneralSettings.UserStyleSheet;
- this.RaisePropertyChanged(nameof(this.UserStyleSheet));
- }
-
- public void Apply()
- {
- if (this.isBackToDefaultValue)
- GeneralSettings.UserStyleSheet.Reset();
- else
- GeneralSettings.UserStyleSheet.Value = this.UserStyleSheet;
- }
-
- public void Cancel()
- {
- this.UserStyleSheet = GeneralSettings.UserStyleSheet;
- }
-
- public void BackToDefaultValue()
- {
- this.UserStyleSheet = GeneralSettings.UserStyleSheet.Default;
- this.isBackToDefaultValue = true;
- }
- }
-}
+ｻｿusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Grabacr07.KanColleViewer.Models.Settings;
+using Livet;
+using MetroTrilithon.Mvvm;
+
+namespace Grabacr07.KanColleViewer.ViewModels.Settings
+{
+ public class UserStyleSheetSettingsViewModel : ViewModel
+ {
+ #region UserStyleSheet 螟画峩騾夂衍繝励Ο繝代ユ繧｣
+
+ private string _UserStyleSheet;
+
+ public string UserStyleSheet
+ {
+ get { return this._UserStyleSheet; }
+ set
+ {
+ if (this._UserStyleSheet != value)
+ {
+ this._UserStyleSheet = value;
+ this.IsEditing = true;
+ this.RaisePropertyChanged();
+ }
+ }
+ }
+
+ #endregion
+
+ #region IsEditing 螟画峩騾夂衍繝励Ο繝代ユ繧｣
+
+ private bool _IsEditing;
+
+ public bool IsEditing
+ {
+ get { return this._IsEditing; }
+ set
+ {
+ if (this._IsEditing != value)
+ {
+ this._IsEditing = value;
+ this.RaisePropertyChanged();
+ }
+ }
+ }
+
+ #endregion
+
+
+ public void Initialize()
+ {
+ GeneralSettings.UserStyleSheet
+ .Subscribe(x =>
+ {
+ this.UserStyleSheet = x;
+ this.IsEditing = false;
+ })
+ .AddTo(this);
+
+ this._UserStyleSheet = GeneralSettings.UserStyleSheet;
+ this.RaisePropertyChanged(nameof(this.UserStyleSheet));
+ }
+
+ public void Apply()
+ {
+ GeneralSettings.UserStyleSheet.Value = this.UserStyleSheet;
+ }
+
+ public void Cancel()
+ {
+ this.UserStyleSheet = GeneralSettings.UserStyleSheet;
+ this.IsEditing = false;
+ }
+
+ public void BackToDefaultValue()
+ {
+ this.UserStyleSheet = GeneralSettings.UserStyleSheet.Default;
+ }
+ }
+}
diff --git a/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml b/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml
index 530e4c06d..ec755ca90 100644
--- a/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Settings/Others.xaml
@@ -130,45 +130,45 @@
Style="{DynamicResource SettingsHeaderTextStyleKey}"
Margin="0,10" />
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/source/Grabacr07.KanColleViewer/readme.txt b/source/Grabacr07.KanColleViewer/readme.txt
index 4ad31fe37..c5d8729cd 100644
--- a/source/Grabacr07.KanColleViewer/readme.txt
+++ b/source/Grabacr07.KanColleViewer/readme.txt
@@ -1,6 +1,6 @@
ｻｿ笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏
謠千撻讌ｭ繧ょｿ吶＠縺ｼ (KanColleViewer)
- version 4.1.5 2015/10/30
+ version 4.1.6 2015/11/10
笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏≫煤笏
@@ -167,6 +167,7 @@ Desktop Toast
笆譖ｴ譁ｰ螻･豁ｴ
+2015/11/10 - version 4.1.6 繝ｪ繝ｪ繝ｼ繧ｹ
2015/10/30 - version 4.1.5 繝ｪ繝ｪ繝ｼ繧ｹ
2015/08/28 - version 4.1.3 繝ｪ繝ｪ繝ｼ繧ｹ
2015/08/20 - version 4.1.2 繝ｪ繝ｪ繝ｼ繧ｹ
diff --git a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
index 8decff59f..1b127cd1a 100644
--- a/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleWrapper/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@
// 縺吶∋縺ｦ縺ｮ蛟､繧呈欠螳壹☆繧九°縲∽ｸ九ｮ繧医≧縺ｫ '*' 繧剃ｽｿ縺｣縺ｦ繝薙Ν繝峨♀繧医ｳ繝ｪ繝薙ず繝ｧ繝ｳ逡ｪ蜿ｷ繧
// 譌｢螳壼､縺ｫ縺吶ｋ縺薙→縺後〒縺阪∪縺:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.6.0")]
+[assembly: AssemblyVersion("1.2.7.0")]