AppliStation,キャッシュフォルダ一旦ひらいて消すのが面倒になったから、キャッシュフォルダをクリーンアップする機能を設定画面に追加

diff --git a/AppliStation/UserPrefForm.Designer.cs b/AppliStation/UserPrefForm.Designer.cs
index 8ccd8e1..68b8162 100644 (file)
--- a/AppliStation/UserPrefForm.Designer.cs
+++ b/AppliStation/UserPrefForm.Designer.cs
@@ -65,6 +65,7 @@
                        this.cacheFolderCustomCheckBox = new System.Windows.Forms.CheckBox();\r
                        this.cacheFolderTextBox = new System.Windows.Forms.TextBox();\r
                        this.cacheFolderBrowseButton = new System.Windows.Forms.Button();\r
                        this.cacheFolderCustomCheckBox = new System.Windows.Forms.CheckBox();\r
                        this.cacheFolderTextBox = new System.Windows.Forms.TextBox();\r
                        this.cacheFolderBrowseButton = new System.Windows.Forms.Button();\r

+                       this.cacheFolderFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();\r

                        this.cacheFolderOpenLinkLabel = new System.Windows.Forms.LinkLabel();\r
                        this.upgradeTabPage = new System.Windows.Forms.TabPage();\r
                        this.upgradeTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\r
                        this.cacheFolderOpenLinkLabel = new System.Windows.Forms.LinkLabel();\r
                        this.upgradeTabPage = new System.Windows.Forms.TabPage();\r
                        this.upgradeTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();\r


@@ -72,6 +73,7 @@
                        this.upgradeExcludeTextBox = new System.Windows.Forms.TextBox();\r
                        this.toolTip = new System.Windows.Forms.ToolTip(this.components);\r
                        this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);\r
                        this.upgradeExcludeTextBox = new System.Windows.Forms.TextBox();\r
                        this.toolTip = new System.Windows.Forms.ToolTip(this.components);\r
                        this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);\r

+                       this.cacheFolderClearLinkLabel = new System.Windows.Forms.LinkLabel();\r

                        upgradeExcludeDescLabel = new System.Windows.Forms.Label();\r
                        this.tableLayoutPanel.SuspendLayout();\r
                        this.buttonsPanel.SuspendLayout();\r
                        upgradeExcludeDescLabel = new System.Windows.Forms.Label();\r
                        this.tableLayoutPanel.SuspendLayout();\r
                        this.buttonsPanel.SuspendLayout();\r


@@ -86,11 +88,22 @@
                        this.installTableLayoutPanel.SuspendLayout();\r
                        this.cacheFolderGroupBox.SuspendLayout();\r
                        this.cacheFolderTableLayoutPanel.SuspendLayout();\r
                        this.installTableLayoutPanel.SuspendLayout();\r
                        this.cacheFolderGroupBox.SuspendLayout();\r
                        this.cacheFolderTableLayoutPanel.SuspendLayout();\r

+                       this.cacheFolderFlowLayoutPanel.SuspendLayout();\r

                        this.upgradeTabPage.SuspendLayout();\r
                        this.upgradeTableLayoutPanel.SuspendLayout();\r
                        ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();\r
                        this.SuspendLayout();\r
                        // \r
                        this.upgradeTabPage.SuspendLayout();\r
                        this.upgradeTableLayoutPanel.SuspendLayout();\r
                        ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();\r
                        this.SuspendLayout();\r
                        // \r

+                       // upgradeExcludeDescLabel\r
+                       // \r
+                       upgradeExcludeDescLabel.AutoSize = true;\r
+                       upgradeExcludeDescLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
+                       upgradeExcludeDescLabel.Location = new System.Drawing.Point(3, 196);\r
+                       upgradeExcludeDescLabel.Name = "upgradeExcludeDescLabel";\r
+                       upgradeExcludeDescLabel.Size = new System.Drawing.Size(434, 12);\r
+                       upgradeExcludeDescLabel.TabIndex = 1;\r
+                       upgradeExcludeDescLabel.Text = "除外するソフト名称を改行で区切って入力します。";\r
+                       // \r

                        // proxyURLLabel\r
                        // \r
                        this.proxyURLLabel.AutoSize = true;\r
                        // proxyURLLabel\r
                        // \r
                        this.proxyURLLabel.AutoSize = true;\r


