AppliStation-GUI,OptionPaneの表示を調整。Main Instructionの色など

diff --git a/AppliStation/AppliStation.Util/OptionDialog.Designer.cs b/AppliStation/AppliStation.Util/OptionDialog.Designer.cs
index 40d3118..787710f 100644 (file)
--- a/AppliStation/AppliStation.Util/OptionDialog.Designer.cs
+++ b/AppliStation/AppliStation.Util/OptionDialog.Designer.cs
@@ -38,6 +38,7 @@
                        this.mainInstLabel = new System.Windows.Forms.Label();\r
                        this.contentLabel = new System.Windows.Forms.Label();\r
                        this.contentFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();\r
+                       this.separatorLabel = new System.Windows.Forms.Label();\r
                        topTableLayoutPane = new System.Windows.Forms.TableLayoutPanel();\r
                        btnsAreaTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\r
                        topTableLayoutPane.SuspendLayout();\r
@@ -53,19 +54,20 @@
                        topTableLayoutPane.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
                        topTableLayoutPane.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        topTableLayoutPane.Controls.Add(this.iconPictureBox, 0, 0);\r
-                       topTableLayoutPane.Controls.Add(btnsAreaTableLayoutPanel, 0, 3);\r
+                       topTableLayoutPane.Controls.Add(btnsAreaTableLayoutPanel, 0, 4);\r
                        topTableLayoutPane.Controls.Add(this.mainInstLabel, 1, 0);\r
                        topTableLayoutPane.Controls.Add(this.contentLabel, 1, 1);\r
                        topTableLayoutPane.Controls.Add(this.contentFlowLayoutPanel, 1, 2);\r
+                       topTableLayoutPane.Controls.Add(this.separatorLabel, 0, 3);\r
                        topTableLayoutPane.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        topTableLayoutPane.Location = new System.Drawing.Point(0, 0);\r
                        topTableLayoutPane.Name = "topTableLayoutPane";\r
-                       topTableLayoutPane.RowCount = 4;\r
+                       topTableLayoutPane.RowCount = 5;\r
                        topTableLayoutPane.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        topTableLayoutPane.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        topTableLayoutPane.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
+                       topTableLayoutPane.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F));\r
                        topTableLayoutPane.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-                       topTableLayoutPane.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
                        topTableLayoutPane.Size = new System.Drawing.Size(392, 292);\r
                        topTableLayoutPane.TabIndex = 0;\r
                        // \r
@@ -112,7 +114,7 @@
                        this.noButton.Name = "noButton";\r
                        this.noButton.Size = new System.Drawing.Size(75, 23);\r
                        this.noButton.TabIndex = 2;\r
-                       this.noButton.Text = "No";\r
+                       this.noButton.Text = "いいえ(&N)";\r
                        this.noButton.Click += new System.EventHandler(this.SomeButtonClick);\r
                        // \r
                        // cancelButton\r
@@ -122,7 +124,7 @@
                        this.cancelButton.Name = "cancelButton";\r
                        this.cancelButton.Size = new System.Drawing.Size(75, 23);\r
                        this.cancelButton.TabIndex = 3;\r
-                       this.cancelButton.Text = "Cancel";\r
+                       this.cancelButton.Text = "キャンセル";\r
                        this.cancelButton.Click += new System.EventHandler(this.SomeButtonClick);\r
                        // \r
                        // okButton\r
@@ -142,13 +144,12 @@
                        this.yesButton.Name = "yesButton";\r
                        this.yesButton.Size = new System.Drawing.Size(75, 23);\r
                        this.yesButton.TabIndex = 1;\r
-                       this.yesButton.Text = "Yes";\r
+                       this.yesButton.Text = "はい(&Y)";\r
                        this.yesButton.Click += new System.EventHandler(this.SomeButtonClick);\r
                        // \r
                        // mainInstLabel\r
                        // \r
                        this.mainInstLabel.AutoSize = true;\r
-                       this.mainInstLabel.ForeColor = System.Drawing.SystemColors.HotTrack;\r
                        this.mainInstLabel.Location = new System.Drawing.Point(24, 8);\r
                        this.mainInstLabel.Margin = new System.Windows.Forms.Padding(8);\r
                        this.mainInstLabel.Name = "mainInstLabel";\r
@@ -175,9 +176,20 @@
                        this.contentFlowLayoutPanel.Location = new System.Drawing.Point(24, 54);\r
                        this.contentFlowLayoutPanel.Margin = new System.Windows.Forms.Padding(8);\r
                        this.contentFlowLayoutPanel.Name = "contentFlowLayoutPanel";\r
-                       this.contentFlowLayoutPanel.Size = new System.Drawing.Size(360, 193);\r
+                       this.contentFlowLayoutPanel.Size = new System.Drawing.Size(360, 191);\r
                        this.contentFlowLayoutPanel.TabIndex = 1;\r
                        // \r
+                       // separatorLabel\r
+                       // \r
+                       this.separatorLabel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;\r
+                       topTableLayoutPane.SetColumnSpan(this.separatorLabel, 2);\r
+                       this.separatorLabel.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+                       this.separatorLabel.Location = new System.Drawing.Point(0, 253);\r
+                       this.separatorLabel.Margin = new System.Windows.Forms.Padding(0);\r
+                       this.separatorLabel.Name = "separatorLabel";\r
+                       this.separatorLabel.Size = new System.Drawing.Size(392, 2);\r
+                       this.separatorLabel.TabIndex = 3;\r
+                       // \r
                        // OptionDialog\r
                        // \r
                        this.AcceptButton = this.okButton;\r
@@ -185,12 +197,10 @@
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
                        this.AutoSize = true;\r
                        this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
-                       this.BackColor = System.Drawing.SystemColors.Window;\r
                        this.CancelButton = this.cancelButton;\r
                        this.ClientSize = new System.Drawing.Size(392, 292);\r
                        this.ControlBox = false;\r
                        this.Controls.Add(topTableLayoutPane);\r
-                       this.ForeColor = System.Drawing.SystemColors.WindowText;\r
                        this.Name = "OptionDialog";\r
                        this.ShowInTaskbar = false;\r
                        topTableLayoutPane.ResumeLayout(false);\r
@@ -200,6 +210,7 @@
                        this.ResumeLayout(false);\r
                        this.PerformLayout();\r
                }\r
+               private System.Windows.Forms.Label separatorLabel;\r
                private System.Windows.Forms.Label contentLabel;\r
                private System.Windows.Forms.Button okButton;\r
                private System.Windows.Forms.Button cancelButton;\r

diff --git a/AppliStation/AppliStation.Util/OptionDialog.cs b/AppliStation/AppliStation.Util/OptionDialog.cs
index 4cab794..420921a 100644 (file)
--- a/AppliStation/AppliStation.Util/OptionDialog.cs
+++ b/AppliStation/AppliStation.Util/OptionDialog.cs
@@ -19,6 +19,15 @@ namespace AppliStation.Util
                        InitializeComponent();\r
                        \r
                        mainInstLabel.Font = SystemFonts.CaptionFont;\r
+                       if (System.Windows.Forms.VisualStyles.VisualStyleInformation.IsEnabledByUser) {\r
+                               mainInstLabel.ForeColor = Color.FromArgb(0x003399);\r
+                               \r
+                               this.BackColor = SystemColors.Window;\r
+                               this.ForeColor = SystemColors.WindowText;\r
+                               separatorLabel.Visible = true;\r
+                       } else {\r
+                               separatorLabel.Visible = false;\r
+                       }\r
                }\r
                \r
                private void SomeButtonClick(object sender, EventArgs e)\r