OSDN Git Service

AppliStation-GUI,進捗ダイアログのログテキスト表示領域がインストーラーファイルをダウンロードしているときに表示領域がカクカクする不具合を修正
[applistation/AppliStation.git] / AppliStation / InstallationConfirmForm.Designer.cs
index 145cb1b..c0988c1 100644 (file)
@@ -30,9 +30,10 @@ namespace AppliStation
                private void InitializeComponent()\r
                {\r
                        this.components = new System.ComponentModel.Container();\r
+                       System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("インストールするソフト", System.Windows.Forms.HorizontalAlignment.Left);\r
+                       System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("アップデートするソフト", System.Windows.Forms.HorizontalAlignment.Left);\r
+                       System.Windows.Forms.ListViewGroup listViewGroup3 = new System.Windows.Forms.ListViewGroup("動作させるのに必要なソフト", System.Windows.Forms.HorizontalAlignment.Left);\r
                        System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallationConfirmForm));\r
-                       System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("インストール(またはアップグレード)するソフト", System.Windows.Forms.HorizontalAlignment.Left);\r
-                       System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("動作させるのに必要なソフト", System.Windows.Forms.HorizontalAlignment.Left);\r
                        this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
                        this.btnPanel = new System.Windows.Forms.FlowLayoutPanel();\r
                        this.runasCheckBox = new System.Windows.Forms.CheckBox();\r
@@ -44,32 +45,36 @@ namespace AppliStation
                        this.versionColumnHeader = new System.Windows.Forms.ColumnHeader();\r
                        this.currentVersionColumnHeader = new System.Windows.Forms.ColumnHeader();\r
                        this.silentInstColumnHeader = new System.Windows.Forms.ColumnHeader();\r
+                       this.pkgListNameColumnHeader = new System.Windows.Forms.ColumnHeader();\r
                        this.instListViewContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);\r
                        this.silentInstallStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.instListToolStripSeparator = new System.Windows.Forms.ToolStripSeparator();\r
-                       this.selectAllInstsStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-                       this.unselectAllInstsStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+                       this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();\r
+                       this.selectAllCheckBox = new System.Windows.Forms.CheckBox();\r
+                       this.silentInstallAsPossibleCheckBox = new System.Windows.Forms.CheckBox();\r
                        this.instListViewSilentInstallImageList = new System.Windows.Forms.ImageList(this.components);\r
                        this.tableLayoutPanel1.SuspendLayout();\r
                        this.btnPanel.SuspendLayout();\r
                        this.instListViewContextMenuStrip.SuspendLayout();\r
+                       this.flowLayoutPanel1.SuspendLayout();\r
                        this.SuspendLayout();\r
                        // \r
                        // tableLayoutPanel1\r
                        // \r
                        this.tableLayoutPanel1.ColumnCount = 1;\r
                        this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-                       this.tableLayoutPanel1.Controls.Add(this.btnPanel, 0, 2);\r
+                       this.tableLayoutPanel1.Controls.Add(this.btnPanel, 0, 3);\r
                        this.tableLayoutPanel1.Controls.Add(this.label, 0, 0);\r
                        this.tableLayoutPanel1.Controls.Add(this.instsListView, 0, 1);\r
+                       this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 2);\r
                        this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);\r
                        this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
-                       this.tableLayoutPanel1.RowCount = 3;\r
+                       this.tableLayoutPanel1.RowCount = 4;\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F));\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-                       this.tableLayoutPanel1.Size = new System.Drawing.Size(392, 266);\r
+                       this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
+                       this.tableLayoutPanel1.Size = new System.Drawing.Size(392, 279);\r
                        this.tableLayoutPanel1.TabIndex = 0;\r
                        // \r
                        // btnPanel\r
@@ -79,7 +84,7 @@ namespace AppliStation
                        this.btnPanel.Controls.Add(this.okButton);\r
                        this.btnPanel.Controls.Add(this.cancelButton);\r
                        this.btnPanel.Dock = System.Windows.Forms.DockStyle.Right;\r
