Changeset 3069

Timestamp:

03/16/10 17:59:05 (14 years ago)

Author:

gkronber

Message:

Improved dialogs in plugin manager. #891 (Refactor GUI for plugin management)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• Advanced/ConfirmationDialog.Designer.cs (added)
• Advanced/ConfirmationDialog.cs (added)
• Advanced/ConfirmationDialog.resx (added)
• Advanced/ConnectionSetupView.cs (modified) (1 diff)
• Advanced/InstallationManagerControl.cs (modified) (1 diff)
• Advanced/InstallationManagerForm.cs (modified) (1 diff)
• Advanced/LicenseConfirmationBox.Designer.cs (modified) (8 diffs)
• Advanced/RemotePluginInstaller.Designer.cs (modified) (1 diff)
• HeuristicLab.PluginInfrastructure.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/ConnectionSetupView.cs

@@ -47 +47 @@
         form = new Form();
         form.Name = this.Name;
-        form.Size = this.Size;
+        form.ClientSize = Size;
         this.Dock = DockStyle.Fill;
         form.Controls.Add(this);
-      } 
+      }
       form.Show();
     }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerControl.cs

@@ -16 +16 @@
     internal virtual void ShowInForm() {
       Form form = new Form();
-      form.Size = this.Size;
+      form.ClientSize = this.Size;
       form.Text = this.Name;
       this.Dock = DockStyle.Fill;

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.cs

@@ -256 +256 @@
     private bool ConfirmRemoveAction(IEnumerable<IPluginDescription> plugins) {
       StringBuilder strBuilder = new StringBuilder();
-      strBuilder.AppendLine("Delete files:");
       foreach (var plugin in plugins) {
         foreach (var file in plugin.Files) {
-          strBuilder.AppendLine(file.ToString());
+          strBuilder.AppendLine(Path.GetFileName(file.Name));
         }
       }
-      return MessageBox.Show(strBuilder.ToString(), "Confirm Delete", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK;
+      return (new ConfirmationDialog("Confirm Delete", "Do you want to delete following files?", strBuilder.ToString())).ShowDialog() == DialogResult.OK;
     }
 
     private bool ConfirmUpdateAction(IEnumerable<IPluginDescription> plugins) {
       StringBuilder strBuilder = new StringBuilder();
-      strBuilder.AppendLine("Update plugins:");
       foreach (var plugin in plugins) {
         strBuilder.AppendLine(plugin.ToString());
       }
-      return MessageBox.Show(strBuilder.ToString(), "Confirm Update", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK;
+      return (new ConfirmationDialog("Confirm Update", "Do you want to update following plugins?", strBuilder.ToString())).ShowDialog() == DialogResult.OK;
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LicenseConfirmationBox.Designer.cs

@@ -30 +30 @@
       this.label1 = new System.Windows.Forms.Label();
       this.radioButtonGroupBox = new System.Windows.Forms.GroupBox();
+      this.rejectRadioButton = new System.Windows.Forms.RadioButton();
       this.acceptRadioButton = new System.Windows.Forms.RadioButton();
-      this.rejectRadioButton = new System.Windows.Forms.RadioButton();
+      this.panel1 = new System.Windows.Forms.Panel();
       this.radioButtonGroupBox.SuspendLayout();
+      this.panel1.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -40 +42 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.richTextBox.BackColor = System.Drawing.SystemColors.HighlightText;
       this.richTextBox.Location = new System.Drawing.Point(12, 48);
       this.richTextBox.Name = "richTextBox";
       this.richTextBox.ReadOnly = true;
-      this.richTextBox.Size = new System.Drawing.Size(494, 261);
+      this.richTextBox.Size = new System.Drawing.Size(494, 287);
       this.richTextBox.TabIndex = 0;
       this.richTextBox.Text = "";
@@ -51 +54 @@
       this.acceptButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.acceptButton.Enabled = false;
-      this.acceptButton.Location = new System.Drawing.Point(346, 394);
+      this.acceptButton.Location = new System.Drawing.Point(347, 53);
       this.acceptButton.Name = "acceptButton";
       this.acceptButton.Size = new System.Drawing.Size(75, 23);
@@ -62 +65 @@
       // 
       this.rejectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.rejectButton.Location = new System.Drawing.Point(427, 394);
+      this.rejectButton.Location = new System.Drawing.Point(428, 53);
       this.rejectButton.Name = "rejectButton";
       this.rejectButton.Size = new System.Drawing.Size(79, 23);
@@ -94 +97 @@
       this.radioButtonGroupBox.Controls.Add(this.rejectRadioButton);
       this.radioButtonGroupBox.Controls.Add(this.acceptRadioButton);
-      this.radioButtonGroupBox.Location = new System.Drawing.Point(12, 315);
+      this.radioButtonGroupBox.Location = new System.Drawing.Point(13, 5);
       this.radioButtonGroupBox.Name = "radioButtonGroupBox";
       this.radioButtonGroupBox.Size = new System.Drawing.Size(281, 71);
       this.radioButtonGroupBox.TabIndex = 5;
       this.radioButtonGroupBox.TabStop = false;
+      // 
+      // rejectRadioButton
+      // 
+      this.rejectRadioButton.AutoSize = true;
+      this.rejectRadioButton.Location = new System.Drawing.Point(6, 42);
+      this.rejectRadioButton.Name = "rejectRadioButton";
+      this.rejectRadioButton.Size = new System.Drawing.Size(264, 17);
+      this.rejectRadioButton.TabIndex = 1;
+      this.rejectRadioButton.TabStop = true;
+      this.rejectRadioButton.Text = "I do not accept the terms in the license agreement.";
+      this.rejectRadioButton.UseVisualStyleBackColor = true;
+      this.rejectRadioButton.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
       // 
       // acceptRadioButton
@@ -112 +127 @@
       this.acceptRadioButton.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
       // 
-      // rejectRadioButton
+      // panel1
       // 
-      this.rejectRadioButton.AutoSize = true;
-      this.rejectRadioButton.Location = new System.Drawing.Point(6, 42);
-      this.rejectRadioButton.Name = "rejectRadioButton";
-      this.rejectRadioButton.Size = new System.Drawing.Size(264, 17);
-      this.rejectRadioButton.TabIndex = 1;
-      this.rejectRadioButton.TabStop = true;
-      this.rejectRadioButton.Text = "I do not accept the terms in the license agreement.";
-      this.rejectRadioButton.UseVisualStyleBackColor = true;
-      this.rejectRadioButton.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel1.BackColor = System.Drawing.SystemColors.Control;
+      this.panel1.Controls.Add(this.acceptButton);
+      this.panel1.Controls.Add(this.radioButtonGroupBox);
+      this.panel1.Controls.Add(this.rejectButton);
+      this.panel1.Location = new System.Drawing.Point(-1, 341);
+      this.panel1.Name = "panel1";
+      this.panel1.Size = new System.Drawing.Size(520, 88);
+      this.panel1.TabIndex = 6;
       // 
       // LicenseConfirmationBox
@@ -128 +144 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.BackColor = System.Drawing.SystemColors.HighlightText;
       this.ClientSize = new System.Drawing.Size(518, 429);
-      this.Controls.Add(this.radioButtonGroupBox);
+      this.Controls.Add(this.panel1);
       this.Controls.Add(this.label1);
       this.Controls.Add(this.licenseLabel);
-      this.Controls.Add(this.rejectButton);
-      this.Controls.Add(this.acceptButton);
       this.Controls.Add(this.richTextBox);
       this.Name = "LicenseConfirmationBox";
       this.radioButtonGroupBox.ResumeLayout(false);
       this.radioButtonGroupBox.PerformLayout();
+      this.panel1.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -153 +169 @@
     private System.Windows.Forms.RadioButton rejectRadioButton;
     private System.Windows.Forms.RadioButton acceptRadioButton;
+    private System.Windows.Forms.Panel panel1;
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/RemotePluginInstaller.Designer.cs

@@ -72 +72 @@
       // 
       this.nameHeader.Text = "Name";
-      this.nameHeader.Width = 115;
+      this.nameHeader.Width = 185;
       // 
       // versionHeader
       // 
       this.versionHeader.Text = "Version";
-      this.versionHeader.Width = 161;
+      this.versionHeader.Width = 93;
       // 
       // descriptionHeader

trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

@@ -93 +93 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Advanced\ConfirmationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Advanced\ConfirmationDialog.Designer.cs">
+      <DependentUpon>ConfirmationDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Advanced\ConnectionSetupView.cs">
       <SubType>UserControl</SubType>
@@ -259 +265 @@
     <Content Include="Resources\List.gif" />
     <Content Include="Resources\Logo_white.gif" />
+    <EmbeddedResource Include="Advanced\ConfirmationDialog.resx">
+      <DependentUpon>ConfirmationDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Advanced\ConnectionSetupView.resx">
       <DependentUpon>ConnectionSetupView.cs</DependentUpon>