@@ -175,10 +188,10 @@
                        // reposListTabPage\r
                        // \r
                        this.reposListTabPage.Controls.Add(this.repoTableLayoutPanel);\r
                        // reposListTabPage\r
                        // \r
                        this.reposListTabPage.Controls.Add(this.repoTableLayoutPanel);\r

-                       this.reposListTabPage.Location = new System.Drawing.Point(4, 21);\r
+                       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.Name = "reposListTabPage";\r
                        this.reposListTabPage.Padding = new System.Windows.Forms.Padding(3);\r

-                       this.reposListTabPage.Size = new System.Drawing.Size(446, 215);\r
+                       this.reposListTabPage.Size = new System.Drawing.Size(446, 214);\r

                        this.reposListTabPage.TabIndex = 0;\r
                        this.reposListTabPage.Text = "レポジトリ";\r
                        // \r
                        this.reposListTabPage.TabIndex = 0;\r
                        this.reposListTabPage.Text = "レポジトリ";\r
                        // \r


@@ -200,7 +213,7 @@
                        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.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(440, 209);\r
+                       this.repoTableLayoutPanel.Size = new System.Drawing.Size(440, 208);\r

                        this.repoTableLayoutPanel.TabIndex = 1;\r
                        // \r
                        // repoListCheckedListBox\r
                        this.repoTableLayoutPanel.TabIndex = 1;\r
                        // \r
                        // repoListCheckedListBox\r


@@ -212,7 +225,7 @@
                        this.repoListCheckedListBox.Location = new System.Drawing.Point(3, 15);\r
                        this.repoListCheckedListBox.Name = "repoListCheckedListBox";\r
                        this.repoListCheckedListBox.ScrollAlwaysVisible = true;\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(347, 166);\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
                        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


@@ -276,7 +289,7 @@
                        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.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(122, 187);\r
+                       this.repoUrlTextBox.Location = new System.Drawing.Point(122, 186);\r

                        this.repoUrlTextBox.Name = "repoUrlTextBox";\r
                        this.repoUrlTextBox.Size = new System.Drawing.Size(315, 19);\r
                        this.repoUrlTextBox.TabIndex = 3;\r
                        this.repoUrlTextBox.Name = "repoUrlTextBox";\r
                        this.repoUrlTextBox.Size = new System.Drawing.Size(315, 19);\r
                        this.repoUrlTextBox.TabIndex = 3;\r


@@ -288,7 +301,7 @@
                        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.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, 190);\r
+                       this.repoUrlLabel.Location = new System.Drawing.Point(3, 189);\r

                        this.repoUrlLabel.Name = "repoUrlLabel";\r
                        this.repoUrlLabel.Size = new System.Drawing.Size(113, 12);\r
                        this.repoUrlLabel.TabIndex = 2;\r
                        this.repoUrlLabel.Name = "repoUrlLabel";\r
                        this.repoUrlLabel.Size = new System.Drawing.Size(113, 12);\r
                        this.repoUrlLabel.TabIndex = 2;\r


@@ -308,10 +321,10 @@
                        // networkTabPage\r
                        // \r
                        this.networkTabPage.Controls.Add(this.proxyGroupBox);\r
                        // networkTabPage\r
                        // \r
                        this.networkTabPage.Controls.Add(this.proxyGroupBox);\r

-                       this.networkTabPage.Location = new System.Drawing.Point(4, 21);\r
+                       this.networkTabPage.Location = new System.Drawing.Point(4, 22);\r

                        this.networkTabPage.Name = "networkTabPage";\r
                        this.networkTabPage.Padding = new System.Windows.Forms.Padding(3);\r
                        this.networkTabPage.Name = "networkTabPage";\r
                        this.networkTabPage.Padding = new System.Windows.Forms.Padding(3);\r