-                       this.btnPanel.Location = new System.Drawing.Point(84, 234);\r
+                       this.btnPanel.Location = new System.Drawing.Point(84, 247);\r
                        this.btnPanel.Name = "btnPanel";\r
                        this.btnPanel.Size = new System.Drawing.Size(305, 29);\r
                        this.btnPanel.TabIndex = 0;\r
@@ -93,7 +98,7 @@ namespace AppliStation
                        this.runasCheckBox.Location = new System.Drawing.Point(3, 6);\r
                        this.runasCheckBox.Name = "runasCheckBox";\r
                        this.runasCheckBox.Size = new System.Drawing.Size(126, 16);\r
-                       this.runasCheckBox.TabIndex = 2;\r
+                       this.runasCheckBox.TabIndex = 0;\r
                        this.runasCheckBox.Text = "管理者として実行(&A)";\r
                        this.runasCheckBox.UseVisualStyleBackColor = true;\r
                        this.runasCheckBox.CheckedChanged += new System.EventHandler(this.RunasCheckBoxCheckedChanged);\r
@@ -102,13 +107,11 @@ namespace AppliStation
                        // \r
                        this.okButton.AutoSize = true;\r
                        this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;\r
-                       this.okButton.Image = ((System.Drawing.Image)(resources.GetObject("okButton.Image")));\r
                        this.okButton.Location = new System.Drawing.Point(135, 3);\r
                        this.okButton.Name = "okButton";\r
                        this.okButton.Size = new System.Drawing.Size(86, 23);\r
-                       this.okButton.TabIndex = 0;\r
+                       this.okButton.TabIndex = 1;\r
                        this.okButton.Text = "インストール";\r
-                       this.okButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
                        // \r
                        // cancelButton\r
                        // \r
@@ -117,7 +120,7 @@ namespace AppliStation
                        this.cancelButton.Location = new System.Drawing.Point(227, 3);\r
                        this.cancelButton.Name = "cancelButton";\r
                        this.cancelButton.Size = new System.Drawing.Size(75, 23);\r
-                       this.cancelButton.TabIndex = 1;\r
+                       this.cancelButton.TabIndex = 2;\r
                        this.cancelButton.Text = "キャンセル";\r
                        // \r
                        // label\r
@@ -127,7 +130,7 @@ namespace AppliStation
                        this.label.Margin = new System.Windows.Forms.Padding(10);\r
                        this.label.Name = "label";\r
                        this.label.Size = new System.Drawing.Size(372, 30);\r
-                       this.label.TabIndex = 1;\r
+                       this.label.TabIndex = 0;\r
                        this.label.Text = "以下のソフトをインストールしようとしています。インストールするソフトをチェックしてください";\r
                        // \r
                        // instsListView\r
@@ -137,25 +140,29 @@ namespace AppliStation
                                                                        this.nameColumnHeader,\r
                                                                        this.versionColumnHeader,\r
                                                                        this.currentVersionColumnHeader,\r
-                                                                       this.silentInstColumnHeader});\r
+                                                                       this.silentInstColumnHeader,\r
+                                                                       this.pkgListNameColumnHeader});\r
                        this.instsListView.ContextMenuStrip = this.instListViewContextMenuStrip;\r
                        this.instsListView.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.instsListView.GridLines = true;\r
-                       listViewGroup1.Header = "インストール(またはアップグレード)するソフト";\r
+                       listViewGroup1.Header = "インストールするソフト";\r
                        listViewGroup1.Name = "install";\r
-                       listViewGroup2.Header = "動作させるのに必要なソフト";\r
-                       listViewGroup2.Name = "requires";\r
+                       listViewGroup2.Header = "アップデートするソフト";\r
+                       listViewGroup2.Name = "update";\r
+                       listViewGroup3.Header = "動作させるのに必要なソフト";\r
+                       listViewGroup3.Name = "requires";\r
                        this.instsListView.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {\r
                                                                        listViewGroup1,\r
-                                                                       listViewGroup2});\r
+                                                                       listViewGroup2,\r
+                                                                       listViewGroup3});\r
                        this.instsListView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
                        this.instsListView.Location = new System.Drawing.Point(5, 53);\r
                        this.instsListView.Margin = new System.Windows.Forms.Padding(5, 3, 5, 5);\r
                        this.instsListView.Name = "instsListView";\r
                        this.instsListView.OwnerDraw = true;\r
                        this.instsListView.ShowItemToolTips = true;\r
