AppliStation-GUI,レポジトリリスト編集ダイアログのデザイン配置を変更

diff --git a/AppliStation/UserPrefForm.Designer.cs b/AppliStation/UserPrefForm.Designer.cs
index 5a12dae..ebc3a08 100644 (file)
--- a/AppliStation/UserPrefForm.Designer.cs
+++ b/AppliStation/UserPrefForm.Designer.cs
@@ -43,6 +43,7 @@
                        this.downRepoButton = new System.Windows.Forms.Button();\r
                        this.repoUrlTextBox = new System.Windows.Forms.TextBox();\r
                        this.repoUrlLabel = new System.Windows.Forms.Label();\r
+                       this.repoListLabel = new System.Windows.Forms.Label();\r
                        this.tableLayoutPanel.SuspendLayout();\r
                        this.flowLayoutPanel1.SuspendLayout();\r
                        this.tabControl.SuspendLayout();\r
@@ -64,8 +65,8 @@
                        this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
-                       this.tableLayoutPanel.Size = new System.Drawing.Size(492, 226);\r
-                       this.tableLayoutPanel.TabIndex = 1;\r
+                       this.tableLayoutPanel.Size = new System.Drawing.Size(464, 283);\r
+                       this.tableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // flowLayoutPanel1\r
                        // \r
@@ -73,7 +74,7 @@
                        this.flowLayoutPanel1.Controls.Add(this.okButton);\r
                        this.flowLayoutPanel1.Controls.Add(this.cancelButton);\r
                        this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Right;\r
-                       this.flowLayoutPanel1.Location = new System.Drawing.Point(322, 193);\r
+                       this.flowLayoutPanel1.Location = new System.Drawing.Point(294, 250);\r
                        this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);\r
                        this.flowLayoutPanel1.Name = "flowLayoutPanel1";\r
                        this.flowLayoutPanel1.Size = new System.Drawing.Size(170, 33);\r
@@ -114,7 +115,7 @@
                        this.tabControl.Multiline = true;\r
                        this.tabControl.Name = "tabControl";\r
                        this.tabControl.SelectedIndex = 0;\r
-                       this.tabControl.Size = new System.Drawing.Size(482, 183);\r
+                       this.tabControl.Size = new System.Drawing.Size(454, 240);\r
                        this.tabControl.TabIndex = 1;\r
                        // \r
                        // reposListTabPage\r
@@ -123,27 +124,29 @@
                        this.reposListTabPage.Location = new System.Drawing.Point(4, 22);\r
                        this.reposListTabPage.Name = "reposListTabPage";\r
                        this.reposListTabPage.Padding = new System.Windows.Forms.Padding(3);\r
-                       this.reposListTabPage.Size = new System.Drawing.Size(474, 157);\r
+                       this.reposListTabPage.Size = new System.Drawing.Size(446, 214);\r
                        this.reposListTabPage.TabIndex = 0;\r
                        this.reposListTabPage.Text = "レポジトリ";\r
                        // \r
                        // repoTableLayoutPanel\r
                        // \r
-                       this.repoTableLayoutPanel.ColumnCount = 2;\r
+                       this.repoTableLayoutPanel.ColumnCount = 3;\r
                        this.repoTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
                        this.repoTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
-                       this.repoTableLayoutPanel.Controls.Add(this.repoListCheckedListBox, 0, 0);\r
-                       this.repoTableLayoutPanel.Controls.Add(this.repoBtnsFlowLayoutPanel, 0, 1);\r
+                       this.repoTableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+                       this.repoTableLayoutPanel.Controls.Add(this.repoListCheckedListBox, 0, 1);\r
+                       this.repoTableLayoutPanel.Controls.Add(this.repoBtnsFlowLayoutPanel, 2, 1);\r
                        this.repoTableLayoutPanel.Controls.Add(this.repoUrlTextBox, 1, 2);\r
                        this.repoTableLayoutPanel.Controls.Add(this.repoUrlLabel, 0, 2);\r
+                       this.repoTableLayoutPanel.Controls.Add(this.repoListLabel, 0, 0);\r
                        this.repoTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.repoTableLayoutPanel.Location = new System.Drawing.Point(3, 3);\r
                        this.repoTableLayoutPanel.Name = "repoTableLayoutPanel";\r
                        this.repoTableLayoutPanel.RowCount = 3;\r
-                       this.repoTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.repoTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+                       this.repoTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.repoTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-                       this.repoTableLayoutPanel.Size = new System.Drawing.Size(468, 151);\r
+                       this.repoTableLayoutPanel.Size = new System.Drawing.Size(440, 208);\r
                        this.repoTableLayoutPanel.TabIndex = 1;\r
                        // \r
                        // repoListCheckedListBox\r