-                       this.networkTabPage.Size = new System.Drawing.Size(446, 215);\r
+                       this.networkTabPage.Size = new System.Drawing.Size(446, 214);\r

                        this.networkTabPage.TabIndex = 1;\r
                        this.networkTabPage.Text = "接続";\r
                        // \r
                        this.networkTabPage.TabIndex = 1;\r
                        this.networkTabPage.Text = "接続";\r
                        // \r


@@ -321,7 +334,7 @@
                        this.proxyGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.proxyGroupBox.Location = new System.Drawing.Point(3, 3);\r
                        this.proxyGroupBox.Name = "proxyGroupBox";\r
                        this.proxyGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.proxyGroupBox.Location = new System.Drawing.Point(3, 3);\r
                        this.proxyGroupBox.Name = "proxyGroupBox";\r

-                       this.proxyGroupBox.Size = new System.Drawing.Size(440, 209);\r
+                       this.proxyGroupBox.Size = new System.Drawing.Size(440, 208);\r

                        this.proxyGroupBox.TabIndex = 1;\r
                        this.proxyGroupBox.TabStop = false;\r
                        this.proxyGroupBox.Text = "プロキシサーバー";\r
                        this.proxyGroupBox.TabIndex = 1;\r
                        this.proxyGroupBox.TabStop = false;\r
                        this.proxyGroupBox.Text = "プロキシサーバー";\r


@@ -350,7 +363,7 @@
                        this.proxyTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.proxyTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.proxyTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.proxyTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.proxyTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.proxyTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r

-                       this.proxyTableLayoutPanel.Size = new System.Drawing.Size(434, 191);\r
+                       this.proxyTableLayoutPanel.Size = new System.Drawing.Size(434, 190);\r

                        this.proxyTableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // proxySameAsIERadioButton\r
                        this.proxyTableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // proxySameAsIERadioButton\r


@@ -436,10 +449,10 @@
                        // installTabPage\r
                        // \r
                        this.installTabPage.Controls.Add(this.installTableLayoutPanel);\r
                        // installTabPage\r
                        // \r
                        this.installTabPage.Controls.Add(this.installTableLayoutPanel);\r

-                       this.installTabPage.Location = new System.Drawing.Point(4, 21);\r
+                       this.installTabPage.Location = new System.Drawing.Point(4, 22);\r

                        this.installTabPage.Name = "installTabPage";\r
                        this.installTabPage.Padding = new System.Windows.Forms.Padding(3);\r
                        this.installTabPage.Name = "installTabPage";\r
                        this.installTabPage.Padding = new System.Windows.Forms.Padding(3);\r

-                       this.installTabPage.Size = new System.Drawing.Size(446, 215);\r
+                       this.installTabPage.Size = new System.Drawing.Size(446, 214);\r

                        this.installTabPage.TabIndex = 2;\r
                        this.installTabPage.Text = "インストール";\r
                        // \r
                        this.installTabPage.TabIndex = 2;\r
                        this.installTabPage.Text = "インストール";\r
                        // \r


@@ -458,7 +471,7 @@
                        this.installTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.installTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.installTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.installTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.installTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.installTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r

-                       this.installTableLayoutPanel.Size = new System.Drawing.Size(440, 209);\r
+                       this.installTableLayoutPanel.Size = new System.Drawing.Size(440, 208);\r

                        this.installTableLayoutPanel.TabIndex = 1;\r
                        // \r
                        // installScanInstallerFileCheckbox\r
                        this.installTableLayoutPanel.TabIndex = 1;\r
                        // \r
                        // installScanInstallerFileCheckbox\r


@@ -490,7 +503,7 @@
                        this.cacheFolderGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.cacheFolderGroupBox.Location = new System.Drawing.Point(3, 47);\r
                        this.cacheFolderGroupBox.Name = "cacheFolderGroupBox";\r
                        this.cacheFolderGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.cacheFolderGroupBox.Location = new System.Drawing.Point(3, 47);\r
                        this.cacheFolderGroupBox.Name = "cacheFolderGroupBox";\r