-                       this.instsListView.Size = new System.Drawing.Size(382, 173);\r
-                       this.instsListView.TabIndex = 2;\r
+                       this.instsListView.Size = new System.Drawing.Size(382, 158);\r
+                       this.instsListView.TabIndex = 1;\r
                        this.instsListView.UseCompatibleStateImageBehavior = false;\r
                        this.instsListView.View = System.Windows.Forms.View.Details;\r
                        this.instsListView.DrawColumnHeader += new System.Windows.Forms.DrawListViewColumnHeaderEventHandler(this.InstsListViewDrawColumnHeader);\r
@@ -182,15 +189,16 @@ namespace AppliStation
                        this.silentInstColumnHeader.Text = "自動インストール";\r
                        this.silentInstColumnHeader.Width = 28;\r
                        // \r
+                       // pkgListNameColumnHeader\r
+                       // \r
+                       this.pkgListNameColumnHeader.Text = "レポジトリ";\r
+                       // \r
                        // instListViewContextMenuStrip\r
                        // \r
                        this.instListViewContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-                                                                       this.silentInstallStripMenuItem,\r
-                                                                       this.instListToolStripSeparator,\r
-                                                                       this.selectAllInstsStripMenuItem,\r
-                                                                       this.unselectAllInstsStripMenuItem});\r
+                                                                       this.silentInstallStripMenuItem});\r
                        this.instListViewContextMenuStrip.Name = "packageListViewContextMenuStrip";\r
-                       this.instListViewContextMenuStrip.Size = new System.Drawing.Size(263, 76);\r
+                       this.instListViewContextMenuStrip.Size = new System.Drawing.Size(263, 26);\r
                        this.instListViewContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.InstsListViewContextMenuStripOpening);\r
                        // \r
                        // silentInstallStripMenuItem\r
@@ -200,24 +208,37 @@ namespace AppliStation
                        this.silentInstallStripMenuItem.Text = "サイレントインストールをする(&S)";\r
                        this.silentInstallStripMenuItem.Click += new System.EventHandler(this.SilentInstallStripMenuItemClick);\r
                        // \r