@@ -152,26 +155,26 @@
                        this.repoListCheckedListBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.repoListCheckedListBox.FormattingEnabled = true;\r
                        this.repoListCheckedListBox.IntegralHeight = false;\r
-                       this.repoListCheckedListBox.Location = new System.Drawing.Point(3, 3);\r
+                       this.repoListCheckedListBox.Location = new System.Drawing.Point(3, 15);\r
                        this.repoListCheckedListBox.Name = "repoListCheckedListBox";\r
                        this.repoListCheckedListBox.ScrollAlwaysVisible = true;\r
-                       this.repoListCheckedListBox.Size = new System.Drawing.Size(462, 85);\r
-                       this.repoListCheckedListBox.TabIndex = 0;\r
+                       this.repoListCheckedListBox.Size = new System.Drawing.Size(347, 165);\r
+                       this.repoListCheckedListBox.TabIndex = 1;\r
                        this.repoListCheckedListBox.SelectedIndexChanged += new System.EventHandler(this.RepoListCheckedListBoxSelectedIndexChanged);\r
                        this.repoListCheckedListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.RepoListCheckedListBoxItemCheck);\r
                        // \r
                        // repoBtnsFlowLayoutPanel\r
                        // \r
-                       this.repoBtnsFlowLayoutPanel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+                       this.repoBtnsFlowLayoutPanel.Anchor = System.Windows.Forms.AnchorStyles.Top;\r
                        this.repoBtnsFlowLayoutPanel.AutoSize = true;\r
-                       this.repoTableLayoutPanel.SetColumnSpan(this.repoBtnsFlowLayoutPanel, 2);\r
                        this.repoBtnsFlowLayoutPanel.Controls.Add(this.addRepoButton);\r
                        this.repoBtnsFlowLayoutPanel.Controls.Add(this.removeRepoButton);\r
                        this.repoBtnsFlowLayoutPanel.Controls.Add(this.upRepoButton);\r
                        this.repoBtnsFlowLayoutPanel.Controls.Add(this.downRepoButton);\r
-                       this.repoBtnsFlowLayoutPanel.Location = new System.Drawing.Point(141, 94);\r
+                       this.repoBtnsFlowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;\r
+                       this.repoBtnsFlowLayoutPanel.Location = new System.Drawing.Point(356, 15);\r
                        this.repoBtnsFlowLayoutPanel.Name = "repoBtnsFlowLayoutPanel";\r
-                       this.repoBtnsFlowLayoutPanel.Size = new System.Drawing.Size(324, 29);\r
+                       this.repoBtnsFlowLayoutPanel.Size = new System.Drawing.Size(81, 116);\r
                        this.repoBtnsFlowLayoutPanel.TabIndex = 1;\r
                        // \r
                        // addRepoButton\r
@@ -180,48 +183,49 @@
                        this.addRepoButton.Name = "addRepoButton";\r
                        this.addRepoButton.Size = new System.Drawing.Size(75, 23);\r
                        this.addRepoButton.TabIndex = 0;\r
-                       this.addRepoButton.Text = "新規";\r
+                       this.addRepoButton.Text = "新規(&N)";\r
                        this.addRepoButton.Click += new System.EventHandler(this.AddRepoButtonClick);\r
                        // \r
                        // removeRepoButton\r
                        // \r
                        this.removeRepoButton.Enabled = false;\r
-                       this.removeRepoButton.Location = new System.Drawing.Point(84, 3);\r
+                       this.removeRepoButton.Location = new System.Drawing.Point(3, 32);\r
                        this.removeRepoButton.Name = "removeRepoButton";\r
                        this.removeRepoButton.Size = new System.Drawing.Size(75, 23);\r
                        this.removeRepoButton.TabIndex = 1;\r
-                       this.removeRepoButton.Text = "削除";\r
+                       this.removeRepoButton.Text = "削除(&R)";\r
                        this.removeRepoButton.Click += new System.EventHandler(this.RemoveRepoButtonClick);\r
                        // \r
                        // upRepoButton\r
                        // \r
                        this.upRepoButton.Enabled = false;\r
-                       this.upRepoButton.Location = new System.Drawing.Point(165, 3);\r
+                       this.upRepoButton.Location = new System.Drawing.Point(3, 61);\r
                        this.upRepoButton.Name = "upRepoButton";\r
                        this.upRepoButton.Size = new System.Drawing.Size(75, 23);\r
                        this.upRepoButton.TabIndex = 2;\r