-                       this.cacheFolderGroupBox.Size = new System.Drawing.Size(434, 81);\r
+                       this.cacheFolderGroupBox.Size = new System.Drawing.Size(434, 89);\r

                        this.cacheFolderGroupBox.TabIndex = 2;\r
                        this.cacheFolderGroupBox.TabStop = false;\r
                        this.cacheFolderGroupBox.Text = "キャッシュフォルダー";\r
                        this.cacheFolderGroupBox.TabIndex = 2;\r
                        this.cacheFolderGroupBox.TabStop = false;\r
                        this.cacheFolderGroupBox.Text = "キャッシュフォルダー";\r


@@ -505,7 +518,7 @@
                        this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderCustomCheckBox, 0, 0);\r
                        this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderTextBox, 1, 1);\r
                        this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderBrowseButton, 2, 1);\r
                        this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderCustomCheckBox, 0, 0);\r
                        this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderTextBox, 1, 1);\r
                        this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderBrowseButton, 2, 1);\r

-                       this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderOpenLinkLabel, 0, 2);\r
+                       this.cacheFolderTableLayoutPanel.Controls.Add(this.cacheFolderFlowLayoutPanel, 0, 3);\r

                        this.cacheFolderTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.cacheFolderTableLayoutPanel.Location = new System.Drawing.Point(3, 15);\r
                        this.cacheFolderTableLayoutPanel.Name = "cacheFolderTableLayoutPanel";\r
                        this.cacheFolderTableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
                        this.cacheFolderTableLayoutPanel.Location = new System.Drawing.Point(3, 15);\r
                        this.cacheFolderTableLayoutPanel.Name = "cacheFolderTableLayoutPanel";\r


@@ -513,7 +526,8 @@
                        this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r

-                       this.cacheFolderTableLayoutPanel.Size = new System.Drawing.Size(428, 63);\r
+                       this.cacheFolderTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));\r
+                       this.cacheFolderTableLayoutPanel.Size = new System.Drawing.Size(428, 71);\r

                        this.cacheFolderTableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // cacheFolderCustomCheckBox\r
                        this.cacheFolderTableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // cacheFolderCustomCheckBox\r


@@ -551,27 +565,37 @@
                        this.cacheFolderBrowseButton.Text = "参照(&B)...";\r
                        this.cacheFolderBrowseButton.Click += new System.EventHandler(this.CacheFolderBrowseButtonClick);\r
                        // \r
                        this.cacheFolderBrowseButton.Text = "参照(&B)...";\r
                        this.cacheFolderBrowseButton.Click += new System.EventHandler(this.CacheFolderBrowseButtonClick);\r
                        // \r

+                       // cacheFolderFlowLayoutPanel\r
+                       // \r
+                       this.cacheFolderTableLayoutPanel.SetColumnSpan(this.cacheFolderFlowLayoutPanel, 3);\r
+                       this.cacheFolderFlowLayoutPanel.Controls.Add(this.cacheFolderOpenLinkLabel);\r
+                       this.cacheFolderFlowLayoutPanel.Controls.Add(this.cacheFolderClearLinkLabel);\r
+                       this.cacheFolderFlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
+                       this.cacheFolderFlowLayoutPanel.Location = new System.Drawing.Point(3, 54);\r
+                       this.cacheFolderFlowLayoutPanel.Name = "cacheFolderFlowLayoutPanel";\r
+                       this.cacheFolderFlowLayoutPanel.Size = new System.Drawing.Size(422, 14);\r
+                       this.cacheFolderFlowLayoutPanel.TabIndex = 3;\r
+                       // \r

                        // cacheFolderOpenLinkLabel\r
                        // \r
                        this.cacheFolderOpenLinkLabel.AutoSize = true;\r
                        // cacheFolderOpenLinkLabel\r
                        // \r
                        this.cacheFolderOpenLinkLabel.AutoSize = true;\r

-                       this.cacheFolderTableLayoutPanel.SetColumnSpan(this.cacheFolderOpenLinkLabel, 3);\r

                        this.cacheFolderOpenLinkLabel.LinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.cacheFolderOpenLinkLabel.LinkColor = System.Drawing.SystemColors.HotTrack;\r

