AppliStation-GUI,インストール確認ダイアログのListViewにグループ化を導入。

 * Win2k以前ではグループ化されないものの、正常に動作することを確認
 * 近い将来、依存関係をグループ化で表現するための布石

git-svn-id: http://localhost/svn/AppliStation/trunk@972 34ed2c89-c49f-4a4b-abdb-c318350108cf

diff --git a/AppliStation/InstallationConfirmForm.Designer.cs b/AppliStation/InstallationConfirmForm.Designer.cs
index 01d2e8c..2acfe32 100644 (file)
--- a/AppliStation/InstallationConfirmForm.Designer.cs
+++ b/AppliStation/InstallationConfirmForm.Designer.cs
@@ -31,6 +31,8 @@ namespace AppliStation
                {\r
                        this.components = new System.ComponentModel.Container();\r
                        System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallationConfirmForm));\r
                {\r
                        this.components = new System.ComponentModel.Container();\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
                        this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
                        this.btnPanel = new System.Windows.Forms.FlowLayoutPanel();\r
                        this.runasCheckBox = new System.Windows.Forms.CheckBox();\r


@@ -139,6 +141,13 @@ namespace AppliStation
                        this.instsListView.ContextMenuStrip = this.instListViewContextMenuStrip;\r
                        this.instsListView.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.instsListView.GridLines = true;\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.Name = "install";\r
+                       listViewGroup2.Header = "動作させるのに必要なソフト";\r
+                       listViewGroup2.Name = "requires";\r
+                       this.instsListView.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {\r
+                                                                       listViewGroup1,\r
+                                                                       listViewGroup2});\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.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

diff --git a/AppliStation/InstallationConfirmForm.cs b/AppliStation/InstallationConfirmForm.cs
index 97f46d1..8414b9b 100644 (file)
--- a/AppliStation/InstallationConfirmForm.cs
+++ b/AppliStation/InstallationConfirmForm.cs
@@ -86,6 +86,7 @@ namespace AppliStation
                                        item.Tag = inst;\r
                                        item.ToolTipText = pkg.Summary;\r
                                        item.Checked = true;\r
                                        item.Tag = inst;\r
                                        item.ToolTipText = pkg.Summary;\r
                                        item.Checked = true;\r

+                                       item.Group = instsListView.Groups["install"];\r

                                        instViewUpdateSilentInstallView(item);\r
                                        \r
                                        instsListView.Items.Add(item);\r
                                        instViewUpdateSilentInstallView(item);\r
                                        \r
                                        instsListView.Items.Add(item);\r

diff --git a/AppliStation/InstallationConfirmForm.resx b/AppliStation/InstallationConfirmForm.resx
index e4165ce..547caa4 100644 (file)
--- a/AppliStation/InstallationConfirmForm.resx
+++ b/AppliStation/InstallationConfirmForm.resx
@@ -146,28 +146,28 @@
     <value>\r
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r
     <value>\r
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0\r

-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADW\r
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC4\r

         BAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAAQ4BAAEOAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABOAMA\r
         BAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAAQ4BAAEOAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABOAMA\r

