Changeset 3009

Timestamp:

03/12/10 09:52:05 (15 years ago)

Author:

gkronber

Message:

improved license dialog. #891 (Refactor GUI for plugin management)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced

Files:

• LicenseConfirmationBox.Designer.cs (modified) (8 diffs)
• LicenseConfirmationBox.cs (modified) (2 diffs)

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

@@ -28 +28 @@
       this.rejectButton = new System.Windows.Forms.Button();
       this.licenseLabel = new System.Windows.Forms.Label();
+      this.label1 = new System.Windows.Forms.Label();
+      this.radioButtonGroupBox = new System.Windows.Forms.GroupBox();
+      this.acceptRadioButton = new System.Windows.Forms.RadioButton();
+      this.rejectRadioButton = new System.Windows.Forms.RadioButton();
+      this.radioButtonGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -35 +40 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.richTextBox.Location = new System.Drawing.Point(12, 37);
+      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, 351);
+      this.richTextBox.Size = new System.Drawing.Size(494, 261);
       this.richTextBox.TabIndex = 0;
       this.richTextBox.Text = "";
@@ -45 +50 @@
       // 
       this.acceptButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.acceptButton.Location = new System.Drawing.Point(298, 394);
+      this.acceptButton.Enabled = false;
+      this.acceptButton.Location = new System.Drawing.Point(346, 394);
       this.acceptButton.Name = "acceptButton";
       this.acceptButton.Size = new System.Drawing.Size(75, 23);
       this.acceptButton.TabIndex = 1;
-      this.acceptButton.Text = "I Accept ";
+      this.acceptButton.Text = "Next >";
       this.acceptButton.UseVisualStyleBackColor = true;
       this.acceptButton.Click += new System.EventHandler(this.acceptButton_Click);
@@ -56 +62 @@
       // 
       this.rejectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.rejectButton.Location = new System.Drawing.Point(379, 394);
+      this.rejectButton.Location = new System.Drawing.Point(427, 394);
       this.rejectButton.Name = "rejectButton";
-      this.rejectButton.Size = new System.Drawing.Size(127, 23);
+      this.rejectButton.Size = new System.Drawing.Size(79, 23);
       this.rejectButton.TabIndex = 2;
-      this.rejectButton.Text = "Cancel Installation";
+      this.rejectButton.Text = "Cancel";
       this.rejectButton.UseVisualStyleBackColor = true;
       this.rejectButton.Click += new System.EventHandler(this.rejectButton_Click);
@@ -67 +73 @@
       // 
       this.licenseLabel.AutoSize = true;
-      this.licenseLabel.Location = new System.Drawing.Point(13, 13);
+      this.licenseLabel.Location = new System.Drawing.Point(12, 32);
       this.licenseLabel.Name = "licenseLabel";
-      this.licenseLabel.Size = new System.Drawing.Size(177, 13);
+      this.licenseLabel.Size = new System.Drawing.Size(241, 13);
       this.licenseLabel.TabIndex = 3;
-      this.licenseLabel.Text = "Please confirm license agreement of";
+      this.licenseLabel.Text = "Please read following license agreement carefully.";
+      // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+      this.label1.Location = new System.Drawing.Point(12, 9);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(115, 13);
+      this.label1.TabIndex = 4;
+      this.label1.Text = "License Agreement";
+      // 
+      // radioButtonGroupBox
+      // 
+      this.radioButtonGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.radioButtonGroupBox.Controls.Add(this.rejectRadioButton);
+      this.radioButtonGroupBox.Controls.Add(this.acceptRadioButton);
+      this.radioButtonGroupBox.Location = new System.Drawing.Point(12, 315);
+      this.radioButtonGroupBox.Name = "radioButtonGroupBox";
+      this.radioButtonGroupBox.Size = new System.Drawing.Size(281, 71);
+      this.radioButtonGroupBox.TabIndex = 5;
+      this.radioButtonGroupBox.TabStop = false;
+      // 
+      // acceptRadioButton
+      // 
+      this.acceptRadioButton.AutoSize = true;
+      this.acceptRadioButton.Location = new System.Drawing.Point(6, 19);
+      this.acceptRadioButton.Name = "acceptRadioButton";
+      this.acceptRadioButton.Size = new System.Drawing.Size(231, 17);
+      this.acceptRadioButton.TabIndex = 0;
+      this.acceptRadioButton.TabStop = true;
+      this.acceptRadioButton.Text = "I accept the terms in the license agreement.";
+      this.acceptRadioButton.UseVisualStyleBackColor = true;
+      this.acceptRadioButton.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
+      // 
+      // 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);
       // 
       // LicenseConfirmationBox
@@ -78 +129 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(518, 429);
+      this.Controls.Add(this.radioButtonGroupBox);
+      this.Controls.Add(this.label1);
       this.Controls.Add(this.licenseLabel);
       this.Controls.Add(this.rejectButton);
@@ -83 +136 @@
       this.Controls.Add(this.richTextBox);
       this.Name = "LicenseConfirmationBox";
-      this.Text = "License Agreement";
+      this.radioButtonGroupBox.ResumeLayout(false);
+      this.radioButtonGroupBox.PerformLayout();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -95 +149 @@
     private System.Windows.Forms.Button rejectButton;
     private System.Windows.Forms.Label licenseLabel;
+    private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.GroupBox radioButtonGroupBox;
+    private System.Windows.Forms.RadioButton rejectRadioButton;
+    private System.Windows.Forms.RadioButton acceptRadioButton;
   }
 }

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

@@ -17 +17 @@
       InitializeComponent();
       richTextBox.Text = plugin.LicenseText;
-      licenseLabel.Text = plugin.ToString() + " " + licenseLabel.Text;
+      this.Text = plugin.ToString();
       this.DialogResult = DialogResult.Cancel;
     }
@@ -30 +30 @@
       this.Close();
     }
+
+    private void radioButton1_CheckedChanged(object sender, EventArgs e) {
+      acceptButton.Enabled = acceptRadioButton.Checked;
+    }
   }
 }