-                       this.cacheFolderOpenLinkLabel.Location = new System.Drawing.Point(3, 51);\r
+                       this.cacheFolderOpenLinkLabel.Location = new System.Drawing.Point(3, 0);\r

                        this.cacheFolderOpenLinkLabel.Name = "cacheFolderOpenLinkLabel";\r
                        this.cacheFolderOpenLinkLabel.Name = "cacheFolderOpenLinkLabel";\r

-                       this.cacheFolderOpenLinkLabel.Size = new System.Drawing.Size(120, 12);\r
-                       this.cacheFolderOpenLinkLabel.TabIndex = 3;\r
+                       this.cacheFolderOpenLinkLabel.Size = new System.Drawing.Size(136, 12);\r
+                       this.cacheFolderOpenLinkLabel.TabIndex = 0;\r

                        this.cacheFolderOpenLinkLabel.TabStop = true;\r
                        this.cacheFolderOpenLinkLabel.TabStop = true;\r

-                       this.cacheFolderOpenLinkLabel.Text = "キャッシュフォルダーを開く";\r
+                       this.cacheFolderOpenLinkLabel.Text = "キャッシュフォルダーを開く(&O)";\r

                        this.cacheFolderOpenLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.cacheFolderOpenLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CacheFolderOpenLinkLabelLinkClicked);\r
                        // \r
                        // upgradeTabPage\r
                        // \r
                        this.upgradeTabPage.Controls.Add(this.upgradeTableLayoutPanel);\r
                        this.cacheFolderOpenLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
                        this.cacheFolderOpenLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CacheFolderOpenLinkLabelLinkClicked);\r
                        // \r
                        // upgradeTabPage\r
                        // \r
                        this.upgradeTabPage.Controls.Add(this.upgradeTableLayoutPanel);\r

-                       this.upgradeTabPage.Location = new System.Drawing.Point(4, 21);\r
+                       this.upgradeTabPage.Location = new System.Drawing.Point(4, 22);\r

                        this.upgradeTabPage.Name = "upgradeTabPage";\r
                        this.upgradeTabPage.Padding = new System.Windows.Forms.Padding(3);\r
                        this.upgradeTabPage.Name = "upgradeTabPage";\r
                        this.upgradeTabPage.Padding = new System.Windows.Forms.Padding(3);\r

-                       this.upgradeTabPage.Size = new System.Drawing.Size(446, 215);\r
+                       this.upgradeTabPage.Size = new System.Drawing.Size(446, 214);\r

                        this.upgradeTabPage.TabIndex = 3;\r
                        this.upgradeTabPage.Text = "ソフト更新";\r
                        // \r
                        this.upgradeTabPage.TabIndex = 3;\r
                        this.upgradeTabPage.Text = "ソフト更新";\r
                        // \r


@@ -589,7 +613,7 @@
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
                        this.upgradeTableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r

-                       this.upgradeTableLayoutPanel.Size = new System.Drawing.Size(440, 209);\r
+                       this.upgradeTableLayoutPanel.Size = new System.Drawing.Size(440, 208);\r

                        this.upgradeTableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // upgradeExcludeLabel\r
                        this.upgradeTableLayoutPanel.TabIndex = 0;\r
                        // \r
                        // upgradeExcludeLabel\r


@@ -610,25 +634,28 @@
                        this.upgradeExcludeTextBox.Multiline = true;\r
                        this.upgradeExcludeTextBox.Name = "upgradeExcludeTextBox";\r
                        this.upgradeExcludeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;\r
                        this.upgradeExcludeTextBox.Multiline = true;\r
                        this.upgradeExcludeTextBox.Name = "upgradeExcludeTextBox";\r
                        this.upgradeExcludeTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;\r

-                       this.upgradeExcludeTextBox.Size = new System.Drawing.Size(434, 179);\r
+                       this.upgradeExcludeTextBox.Size = new System.Drawing.Size(434, 178);\r

                        this.upgradeExcludeTextBox.TabIndex = 0;\r
                        this.upgradeExcludeTextBox.WordWrap = false;\r
                        // \r
                        this.upgradeExcludeTextBox.TabIndex = 0;\r
                        this.upgradeExcludeTextBox.WordWrap = false;\r
                        // \r