-                       this.upRepoButton.Text = "上へ";\r
+                       this.upRepoButton.Text = "上へ(&U)";\r
                        this.upRepoButton.Click += new System.EventHandler(this.UpRepoButtonClick);\r
                        // \r
                        // downRepoButton\r
                        // \r
                        this.downRepoButton.Enabled = false;\r
-                       this.downRepoButton.Location = new System.Drawing.Point(246, 3);\r
+                       this.downRepoButton.Location = new System.Drawing.Point(3, 90);\r
                        this.downRepoButton.Name = "downRepoButton";\r
                        this.downRepoButton.Size = new System.Drawing.Size(75, 23);\r
                        this.downRepoButton.TabIndex = 3;\r
-                       this.downRepoButton.Text = "下へ";\r
+                       this.downRepoButton.Text = "下へ(&D)";\r
                        this.downRepoButton.Click += new System.EventHandler(this.DownRepoButtonClick);\r
                        // \r
                        // repoUrlTextBox\r
                        // \r
+                       this.repoTableLayoutPanel.SetColumnSpan(this.repoUrlTextBox, 2);\r
                        this.repoUrlTextBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.repoUrlTextBox.Enabled = false;\r
                        this.repoUrlTextBox.ImeMode = System.Windows.Forms.ImeMode.Off;\r
-                       this.repoUrlTextBox.Location = new System.Drawing.Point(108, 129);\r
+                       this.repoUrlTextBox.Location = new System.Drawing.Point(122, 186);\r
                        this.repoUrlTextBox.Name = "repoUrlTextBox";\r
-                       this.repoUrlTextBox.Size = new System.Drawing.Size(357, 19);\r
-                       this.repoUrlTextBox.TabIndex = 2;\r
+                       this.repoUrlTextBox.Size = new System.Drawing.Size(315, 19);\r
+                       this.repoUrlTextBox.TabIndex = 3;\r
                        this.repoUrlTextBox.Leave += new System.EventHandler(this.RepoUrlTextBoxLeave);\r
                        // \r
                        // repoUrlLabel\r
@@ -229,11 +233,21 @@
                        this.repoUrlLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
                        this.repoUrlLabel.AutoSize = true;\r
                        this.repoUrlLabel.Enabled = false;\r
-                       this.repoUrlLabel.Location = new System.Drawing.Point(3, 132);\r
+                       this.repoUrlLabel.Location = new System.Drawing.Point(3, 189);\r
                        this.repoUrlLabel.Name = "repoUrlLabel";\r
-                       this.repoUrlLabel.Size = new System.Drawing.Size(99, 12);\r
-                       this.repoUrlLabel.TabIndex = 1;\r
-                       this.repoUrlLabel.Text = "レポジトリのURL(&U):";\r
+                       this.repoUrlLabel.Size = new System.Drawing.Size(113, 12);\r
+                       this.repoUrlLabel.TabIndex = 2;\r
+                       this.repoUrlLabel.Text = "レポジトリのアドレス(&A):";\r
+                       // \r
+                       // repoListLabel\r
+                       // \r
+                       this.repoListLabel.AutoSize = true;\r
+                       this.repoTableLayoutPanel.SetColumnSpan(this.repoListLabel, 3);\r
+                       this.repoListLabel.Location = new System.Drawing.Point(3, 0);\r
+                       this.repoListLabel.Name = "repoListLabel";\r
+                       this.repoListLabel.Size = new System.Drawing.Size(170, 12);\r
+                       this.repoListLabel.TabIndex = 0;\r
+                       this.repoListLabel.Text = "ソフトリストを取得するレポジトリ(&L)：";\r
                        // \r
                        // UserPrefForm\r
                        // \r
@@ -242,7 +256,7 @@
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
                        this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
                        this.CancelButton = this.cancelButton;\r
-                       this.ClientSize = new System.Drawing.Size(492, 226);\r
+                       this.ClientSize = new System.Drawing.Size(464, 283);\r
                        this.Controls.Add(this.tableLayoutPanel);\r
                        this.MaximizeBox = false;\r
                        this.MinimizeBox = false;\r
@@ -261,6 +275,7 @@
                        this.repoBtnsFlowLayoutPanel.ResumeLayout(false);\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.Label repoListLabel;\r
                private System.Windows.Forms.TextBox repoUrlTextBox;\r
                private System.Windows.Forms.Label repoUrlLabel;\r
                private System.Windows.Forms.Button downRepoButton;\r