-        AQ4DAAEBAQABIAUAAUABDB4AAdMCAAEDAdMCAAEZAdICAAExAdMCAAFEAc4CAQGwAZQBEAFJAekBmwEP\r
-        AUUB6AGhAQ4BOgHkAaoBDAEzAeIBpgEMATsB4wHTAgEBobAAAdMCAAETAdMCAQGWAcwCAgHCAcUBCQEG\r
-        AdYBvgENAQgB3AFUASQBlwH7AkkB8QH/AlYB8gH/AikB7wH/AksB8gH/AlIB8gH/AaYBDAE7AeOsAAHT\r
-        AgABAgHQAgEBrQGdAWcBPQH/AZsBYgE0Af8BmwFgATAB/wGcAWABMAH/AUUBPQG7Af8CRAHxAf8C2AH8\r
-        Af8CcwH1Af8C2AH8Af8CSwHyAf8BqgEMATMB4qwAAdICAAExAaABVwEnAfsBnwFiATEB/wGiAWQBMgH/\r
-        AaQBZQEzAf8BqAFtAT0B/wFHAUEBwgH/AikB7wH/AmMB9AH/AvgB/gH/AnMB9QH/AikB7wH/AaoBDAEz\r
-        AeKsAAHTAgABWgGlAWsBPwH/AZ8BYgExAf8BqgFpATUB/wGtAWsBNgH/AboBiAFiAf8BSwFGAccB/wJN\r
-        AfIB/wLbAfwB/wJjAfQB/wLYAfwB/wJWAfIB/wGqAQwBMwHirAAB0wIAARwBtQE9ASAB8wGpAWgBNQH/\r
-        Aa8BbAE3Af8BtQFwATgB/wHSAbMBmwH/AU4BTAHPAf8CQAHxAf8CTQHyAf8CKQHvAf8CRAHxAf8CSQHx\r
-        Af8BqgEMATMB4rAAAdMCAQGhAa0BbwE+Af8BsAFtATgB/wGlAXUBTAH/AZoCnAH/AVQBWQGrAf8BQgE8\r
-        AbwB/wFGAT0BuwH/AUcBPwG8Af8BjgEWAVUB7QG5AQgBJgHaAdICAQGRsAAB0wIAAQ8B0AEEAQIBwwGR\r
-        AXgBXwH/AT0BhQGvAf8BMQGUAdIB/wEvAZQB0wH/ATABfgGtAf8BcQFjAVsB/gHTAgEBoQHTAgABArwA\r
-        AdMCAAENAZEBMgFIAeoBOwGhAeIB/wFEAaYB4wH/AUEBpAHjAf8BMQGcAeAB/wFpAVEBdwH0AdMCAAEk\r
-        wAAB0wIAAWgBPgGjAeIB/wFZAa8B5gH/AXQBvAHqAf8BbwG5AeoB/wFNAaoB5QH/ATMBngHhAf8B0gIB\r
-        AYLAAAHTAgEBgwFIAagB5AH/AW4BuQHpAf8BnQHPAfEB/wGQAckB7wH/AV8BsgHnAf8BNwGgAeEB/wHT\r
-        AgEBlsAAAdICAAFZAUMBpAHiAf8BYwG0AegB/wGFAcQB7QH/AX0BwAHsAf8BVgGuAeYB/wE2AZ8B4QH/\r
-        AdICAAF1wAAB0wIAAQEBzQEEAQcBvgFMAakB5QH/AVcBrwHmAf8BUwGsAeUB/wFDAaUB4wH/AcIBCwEU\r
-        Ac4B0wIAAQjEAAHTAgABDQHTAgEBmgHAAQ8BFQHQAb8BEQEbAdQB0wIBAaEB0wIAARe4AAFCAU0BPgcA\r
-        AT4DAAEoAwABOAMAAQ4DAAEBAQABAQUAAXAXAAP/AQAB4AcAAcAHAAGABwABgAcAAYAHAAGABwABwAcA\r
-        AcABDAYAAeABHAYAAeABHAYAAeABHAYAAeABHAYAAeABHAYAAfABPAYACw==\r
+        AQ4DAAEBAQABIAUAAUABDB4AAwIBAwMSARkBIgIhATEBLQIsAUQBcAJBAbABgwEoAU8B6QGJAScBTQHo\r
+        AYkBLAFGAeQBjgEtAUMB4gGMASwBSQHjAWYCRAGhsAADDgETAV4CQwGWAYACPAHCAZABNAExAdYBkwEw\r
+        AS8B3AFUASQBlQH7AkcB8QH/AlQB8gH/AicB7wH/AkkB8gH/AlAB8gH/AYwBLAFJAeOsAAMBAQIBbwJC\r
+        Aa0BnQFlATsB/wGbAWABMgH/AZsBXgEuAf8BnAFeAS4B/wFDATsBuwH/AkIB8QH/AtgB/AH/AnEB9QH/\r
+        AtgB/AH/AkkB8gH/AY4BLQFDAeKsAAEiAiEBMQGbAVcBJwH7AZ8BYAEvAf8BogFiATAB/wGkAWMBMQH/\r
+        AagBawE7Af8BRQE/AcIB/wInAe8B/wJhAfQB/wL4Af4B/wJxAfUB/wInAe8B/wGOAS0BQwHirAABOQI2\r
+        AVoBpQFpAT0B/wGfAWABLwH/AaoBZwEzAf8BrQFpATQB/wG6AYgBYAH/AUkBRAHHAf8CSwHyAf8C2wH8\r
+        Af8CYQH0Af8C2AH8Af8CVAHyAf8BjgEtAUMB4qwAARUCFAEcAacBQQEpAfMBqQFmATMB/wGvAWoBNQH/\r
+        AbUBbgE2Af8B0gGzAZsB/wFMAUoBzwH/Aj4B8QH/AksB8gH/AicB7wH/AkIB8QH/AkcB8QH/AY4BLQFD\r
+        AeKwAAFmAkQBoQGtAW0BPAH/AbABawE2Af8BpQFzAUoB/wGaApwB/wFSAVcBqwH/AUABOgG8Af8BRAE7\r
+        AbsB/wFFAT0BvAH/AYMBKQFXAe0BjwExAT8B2gFaAkQBkbAAAwsBDwGDAjwBwwGRAXYBXQH/ATsBhQGv\r
+        Af8BLwGUAdIB/wEtAZQB0wH/AS4BfAGtAf8BcQFjAVsB/gFmAkQBoQMBAQK8AAMKAQ0BgwE+AU0B6gE5\r
+        AaEB4gH/AUIBpgHjAf8BPwGkAeMB/wEvAZwB4AH/AWYBUgFzAfQDGgEkwAABQQI7AWgBPAGjAeIB/wFX\r
+        Aa8B5gH/AXIBvAHqAf8BbQG5AeoB/wFLAaoB5QH/ATEBngHhAf8BUAJCAYLAAAFRAkMBgwFGAagB5AH/\r
+        AWwBuQHpAf8BnQHPAfEB/wGQAckB7wH/AV0BsgHnAf8BNQGgAeEB/wFeAkMBlsAAATgCNQFZAUEBpAHi\r
+        Af8BYQG0AegB/wGFAcQB7QH/AXsBwAHsAf8BVAGuAeYB/wE0AZ8B4QH/AUgCPwF1wwABAQF+Aj8BvgFK\r
+        AakB5QH/AVUBrwHmAf8BUQGsAeUB/wFBAaUB4wH/AYgBOgE9Ac4DBgEIxAADCgENAWECRQGaAYoBOgE8\r
+        AdABjgE4AT4B1AFmAkQBoQMRARe4AAFCAU0BPgcAAT4DAAEoAwABOAMAAQ4DAAEBAQABAQUAAXAXAAP/\r
+        AQAB4AcAAcAHAAGABwABgAcAAYAHAAGABwABwAcAAcABDAYAAeABHAYAAeABHAYAAeABHAYAAeABHAYA\r
+        AeABHAYAAfABPAYACw==\r

 </value>\r
   </data>\r
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
 </value>\r
   </data>\r
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r