-                       // upgradeExcludeDescLabel\r
-                       // \r
-                       upgradeExcludeDescLabel.AutoSize = true;\r
-                       upgradeExcludeDescLabel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-                       upgradeExcludeDescLabel.Location = new System.Drawing.Point(3, 197);\r
-                       upgradeExcludeDescLabel.Name = "upgradeExcludeDescLabel";\r
-                       upgradeExcludeDescLabel.Size = new System.Drawing.Size(434, 12);\r
-                       upgradeExcludeDescLabel.TabIndex = 1;\r
-                       upgradeExcludeDescLabel.Text = "除外するソフト名称を改行で区切って入力します。";\r
-                       // \r

                        // errorProvider\r
                        // \r
                        this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.AlwaysBlink;\r
                        this.errorProvider.ContainerControl = this;\r
                        // \r
                        // errorProvider\r
                        // \r
                        this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.AlwaysBlink;\r
                        this.errorProvider.ContainerControl = this;\r
                        // \r

+                       // cacheFolderClearLinkLabel\r
+                       // \r
+                       this.cacheFolderClearLinkLabel.AutoSize = true;\r
+                       this.cacheFolderClearLinkLabel.LinkColor = System.Drawing.SystemColors.HotTrack;\r
+                       this.cacheFolderClearLinkLabel.Location = new System.Drawing.Point(145, 0);\r
+                       this.cacheFolderClearLinkLabel.Name = "cacheFolderClearLinkLabel";\r
+                       this.cacheFolderClearLinkLabel.Size = new System.Drawing.Size(180, 12);\r
+                       this.cacheFolderClearLinkLabel.TabIndex = 1;\r
+                       this.cacheFolderClearLinkLabel.TabStop = true;\r
+                       this.cacheFolderClearLinkLabel.Text = "キャッシュフォルダーをクリーンアップする";\r
+                       this.cacheFolderClearLinkLabel.VisitedLinkColor = System.Drawing.SystemColors.HotTrack;\r
+                       this.cacheFolderClearLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.CacheFolderClearLinkLabelLinkClicked);\r
+                       // \r

                        // UserPrefForm\r
                        // \r
                        this.AcceptButton = this.okButton;\r
                        // UserPrefForm\r
                        // \r
                        this.AcceptButton = this.okButton;\r


@@ -664,17 +691,21 @@
                        this.cacheFolderGroupBox.PerformLayout();\r
                        this.cacheFolderTableLayoutPanel.ResumeLayout(false);\r
                        this.cacheFolderTableLayoutPanel.PerformLayout();\r
                        this.cacheFolderGroupBox.PerformLayout();\r
                        this.cacheFolderTableLayoutPanel.ResumeLayout(false);\r
                        this.cacheFolderTableLayoutPanel.PerformLayout();\r

+                       this.cacheFolderFlowLayoutPanel.ResumeLayout(false);\r
+                       this.cacheFolderFlowLayoutPanel.PerformLayout();\r

                        this.upgradeTabPage.ResumeLayout(false);\r
                        this.upgradeTableLayoutPanel.ResumeLayout(false);\r
                        this.upgradeTableLayoutPanel.PerformLayout();\r
                        ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();\r
                        this.ResumeLayout(false);\r
                }\r
                        this.upgradeTabPage.ResumeLayout(false);\r
                        this.upgradeTableLayoutPanel.ResumeLayout(false);\r
                        this.upgradeTableLayoutPanel.PerformLayout();\r
                        ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();\r
                        this.ResumeLayout(false);\r
                }\r