-                       // instListToolStripSeparator\r
-                       // \r
-                       this.instListToolStripSeparator.Name = "instListToolStripSeparator";\r
-                       this.instListToolStripSeparator.Size = new System.Drawing.Size(259, 6);\r
-                       // \r
-                       // selectAllInstsStripMenuItem\r
-                       // \r
-                       this.selectAllInstsStripMenuItem.Name = "selectAllInstsStripMenuItem";\r
-                       this.selectAllInstsStripMenuItem.Size = new System.Drawing.Size(262, 22);\r
-                       this.selectAllInstsStripMenuItem.Text = "全て選択(&A)";\r
-                       this.selectAllInstsStripMenuItem.Click += new System.EventHandler(this.SelectAllInstsStripMenuItemClick);\r
-                       // \r
-                       // unselectAllInstsStripMenuItem\r
-                       // \r
-                       this.unselectAllInstsStripMenuItem.Name = "unselectAllInstsStripMenuItem";\r
-                       this.unselectAllInstsStripMenuItem.Size = new System.Drawing.Size(262, 22);\r
-                       this.unselectAllInstsStripMenuItem.Text = "全ての選択を解除(&U)";\r
-                       this.unselectAllInstsStripMenuItem.Click += new System.EventHandler(this.UnselectAllInstsStripMenuItemClick);\r
+                       // flowLayoutPanel1\r
+                       // \r
+                       this.flowLayoutPanel1.AutoSize = true;\r
+                       this.flowLayoutPanel1.Controls.Add(this.selectAllCheckBox);\r
+                       this.flowLayoutPanel1.Controls.Add(this.silentInstallAsPossibleCheckBox);\r
+                       this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
+                       this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 219);\r
+                       this.flowLayoutPanel1.Name = "flowLayoutPanel1";\r
+                       this.flowLayoutPanel1.Size = new System.Drawing.Size(386, 22);\r
+                       this.flowLayoutPanel1.TabIndex = 3;\r
+                       // \r
+                       // selectAllCheckBox\r
+                       // \r
+                       this.selectAllCheckBox.AutoSize = true;\r
+                       this.selectAllCheckBox.Location = new System.Drawing.Point(3, 3);\r
+                       this.selectAllCheckBox.Name = "selectAllCheckBox";\r
+                       this.selectAllCheckBox.Size = new System.Drawing.Size(133, 16);\r
+                       this.selectAllCheckBox.TabIndex = 0;\r
+                       this.selectAllCheckBox.Text = "すべて選択/非選択(&L)";\r
+                       this.selectAllCheckBox.CheckedChanged += new System.EventHandler(this.SelectAllCheckBoxCheckedChanged);\r
+                       // \r
+                       // silentInstallAsPossibleCheckBox\r
+                       // \r
+                       this.silentInstallAsPossibleCheckBox.AutoSize = true;\r
+                       this.silentInstallAsPossibleCheckBox.Location = new System.Drawing.Point(142, 3);\r
+                       this.silentInstallAsPossibleCheckBox.Name = "silentInstallAsPossibleCheckBox";\r
+                       this.silentInstallAsPossibleCheckBox.Size = new System.Drawing.Size(193, 16);\r
+                       this.silentInstallAsPossibleCheckBox.TabIndex = 1;\r
+                       this.silentInstallAsPossibleCheckBox.Text = "サイレントインストールする/しない(&S)";\r
+                       this.silentInstallAsPossibleCheckBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
+                       this.silentInstallAsPossibleCheckBox.CheckedChanged += new System.EventHandler(this.SilentInstallAsPossibleCheckBoxCheckedChanged);\r
                        // \r
                        // instListViewSilentInstallImageList\r
                        // \r
@@ -231,7 +252,7 @@ namespace AppliStation
                        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
                        this.CancelButton = this.cancelButton;\r
-                       this.ClientSize = new System.Drawing.Size(392, 266);\r
+                       this.ClientSize = new System.Drawing.Size(392, 279);\r
                        this.Controls.Add(this.tableLayoutPanel1);\r
                        this.MaximizeBox = false;\r
                        this.Name = "InstallationConfirmForm";\r
@@ -245,14 +266,17 @@ namespace AppliStation
                        this.btnPanel.ResumeLayout(false);\r
                        this.btnPanel.PerformLayout();\r
                        this.instListViewContextMenuStrip.ResumeLayout(false);\r
+                       this.flowLayoutPanel1.ResumeLayout(false);\r
+                       this.flowLayoutPanel1.PerformLayout();\r
                        this.ResumeLayout(false);\r
                }\r
+               private System.Windows.Forms.CheckBox silentInstallAsPossibleCheckBox;\r
+               private System.Windows.Forms.CheckBox selectAllCheckBox;\r
+               private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;\r
+               private System.Windows.Forms.ColumnHeader pkgListNameColumnHeader;\r
                private System.Windows.Forms.ImageList instListViewSilentInstallImageList;\r
                private System.Windows.Forms.ColumnHeader silentInstColumnHeader;\r
-               private System.Windows.Forms.ToolStripSeparator instListToolStripSeparator;\r
                private System.Windows.Forms.ToolStripMenuItem silentInstallStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem unselectAllInstsStripMenuItem;\r
-               private System.Windows.Forms.ToolStripMenuItem selectAllInstsStripMenuItem;\r
                private System.Windows.Forms.ContextMenuStrip instListViewContextMenuStrip;\r
                private System.Windows.Forms.CheckBox runasCheckBox;\r
                private System.Windows.Forms.ColumnHeader currentVersionColumnHeader;\r