diff --git a/ElectronicObserver/Resource/ResourceManager.cs b/ElectronicObserver/Resource/ResourceManager.cs
index ff211daef..5f7413a6a 100644
--- a/ElectronicObserver/Resource/ResourceManager.cs
+++ b/ElectronicObserver/Resource/ResourceManager.cs
@@ -170,30 +170,14 @@ public bool Load() {
} catch ( Exception ex ) {
Utility.ErrorReporter.SendErrorReport( ex, "リソースファイルの読み込みに失敗しました。" );
- MessageBox.Show( "リソースファイルの読み込みに失敗しました。", "エラー", MessageBoxButtons.OK, MessageBoxIcon.Error );
+ MessageBox.Show( "リソースファイルの読み込みに失敗しました。\r\n" + ex.Message, "エラー", MessageBoxButtons.OK, MessageBoxIcon.Error );
- }
-
- return false;
- }
-
-
- [Obsolete]
- private Image LoadImage( string path ) {
- try {
-
- using ( FileStream fs = new FileStream( path, FileMode.Open, FileAccess.Read ) ) {
- return Image.FromStream( fs );
- }
-
- } catch ( Exception ex ) {
-
- Utility.ErrorReporter.SendErrorReport( ex, string.Format( "画像リソース {0} の読み込みに失敗しました。", path ) );
- return new Bitmap( 16, 16, System.Drawing.Imaging.PixelFormat.Format32bppArgb );
+ FillWithBlankImage( Icons, Enum.GetValues( typeof( IconContent ) ).Length );
+ FillWithBlankImage( Equipments, Enum.GetValues( typeof( EquipmentContent ) ).Length );
}
- //return null;
+ return false;
}
@@ -351,19 +335,20 @@ private static void LoadImageFromArchive( ImageList imglist, ZipArchive arc, str
Bitmap bmp = new Bitmap( entry.Open() );
- if ( bmp.Size == imglist.ImageSize ) {
-
- imglist.Images.Add( name, bmp );
-
- } else {
+ if ( bmp.Size != imglist.ImageSize ) {
bmp.Dispose();
- }
+ bmp = CreateBlankImage();
+
+ }
+
+ imglist.Images.Add( name, bmp );
+
} catch ( Exception ) {
Utility.Logger.Add( 3, string.Format( "画像リソース {0} の読み込みに失敗しました。" ) );
- imglist.Images.Add( name, new Bitmap( imglist.ImageSize.Width, imglist.ImageSize.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb ) );
+ imglist.Images.Add( name, CreateBlankImage() );
return;
}
@@ -403,6 +388,25 @@ private static Icon LoadIconFromArchive( ZipArchive arc, string path ) {
}
+ ///
+ /// エラーが発生しないよう、ダミーの画像で領域を埋めます。
+ ///
+ private static void FillWithBlankImage( ImageList list, int length ) {
+
+ for ( int i = list.Images.Count; i < length; i++ ) {
+ list.Images.Add( CreateBlankImage() );
+ }
+ }
+
+ ///
+ /// 空白画像を作成します。
+ ///
+ private static Bitmap CreateBlankImage() {
+ return new Bitmap( 16, 16, System.Drawing.Imaging.PixelFormat.Format32bppArgb );
+ }
+
+
+
///
/// 装備アイコンを取得します。一般的用途(ロック/未装備等でない、マスターとしてのアイコン)に向いています。
///
diff --git a/ElectronicObserver/Utility/Configuration.cs b/ElectronicObserver/Utility/Configuration.cs
index aa9a3a17e..90c3ab499 100644
--- a/ElectronicObserver/Utility/Configuration.cs
+++ b/ElectronicObserver/Utility/Configuration.cs
@@ -466,6 +466,11 @@ public class ConfigFormBrowser : ConfigPartBase {
///
public bool IsScrollable { get; set; }
+ ///
+ /// スタイルシートを適用するか
+ ///
+ public bool AplliesStyleSheet { get; set; }
+
public ConfigFormBrowser() {
ZoomRate = 100;
@@ -475,6 +480,7 @@ public ConfigFormBrowser() {
ScreenShotFormat = 2;
StyleSheet = "\r\nbody {\r\n margin:0;\r\n overflow:hidden\r\n}\r\n\r\n#game_frame {\r\n position:fixed;\r\n left:50%;\r\n top:-16px;\r\n margin-left:-450px;\r\n z-index:1\r\n}\r\n";
IsScrollable = false;
+ AplliesStyleSheet = true;
}
}
/// [ブラウザ]ウィンドウ
diff --git a/ElectronicObserver/Utility/Mathematics/DateTimeHelper.cs b/ElectronicObserver/Utility/Mathematics/DateTimeHelper.cs
index bc3eefe91..893954157 100644
--- a/ElectronicObserver/Utility/Mathematics/DateTimeHelper.cs
+++ b/ElectronicObserver/Utility/Mathematics/DateTimeHelper.cs
@@ -14,7 +14,7 @@ public static class DateTimeHelper {
///
/// 起点となる日時。
///
- private static readonly DateTime origin = new DateTime( 1970, 1, 1 ).ToLocalTime();
+ private static readonly DateTime origin = new DateTime( 1970, 1, 1, 9, 0, 0 );
///
diff --git a/ElectronicObserver/Utility/SoftwareInformation.cs b/ElectronicObserver/Utility/SoftwareInformation.cs
index 184440273..778d7e0a4 100644
--- a/ElectronicObserver/Utility/SoftwareInformation.cs
+++ b/ElectronicObserver/Utility/SoftwareInformation.cs
@@ -35,7 +35,7 @@ public static string SoftwareNameEnglish {
///
public static string VersionJapanese {
get {
- return SoftwareNameJapanese + "一〇型改";
+ return SoftwareNameJapanese + "一〇型改二";
}
}
@@ -44,7 +44,7 @@ public static string VersionJapanese {
///
public static string VersionEnglish {
get {
- return "1.0.1";
+ return "1.0.2";
}
}
@@ -54,7 +54,7 @@ public static string VersionEnglish {
///
public static DateTime UpdateTime {
get {
- return DateTimeHelper.CSVStringToTime( "2015/03/12 18:00:00" );
+ return DateTimeHelper.CSVStringToTime( "2015/03/15 22:00:00" );
}
}
diff --git a/ElectronicObserver/Window/Dialog/DialogConfiguration.Designer.cs b/ElectronicObserver/Window/Dialog/DialogConfiguration.Designer.cs
index 7dcdb12a0..e27a616d3 100644
--- a/ElectronicObserver/Window/Dialog/DialogConfiguration.Designer.cs
+++ b/ElectronicObserver/Window/Dialog/DialogConfiguration.Designer.cs
@@ -94,6 +94,9 @@ private void InitializeComponent() {
this.FormQuest_ShowDaily = new System.Windows.Forms.CheckBox();
this.FormQuest_ShowOnce = new System.Windows.Forms.CheckBox();
this.FormQuest_ShowRunningOnly = new System.Windows.Forms.CheckBox();
+ this.tabPage13 = new System.Windows.Forms.TabPage();
+ this.FormShipGroup_ShowStatusBar = new System.Windows.Forms.CheckBox();
+ this.FormShipGroup_AutoUpdate = new System.Windows.Forms.CheckBox();
this.tabPage12 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.FormBrowser_ScreenShotFormat_PNG = new System.Windows.Forms.RadioButton();
@@ -118,9 +121,6 @@ private void InitializeComponent() {
this.FontSelector = new System.Windows.Forms.FontDialog();
this.LayoutFileBrowser = new System.Windows.Forms.OpenFileDialog();
this.APIListBrowser = new System.Windows.Forms.OpenFileDialog();
- this.tabPage13 = new System.Windows.Forms.TabPage();
- this.FormShipGroup_AutoUpdate = new System.Windows.Forms.CheckBox();
- this.FormShipGroup_ShowStatusBar = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.Connection_UpstreamProxyPort)).BeginInit();
@@ -140,11 +140,11 @@ private void InitializeComponent() {
this.tabPage9.SuspendLayout();
this.tabPage10.SuspendLayout();
this.groupBox1.SuspendLayout();
+ this.tabPage13.SuspendLayout();
this.tabPage12.SuspendLayout();
this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.FormBrowser_ZoomRate)).BeginInit();
this.tabPage11.SuspendLayout();
- this.tabPage13.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
@@ -417,10 +417,10 @@ private void InitializeComponent() {
this.tabPage2.Controls.Add(this.UI_MainFontSelect);
this.tabPage2.Controls.Add(this.UI_MainFont);
this.tabPage2.Controls.Add(this.label5);
- this.tabPage2.Location = new System.Drawing.Point(4, 24);
+ this.tabPage2.Location = new System.Drawing.Point(4, 44);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(392, 231);
+ this.tabPage2.Size = new System.Drawing.Size(392, 211);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "UI";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -453,7 +453,7 @@ private void InitializeComponent() {
//
this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(3, 169);
+ this.label9.Location = new System.Drawing.Point(3, 193);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(146, 15);
this.label9.TabIndex = 8;
@@ -526,10 +526,10 @@ private void InitializeComponent() {
this.tabPage3.Controls.Add(this.Log_SaveLogFlag);
this.tabPage3.Controls.Add(this.Log_LogLevel);
this.tabPage3.Controls.Add(this.label6);
- this.tabPage3.Location = new System.Drawing.Point(4, 24);
+ this.tabPage3.Location = new System.Drawing.Point(4, 44);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(392, 231);
+ this.tabPage3.Size = new System.Drawing.Size(392, 211);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "ログ";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -618,10 +618,10 @@ private void InitializeComponent() {
//
this.tabPage4.Controls.Add(this.Control_ConditionBorder);
this.tabPage4.Controls.Add(this.label7);
- this.tabPage4.Location = new System.Drawing.Point(4, 24);
+ this.tabPage4.Location = new System.Drawing.Point(4, 44);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage4.Size = new System.Drawing.Size(392, 231);
+ this.tabPage4.Size = new System.Drawing.Size(392, 211);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "動作";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -653,10 +653,10 @@ private void InitializeComponent() {
//
this.tabPage5.Controls.Add(this.Debug_SealingPanel);
this.tabPage5.Controls.Add(this.Debug_EnableDebugMenu);
- this.tabPage5.Location = new System.Drawing.Point(4, 24);
+ this.tabPage5.Location = new System.Drawing.Point(4, 44);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage5.Size = new System.Drawing.Size(392, 231);
+ this.tabPage5.Size = new System.Drawing.Size(392, 211);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "デバッグ";
this.tabPage5.UseVisualStyleBackColor = true;
@@ -671,7 +671,7 @@ private void InitializeComponent() {
this.Debug_SealingPanel.Controls.Add(this.Debug_APIListPathSearch);
this.Debug_SealingPanel.Location = new System.Drawing.Point(0, 31);
this.Debug_SealingPanel.Name = "Debug_SealingPanel";
- this.Debug_SealingPanel.Size = new System.Drawing.Size(392, 134);
+ this.Debug_SealingPanel.Size = new System.Drawing.Size(392, 112);
this.Debug_SealingPanel.TabIndex = 7;
//
// Debug_APIListPath
@@ -727,10 +727,10 @@ private void InitializeComponent() {
this.tabPage6.Controls.Add(this.label14);
this.tabPage6.Controls.Add(this.Life_TopMost);
this.tabPage6.Controls.Add(this.Life_ConfirmOnClosing);
- this.tabPage6.Location = new System.Drawing.Point(4, 24);
+ this.tabPage6.Location = new System.Drawing.Point(4, 44);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage6.Size = new System.Drawing.Size(392, 231);
+ this.tabPage6.Size = new System.Drawing.Size(392, 211);
this.tabPage6.TabIndex = 5;
this.tabPage6.Text = "ウィンドウ";
this.tabPage6.UseVisualStyleBackColor = true;
@@ -956,6 +956,40 @@ private void InitializeComponent() {
this.FormQuest_ShowRunningOnly.Text = "遂行中のみ表示する";
this.FormQuest_ShowRunningOnly.UseVisualStyleBackColor = true;
//
+ // tabPage13
+ //
+ this.tabPage13.Controls.Add(this.FormShipGroup_ShowStatusBar);
+ this.tabPage13.Controls.Add(this.FormShipGroup_AutoUpdate);
+ this.tabPage13.Location = new System.Drawing.Point(4, 24);
+ this.tabPage13.Name = "tabPage13";
+ this.tabPage13.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage13.Size = new System.Drawing.Size(378, 177);
+ this.tabPage13.TabIndex = 4;
+ this.tabPage13.Text = "グループ";
+ this.tabPage13.UseVisualStyleBackColor = true;
+ //
+ // FormShipGroup_ShowStatusBar
+ //
+ this.FormShipGroup_ShowStatusBar.AutoSize = true;
+ this.FormShipGroup_ShowStatusBar.Location = new System.Drawing.Point(6, 31);
+ this.FormShipGroup_ShowStatusBar.Name = "FormShipGroup_ShowStatusBar";
+ this.FormShipGroup_ShowStatusBar.Size = new System.Drawing.Size(143, 19);
+ this.FormShipGroup_ShowStatusBar.TabIndex = 2;
+ this.FormShipGroup_ShowStatusBar.Text = "ステータスバーを表示する";
+ this.ToolTipInfo.SetToolTip(this.FormShipGroup_ShowStatusBar, "下部のステータスバー(所属艦数など)を表示するかを指定します。\r\nわずかですが表示行数を増やすことができます。");
+ this.FormShipGroup_ShowStatusBar.UseVisualStyleBackColor = true;
+ //
+ // FormShipGroup_AutoUpdate
+ //
+ this.FormShipGroup_AutoUpdate.AutoSize = true;
+ this.FormShipGroup_AutoUpdate.Location = new System.Drawing.Point(6, 6);
+ this.FormShipGroup_AutoUpdate.Name = "FormShipGroup_AutoUpdate";
+ this.FormShipGroup_AutoUpdate.Size = new System.Drawing.Size(93, 19);
+ this.FormShipGroup_AutoUpdate.TabIndex = 1;
+ this.FormShipGroup_AutoUpdate.Text = "自動更新する";
+ this.ToolTipInfo.SetToolTip(this.FormShipGroup_AutoUpdate, "艦船データを自動更新するかを指定します。\r\n");
+ this.FormShipGroup_AutoUpdate.UseVisualStyleBackColor = true;
+ //
// tabPage12
//
this.tabPage12.Controls.Add(this.groupBox2);
@@ -1095,7 +1129,7 @@ private void InitializeComponent() {
//
this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(3, 149);
+ this.label10.Location = new System.Drawing.Point(3, 193);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(238, 15);
this.label10.TabIndex = 5;
@@ -1198,40 +1232,6 @@ private void InitializeComponent() {
this.APIListBrowser.Filter = "Text File|*.txt|File|*";
this.APIListBrowser.Title = "API リストを開く";
//
- // tabPage13
- //
- this.tabPage13.Controls.Add(this.FormShipGroup_ShowStatusBar);
- this.tabPage13.Controls.Add(this.FormShipGroup_AutoUpdate);
- this.tabPage13.Location = new System.Drawing.Point(4, 24);
- this.tabPage13.Name = "tabPage13";
- this.tabPage13.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage13.Size = new System.Drawing.Size(378, 177);
- this.tabPage13.TabIndex = 4;
- this.tabPage13.Text = "グループ";
- this.tabPage13.UseVisualStyleBackColor = true;
- //
- // FormShipGroup_AutoUpdate
- //
- this.FormShipGroup_AutoUpdate.AutoSize = true;
- this.FormShipGroup_AutoUpdate.Location = new System.Drawing.Point(6, 6);
- this.FormShipGroup_AutoUpdate.Name = "FormShipGroup_AutoUpdate";
- this.FormShipGroup_AutoUpdate.Size = new System.Drawing.Size(93, 19);
- this.FormShipGroup_AutoUpdate.TabIndex = 1;
- this.FormShipGroup_AutoUpdate.Text = "自動更新する";
- this.ToolTipInfo.SetToolTip(this.FormShipGroup_AutoUpdate, "艦船データを自動更新するかを指定します。\r\n");
- this.FormShipGroup_AutoUpdate.UseVisualStyleBackColor = true;
- //
- // FormShipGroup_ShowStatusBar
- //
- this.FormShipGroup_ShowStatusBar.AutoSize = true;
- this.FormShipGroup_ShowStatusBar.Location = new System.Drawing.Point(6, 31);
- this.FormShipGroup_ShowStatusBar.Name = "FormShipGroup_ShowStatusBar";
- this.FormShipGroup_ShowStatusBar.Size = new System.Drawing.Size(143, 19);
- this.FormShipGroup_ShowStatusBar.TabIndex = 2;
- this.FormShipGroup_ShowStatusBar.Text = "ステータスバーを表示する";
- this.ToolTipInfo.SetToolTip(this.FormShipGroup_ShowStatusBar, "下部のステータスバー(所属艦数など)を表示するかを指定します。\r\nわずかですが表示行数を増やすことができます。");
- this.FormShipGroup_ShowStatusBar.UseVisualStyleBackColor = true;
- //
// DialogConfiguration
//
this.AcceptButton = this.ButtonOK;
@@ -1281,6 +1281,8 @@ private void InitializeComponent() {
this.tabPage10.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
+ this.tabPage13.ResumeLayout(false);
+ this.tabPage13.PerformLayout();
this.tabPage12.ResumeLayout(false);
this.tabPage12.PerformLayout();
this.groupBox2.ResumeLayout(false);
@@ -1288,8 +1290,6 @@ private void InitializeComponent() {
((System.ComponentModel.ISupportInitialize)(this.FormBrowser_ZoomRate)).EndInit();
this.tabPage11.ResumeLayout(false);
this.tabPage11.PerformLayout();
- this.tabPage13.ResumeLayout(false);
- this.tabPage13.PerformLayout();
this.ResumeLayout(false);
}
diff --git a/ElectronicObserver/Window/FormBrowser.cs b/ElectronicObserver/Window/FormBrowser.cs
index 7db53c993..09864a850 100644
--- a/ElectronicObserver/Window/FormBrowser.cs
+++ b/ElectronicObserver/Window/FormBrowser.cs
@@ -135,6 +135,9 @@ private void Browser_DocumentCompleted( object sender, WebBrowserDocumentComplet
///
public void ApplyStyleSheet() {
+ if ( !Utility.Configuration.Config.FormBrowser.AplliesStyleSheet )
+ return;
+
try {
var document = Browser.Document;
@@ -335,8 +338,8 @@ private void SaveScreenShot( string path, System.Drawing.Imaging.ImageFormat for
if ( target == null ) return false;
viewobj = target as IViewObject;
if ( viewobj == null ) return false;
- width = int.Parse( target.width );
- height = int.Parse( target.height );
+ if ( !int.TryParse( target.width, out width ) ) return false;
+ if ( !int.TryParse( target.height, out height ) ) return false;
return true;
};
diff --git a/ElectronicObserver/Window/FormMain.Designer.cs b/ElectronicObserver/Window/FormMain.Designer.cs
index 13353e3c0..41b8571ce 100644
--- a/ElectronicObserver/Window/FormMain.Designer.cs
+++ b/ElectronicObserver/Window/FormMain.Designer.cs
@@ -24,21 +24,21 @@ protected override void Dispose( bool disposing ) {
///
private void InitializeComponent() {
this.components = new System.ComponentModel.Container();
- WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
- WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
- WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
- WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
- WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
- WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
- WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
- WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
- WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin();
+ WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin3 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin();
+ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient7 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient15 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin();
+ WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient16 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient8 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient17 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient18 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient19 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient9 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient20 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
+ WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient21 = new WeifenLuo.WinFormsUI.Docking.TabGradient();
this.MainDockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel();
this.StripMenu = new System.Windows.Forms.MenuStrip();
this.StripMenu_File = new System.Windows.Forms.ToolStripMenuItem();
@@ -94,6 +94,7 @@ private void InitializeComponent() {
this.StripMenu_Browser_Zoom_250 = new System.Windows.Forms.ToolStripMenuItem();
this.StripMenu_Browser_Zoom_300 = new System.Windows.Forms.ToolStripMenuItem();
this.StripMenu_Browser_Zoom_400 = new System.Windows.Forms.ToolStripMenuItem();
+ this.StripMenu_Browser_AppliesStyleSheet = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.StripMenu_Browser_Refresh = new System.Windows.Forms.ToolStripMenuItem();
this.StripMenu_Browser_NavigateToLogInPage = new System.Windows.Forms.ToolStripMenuItem();
@@ -119,7 +120,6 @@ private void InitializeComponent() {
this.StripStatus_Padding = new System.Windows.Forms.ToolStripStatusLabel();
this.StripStatus_Clock = new System.Windows.Forms.ToolStripStatusLabel();
this.UIUpdateTimer = new System.Windows.Forms.Timer(this.components);
- this.StripMenu_Browser_ApplyStyleSheet = new System.Windows.Forms.ToolStripMenuItem();
this.StripMenu.SuspendLayout();
this.StripStatus.SuspendLayout();
this.SuspendLayout();
@@ -137,52 +137,52 @@ private void InitializeComponent() {
this.MainDockPanel.Name = "MainDockPanel";
this.MainDockPanel.ShowDocumentIcon = true;
this.MainDockPanel.Size = new System.Drawing.Size(640, 431);
- dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
- dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
- autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
- tabGradient1.EndColor = System.Drawing.SystemColors.Control;
- tabGradient1.StartColor = System.Drawing.SystemColors.Control;
- tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark;
- autoHideStripSkin1.TabGradient = tabGradient1;
- autoHideStripSkin1.TextFont = new System.Drawing.Font("メイリオ", 9F);
- dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1;
- tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight;
- tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight;
- tabGradient2.TextColor = System.Drawing.SystemColors.ControlText;
- dockPaneStripGradient1.ActiveTabGradient = tabGradient2;
- dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control;
- dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control;
- dockPaneStripGradient1.DockStripGradient = dockPanelGradient2;
- tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
- tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
- tabGradient3.TextColor = System.Drawing.SystemColors.ControlText;
- dockPaneStripGradient1.InactiveTabGradient = tabGradient3;
- dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1;
- dockPaneStripSkin1.TextFont = new System.Drawing.Font("メイリオ", 9F);
- tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption;
- tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
- tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
- tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
- dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4;
- tabGradient5.EndColor = System.Drawing.SystemColors.Control;
- tabGradient5.StartColor = System.Drawing.SystemColors.Control;
- tabGradient5.TextColor = System.Drawing.SystemColors.ControlText;
- dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5;
- dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight;
- dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight;
- dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3;
- tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption;
- tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
- tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
- tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
- dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6;
- tabGradient7.EndColor = System.Drawing.Color.Transparent;
- tabGradient7.StartColor = System.Drawing.Color.Transparent;
- tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark;
- dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7;
- dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1;
- dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1;
- this.MainDockPanel.Skin = dockPanelSkin1;
+ dockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight;
+ dockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight;
+ autoHideStripSkin3.DockStripGradient = dockPanelGradient7;
+ tabGradient15.EndColor = System.Drawing.SystemColors.Control;
+ tabGradient15.StartColor = System.Drawing.SystemColors.Control;
+ tabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+ autoHideStripSkin3.TabGradient = tabGradient15;
+ autoHideStripSkin3.TextFont = new System.Drawing.Font("メイリオ", 9F);
+ dockPanelSkin3.AutoHideStripSkin = autoHideStripSkin3;
+ tabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight;
+ tabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight;
+ tabGradient16.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripGradient3.ActiveTabGradient = tabGradient16;
+ dockPanelGradient8.EndColor = System.Drawing.SystemColors.Control;
+ dockPanelGradient8.StartColor = System.Drawing.SystemColors.Control;
+ dockPaneStripGradient3.DockStripGradient = dockPanelGradient8;
+ tabGradient17.EndColor = System.Drawing.SystemColors.ControlLight;
+ tabGradient17.StartColor = System.Drawing.SystemColors.ControlLight;
+ tabGradient17.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripGradient3.InactiveTabGradient = tabGradient17;
+ dockPaneStripSkin3.DocumentGradient = dockPaneStripGradient3;
+ dockPaneStripSkin3.TextFont = new System.Drawing.Font("メイリオ", 9F);
+ tabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption;
+ tabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+ tabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption;
+ tabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText;
+ dockPaneStripToolWindowGradient3.ActiveCaptionGradient = tabGradient18;
+ tabGradient19.EndColor = System.Drawing.SystemColors.Control;
+ tabGradient19.StartColor = System.Drawing.SystemColors.Control;
+ tabGradient19.TextColor = System.Drawing.SystemColors.ControlText;
+ dockPaneStripToolWindowGradient3.ActiveTabGradient = tabGradient19;
+ dockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight;
+ dockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight;
+ dockPaneStripToolWindowGradient3.DockStripGradient = dockPanelGradient9;
+ tabGradient20.EndColor = System.Drawing.SystemColors.InactiveCaption;
+ tabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
+ tabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ tabGradient20.TextColor = System.Drawing.SystemColors.InactiveCaptionText;
+ dockPaneStripToolWindowGradient3.InactiveCaptionGradient = tabGradient20;
+ tabGradient21.EndColor = System.Drawing.Color.Transparent;
+ tabGradient21.StartColor = System.Drawing.Color.Transparent;
+ tabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark;
+ dockPaneStripToolWindowGradient3.InactiveTabGradient = tabGradient21;
+ dockPaneStripSkin3.ToolWindowGradient = dockPaneStripToolWindowGradient3;
+ dockPanelSkin3.DockPaneStripSkin = dockPaneStripSkin3;
+ this.MainDockPanel.Skin = dockPanelSkin3;
this.MainDockPanel.TabIndex = 0;
//
// StripMenu
@@ -456,7 +456,7 @@ private void InitializeComponent() {
this.StripMenu_Browser_ScreenShot,
this.toolStripSeparator9,
this.StripMenu_Browser_Zoom,
- this.StripMenu_Browser_ApplyStyleSheet,
+ this.StripMenu_Browser_AppliesStyleSheet,
this.toolStripSeparator10,
this.StripMenu_Browser_Refresh,
this.StripMenu_Browser_NavigateToLogInPage,
@@ -464,19 +464,20 @@ private void InitializeComponent() {
this.StripMenu_Browser.Name = "StripMenu_Browser";
this.StripMenu_Browser.Size = new System.Drawing.Size(86, 22);
this.StripMenu_Browser.Text = "ブラウザ(&B)";
+ this.StripMenu_Browser.DropDownOpening += new System.EventHandler(this.StripMenu_Browser_DropDownOpening);
//
// StripMenu_Browser_ScreenShot
//
this.StripMenu_Browser_ScreenShot.Name = "StripMenu_Browser_ScreenShot";
this.StripMenu_Browser_ScreenShot.ShortcutKeys = System.Windows.Forms.Keys.F2;
- this.StripMenu_Browser_ScreenShot.Size = new System.Drawing.Size(226, 22);
+ this.StripMenu_Browser_ScreenShot.Size = new System.Drawing.Size(238, 22);
this.StripMenu_Browser_ScreenShot.Text = "スクリーンショット(&S)";
this.StripMenu_Browser_ScreenShot.Click += new System.EventHandler(this.StripMenu_Browser_ScreenShot_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(223, 6);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(235, 6);
//
// StripMenu_Browser_Zoom
//
@@ -498,7 +499,7 @@ private void InitializeComponent() {
this.StripMenu_Browser_Zoom_300,
this.StripMenu_Browser_Zoom_400});
this.StripMenu_Browser_Zoom.Name = "StripMenu_Browser_Zoom";
- this.StripMenu_Browser_Zoom.Size = new System.Drawing.Size(226, 22);
+ this.StripMenu_Browser_Zoom.Size = new System.Drawing.Size(238, 22);
this.StripMenu_Browser_Zoom.Text = "ズーム(&Z)";
this.StripMenu_Browser_Zoom.DropDownOpening += new System.EventHandler(this.StripMenu_Browser_Zoom_DropDownOpening);
//
@@ -506,130 +507,138 @@ private void InitializeComponent() {
//
this.StripMenu_Browser_Zoom_Current.Enabled = false;
this.StripMenu_Browser_Zoom_Current.Name = "StripMenu_Browser_Zoom_Current";
- this.StripMenu_Browser_Zoom_Current.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_Current.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_Current.Text = "現在%";
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(109, 6);
//
// StripMenu_Browser_Zoom_Decr20
//
this.StripMenu_Browser_Zoom_Decr20.Name = "StripMenu_Browser_Zoom_Decr20";
- this.StripMenu_Browser_Zoom_Decr20.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_Decr20.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_Decr20.Text = "-20%";
this.StripMenu_Browser_Zoom_Decr20.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Decr20_Click);
//
// StripMenu_Browser_Zoom_Incr20
//
this.StripMenu_Browser_Zoom_Incr20.Name = "StripMenu_Browser_Zoom_Incr20";
- this.StripMenu_Browser_Zoom_Incr20.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_Incr20.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_Incr20.Text = "+20%";
this.StripMenu_Browser_Zoom_Incr20.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Incr20_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator13.Size = new System.Drawing.Size(109, 6);
//
// StripMenu_Browser_Zoom_25
//
this.StripMenu_Browser_Zoom_25.Name = "StripMenu_Browser_Zoom_25";
- this.StripMenu_Browser_Zoom_25.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_25.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_25.Text = "25%";
this.StripMenu_Browser_Zoom_25.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// StripMenu_Browser_Zoom_50
//
this.StripMenu_Browser_Zoom_50.Name = "StripMenu_Browser_Zoom_50";
- this.StripMenu_Browser_Zoom_50.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_50.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_50.Text = "50%";
this.StripMenu_Browser_Zoom_50.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// StripMenu_Browser_Zoom_75
//
this.StripMenu_Browser_Zoom_75.Name = "StripMenu_Browser_Zoom_75";
- this.StripMenu_Browser_Zoom_75.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_75.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_75.Text = "75%";
this.StripMenu_Browser_Zoom_75.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(109, 6);
//
// StripMenu_Browser_Zoom_100
//
this.StripMenu_Browser_Zoom_100.Name = "StripMenu_Browser_Zoom_100";
- this.StripMenu_Browser_Zoom_100.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_100.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_100.Text = "100%";
this.StripMenu_Browser_Zoom_100.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(109, 6);
//
// StripMenu_Browser_Zoom_150
//
this.StripMenu_Browser_Zoom_150.Name = "StripMenu_Browser_Zoom_150";
- this.StripMenu_Browser_Zoom_150.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_150.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_150.Text = "150%";
this.StripMenu_Browser_Zoom_150.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// StripMenu_Browser_Zoom_200
//
this.StripMenu_Browser_Zoom_200.Name = "StripMenu_Browser_Zoom_200";
- this.StripMenu_Browser_Zoom_200.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_200.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_200.Text = "200%";
this.StripMenu_Browser_Zoom_200.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// StripMenu_Browser_Zoom_250
//
this.StripMenu_Browser_Zoom_250.Name = "StripMenu_Browser_Zoom_250";
- this.StripMenu_Browser_Zoom_250.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_250.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_250.Text = "250%";
this.StripMenu_Browser_Zoom_250.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// StripMenu_Browser_Zoom_300
//
this.StripMenu_Browser_Zoom_300.Name = "StripMenu_Browser_Zoom_300";
- this.StripMenu_Browser_Zoom_300.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_300.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_300.Text = "300%";
this.StripMenu_Browser_Zoom_300.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
// StripMenu_Browser_Zoom_400
//
this.StripMenu_Browser_Zoom_400.Name = "StripMenu_Browser_Zoom_400";
- this.StripMenu_Browser_Zoom_400.Size = new System.Drawing.Size(152, 22);
+ this.StripMenu_Browser_Zoom_400.Size = new System.Drawing.Size(112, 22);
this.StripMenu_Browser_Zoom_400.Text = "400%";
this.StripMenu_Browser_Zoom_400.Click += new System.EventHandler(this.StripMenu_Browser_Zoom_Click);
//
+ // StripMenu_Browser_AppliesStyleSheet
+ //
+ this.StripMenu_Browser_AppliesStyleSheet.CheckOnClick = true;
+ this.StripMenu_Browser_AppliesStyleSheet.Name = "StripMenu_Browser_AppliesStyleSheet";
+ this.StripMenu_Browser_AppliesStyleSheet.Size = new System.Drawing.Size(238, 22);
+ this.StripMenu_Browser_AppliesStyleSheet.Text = "スタイルシートを適用する(&S)";
+ this.StripMenu_Browser_AppliesStyleSheet.CheckedChanged += new System.EventHandler(this.StripMenu_Browser_AppliesStyleSheet_CheckedChanged);
+ //
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(223, 6);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(235, 6);
//
// StripMenu_Browser_Refresh
//
this.StripMenu_Browser_Refresh.Name = "StripMenu_Browser_Refresh";
this.StripMenu_Browser_Refresh.ShortcutKeys = System.Windows.Forms.Keys.F5;
- this.StripMenu_Browser_Refresh.Size = new System.Drawing.Size(226, 22);
+ this.StripMenu_Browser_Refresh.Size = new System.Drawing.Size(238, 22);
this.StripMenu_Browser_Refresh.Text = "更新(&R)";
this.StripMenu_Browser_Refresh.Click += new System.EventHandler(this.StripMenu_Browser_Refresh_Click);
//
// StripMenu_Browser_NavigateToLogInPage
//
this.StripMenu_Browser_NavigateToLogInPage.Name = "StripMenu_Browser_NavigateToLogInPage";
- this.StripMenu_Browser_NavigateToLogInPage.Size = new System.Drawing.Size(226, 22);
+ this.StripMenu_Browser_NavigateToLogInPage.Size = new System.Drawing.Size(238, 22);
this.StripMenu_Browser_NavigateToLogInPage.Text = "ログインページへ移動(&L)";
this.StripMenu_Browser_NavigateToLogInPage.Click += new System.EventHandler(this.StripMenu_Browser_NavigateToLogInPage_Click);
//
// StripMenu_Browser_Navigate
//
this.StripMenu_Browser_Navigate.Name = "StripMenu_Browser_Navigate";
- this.StripMenu_Browser_Navigate.Size = new System.Drawing.Size(226, 22);
+ this.StripMenu_Browser_Navigate.Size = new System.Drawing.Size(238, 22);
this.StripMenu_Browser_Navigate.Text = "移動(&M)...";
this.StripMenu_Browser_Navigate.Click += new System.EventHandler(this.StripMenu_Browser_Navigate_Click);
//
@@ -787,13 +796,6 @@ private void InitializeComponent() {
this.UIUpdateTimer.Interval = 1000;
this.UIUpdateTimer.Tick += new System.EventHandler(this.UIUpdateTimer_Tick);
//
- // StripMenu_Browser_ApplyStyleSheet
- //
- this.StripMenu_Browser_ApplyStyleSheet.Name = "StripMenu_Browser_ApplyStyleSheet";
- this.StripMenu_Browser_ApplyStyleSheet.Size = new System.Drawing.Size(226, 22);
- this.StripMenu_Browser_ApplyStyleSheet.Text = "スタイルシートの再適用(&S)";
- this.StripMenu_Browser_ApplyStyleSheet.Click += new System.EventHandler(this.StripMenu_Browser_ApplyStyleSheet_Click);
- //
// FormMain
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -900,7 +902,7 @@ private void InitializeComponent() {
private System.Windows.Forms.ToolStripMenuItem StripMenu_Browser_Refresh;
private System.Windows.Forms.ToolStripMenuItem StripMenu_Browser_NavigateToLogInPage;
private System.Windows.Forms.ToolStripMenuItem StripMenu_Browser_Navigate;
- private System.Windows.Forms.ToolStripMenuItem StripMenu_Browser_ApplyStyleSheet;
+ private System.Windows.Forms.ToolStripMenuItem StripMenu_Browser_AppliesStyleSheet;
}
}
diff --git a/ElectronicObserver/Window/FormMain.cs b/ElectronicObserver/Window/FormMain.cs
index a2a6b93f9..19b59e922 100644
--- a/ElectronicObserver/Window/FormMain.cs
+++ b/ElectronicObserver/Window/FormMain.cs
@@ -375,12 +375,15 @@ private void SaveLayout( string path ) {
try {
- using ( var stream = File.OpenWrite( path ) ) {
+ using ( var stream = File.Open( path, FileMode.Create ) ) {
using ( var archive = new ZipArchive( stream, ZipArchiveMode.Create ) ) {
- SaveSubWindowsLayout( archive.CreateEntry( "SubWindowLayout.xml" ).Open() );
- WindowPlacementManager.SaveWindowPlacement( this, archive.CreateEntry( "WindowPlacement.xml" ).Open() );
-
+ using ( var layoutstream = archive.CreateEntry( "SubWindowLayout.xml" ).Open() ) {
+ SaveSubWindowsLayout( layoutstream );
+ }
+ using ( var placementstream = archive.CreateEntry( "WindowPlacement.xml" ).Open() ) {
+ WindowPlacementManager.SaveWindowPlacement( this, placementstream );
+ }
}
}
@@ -915,16 +918,14 @@ private void StripMenu_Browser_Zoom_DropDownOpening( object sender, EventArgs e
}
- private void StripMenu_Browser_ApplyStyleSheet_Click( object sender, EventArgs e ) {
+ private void StripMenu_Browser_AppliesStyleSheet_CheckedChanged( object sender, EventArgs e ) {
- if ( MessageBox.Show(
- "スタイルシートを再適用します。\r\nよろしいですか？", "確認",
- MessageBoxButtons.YesNo, MessageBoxIcon.Question
- ) == System.Windows.Forms.DialogResult.Yes ) {
-
- fBrowser.ApplyStyleSheet();
- }
+ Utility.Configuration.Config.FormBrowser.AplliesStyleSheet = StripMenu_Browser_AppliesStyleSheet.Checked;
+ }
+
+ private void StripMenu_Browser_DropDownOpening( object sender, EventArgs e ) {
+ StripMenu_Browser_AppliesStyleSheet.Checked = Utility.Configuration.Config.FormBrowser.AplliesStyleSheet;
}
@@ -992,7 +993,12 @@ private void StripMenu_View_Browser_Click( object sender, EventArgs e ) {
#endregion
-
+
+
+
+
+
+
}
diff --git a/README.md b/README.md
index 487bcc287..ddd5a96e6 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@
*このリンクの更新は遅れる可能性があります。最新版は[こちら](http://electronicobserver.blog.fc2.com/)で確認してください。*
-[ver. 1.0.1 (2015/03/12)](http://bit.ly/18dStWr)
+[ver. 1.0.2 (2015/03/15)](http://bit.ly/1GHsp18)
更新内容・履歴は[こちら](https://github.com/andanteyk/ElectronicObserver/wiki/ChangeLog)で確認できます。