+               private System.Windows.Forms.LinkLabel cacheFolderClearLinkLabel;\r
+               private System.Windows.Forms.LinkLabel cacheFolderOpenLinkLabel;\r
+               private System.Windows.Forms.FlowLayoutPanel cacheFolderFlowLayoutPanel;\r

                private System.Windows.Forms.Label upgradeExcludeLabel;\r
                private System.Windows.Forms.TextBox upgradeExcludeTextBox;\r
                private System.Windows.Forms.TableLayoutPanel upgradeTableLayoutPanel;\r
                private System.Windows.Forms.TabPage upgradeTabPage;\r
                private System.Windows.Forms.Label upgradeExcludeLabel;\r
                private System.Windows.Forms.TextBox upgradeExcludeTextBox;\r
                private System.Windows.Forms.TableLayoutPanel upgradeTableLayoutPanel;\r
                private System.Windows.Forms.TabPage upgradeTabPage;\r

-               private System.Windows.Forms.LinkLabel cacheFolderOpenLinkLabel;\r

                private System.Windows.Forms.Button cacheFolderBrowseButton;\r
                private System.Windows.Forms.TextBox cacheFolderTextBox;\r
                private System.Windows.Forms.CheckBox cacheFolderCustomCheckBox;\r
                private System.Windows.Forms.Button cacheFolderBrowseButton;\r
                private System.Windows.Forms.TextBox cacheFolderTextBox;\r
                private System.Windows.Forms.CheckBox cacheFolderCustomCheckBox;\r

diff --git a/AppliStation/UserPrefForm.cs b/AppliStation/UserPrefForm.cs
index 3f6ff2b..712222e 100644 (file)
--- a/AppliStation/UserPrefForm.cs
+++ b/AppliStation/UserPrefForm.cs
@@ -477,5 +477,33 @@ namespace AppliStation
                                MessageBox.Show(string.Format("フォルダーパス\"{0}\"は存在しませんでした。", folderPath), "キャッシュフォルダー", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                        }\r
                }\r
                                MessageBox.Show(string.Format("フォルダーパス\"{0}\"は存在しませんでした。", folderPath), "キャッシュフォルダー", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                        }\r
                }\r

+               \r
+               void CacheFolderClearLinkLabelLinkClicked(object sender, LinkLabelLinkClickedEventArgs e)\r
+               {\r
+                       string folderPath;\r
+                       \r
+                       if (cacheFolderCustomCheckBox.Checked) {\r
+                               folderPath = cacheFolderTextBox.Text;\r
+                       } else {\r
+                               // デフォルトは AppDataFolderPath/Cache。\r
+                               folderPath = System.IO.Path.Combine(NaGet.Env.AppDataFolderPath, "Cache");\r
+                       }\r
+                       \r
+                       if (System.IO.Directory.Exists(folderPath)) {\r
+                               DialogResult result = MessageBox.Show(string.Format("フォルダーパス\"{0}\"のファイルを削除して構いませんか?", folderPath), "キャッシュフォルダー", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);\r
+                               if (result == DialogResult.OK) {\r
+                                       foreach (string targetDir in System.IO.Directory.GetDirectories(folderPath)) {\r
+                                               try {\r
+                                                       NaGet.Utils.SetAttributeRecursive(targetDir, System.IO.FileAttributes.Normal);\r
+                                                       System.IO.Directory.Delete(targetDir, true);\r
+                                               } catch {\r
+                                                       // 何もせずに静かに先に進む\r
+                                               }\r
+                                       }\r
+                               }\r
+                       } else {\r
+                               MessageBox.Show(string.Format("フォルダーパス\"{0}\"は存在しませんでした。", folderPath), "キャッシュフォルダー", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                       }\r
+               }\r

        }\r
 }\r
        }\r
 }\r

diff --git a/AppliStation/UserPrefForm.resx b/AppliStation/UserPrefForm.resx
index d8a1879..2f7b5a5 100644 (file)
--- a/AppliStation/UserPrefForm.resx
+++ b/AppliStation/UserPrefForm.resx
@@ -117,12 +117,12 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r

-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>17, 17</value>\r
-  </metadata>\r

   <metadata name="upgradeExcludeDescLabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>False</value>\r
   </metadata>\r
   <metadata name="upgradeExcludeDescLabel.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>False</value>\r
   </metadata>\r

+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 17</value>\r
+  </metadata>\r

   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>104, 17</value>\r
   </metadata>\r
   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>104, 17</value>\r
   </metadata>\r