Changeset 3600

Timestamp:

05/03/10 19:15:41 (15 years ago)

Author:

gkronber

Message:

Implemented reviewer comments in plugin infrastructure. #989 (Implement review comments in plugin infrastructure)

Location:

trunk/sources/HeuristicLab.PluginInfrastructure

Files:

• Advanced/InstallationManagerForm.Designer.cs (modified) (5 diffs)
• Advanced/InstallationManagerForm.cs (modified) (3 diffs)
• Advanced/LocalPluginManager.Designer.cs (deleted)
• Advanced/LocalPluginManager.cs (deleted)
• Advanced/LocalPluginManager.resx (deleted)
• Advanced/LocalPluginsView.cs (modified) (1 diff)
• Advanced/PluginEditor.cs (modified) (1 diff)
• Advanced/PluginListView.cs (modified) (1 diff)
• Advanced/PluginView.cs (modified) (1 diff)
• Advanced/RemotePluginInstaller.cs (modified) (1 diff)
• Starter/StarterForm.Designer.cs (modified) (9 diffs)
• Starter/StarterForm.cs (modified) (4 diffs)
• Starter/StarterForm.resx (modified) (1 diff)

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

@@ -63 +63 @@
       this.logTextBox = new System.Windows.Forms.TextBox();
       this.menuStrip = new System.Windows.Forms.MenuStrip();
-      this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.simpleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.connectionSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -119 +116 @@
       this.tabControl.Size = new System.Drawing.Size(598, 392);
       this.tabControl.TabIndex = 16;
-      this.tabControl.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabControl_Selected);
       // 
       // updateAllPluginsTabPage
@@ -272 +268 @@
       // 
       this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.viewToolStripMenuItem,
             this.optionsToolStripMenuItem});
       this.menuStrip.Location = new System.Drawing.Point(0, 0);
@@ -279 +274 @@
       this.menuStrip.TabIndex = 17;
       this.menuStrip.Text = "menuStrip1";
-      // 
-      // viewToolStripMenuItem
-      // 
-      this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.simpleToolStripMenuItem,
-            this.advancedToolStripMenuItem});
-      this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
-      this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
-      this.viewToolStripMenuItem.Text = "View";
-      this.viewToolStripMenuItem.Visible = false;
-      // 
-      // simpleToolStripMenuItem
-      // 
-      this.simpleToolStripMenuItem.Checked = true;
-      this.simpleToolStripMenuItem.CheckOnClick = true;
-      this.simpleToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.simpleToolStripMenuItem.Name = "simpleToolStripMenuItem";
-      this.simpleToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
-      this.simpleToolStripMenuItem.Text = "Show Most Recent Plugins";
-      this.simpleToolStripMenuItem.Click += new System.EventHandler(this.simpleToolStripMenuItem_Click);
-      // 
-      // advancedToolStripMenuItem
-      // 
-      this.advancedToolStripMenuItem.CheckOnClick = true;
-      this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem";
-      this.advancedToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
-      this.advancedToolStripMenuItem.Text = "Show All Plugins";
-      this.advancedToolStripMenuItem.Click += new System.EventHandler(this.advancedToolStripMenuItem_Click);
       // 
       // optionsToolStripMenuItem
@@ -365 +332 @@
     private System.Windows.Forms.TextBox logTextBox;
     private System.Windows.Forms.MenuStrip menuStrip;
-    private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem simpleToolStripMenuItem;
-    private System.Windows.Forms.ToolStripMenuItem advancedToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
     private System.Windows.Forms.ToolStripMenuItem connectionSettingsToolStripMenuItem;

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

@@ -29 +29 @@
 using System.IO;
 using HeuristicLab.PluginInfrastructure.Manager;
+using System.Diagnostics;
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
@@ -38 +39 @@
     public InstallationManagerForm(PluginManager pluginManager) {
       InitializeComponent();
-      Text = "HeuristicLab Plugin Manager " + GetType().Assembly.GetName().Version.ToString();
+      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
+      Text = "HeuristicLab Plugin Manager " + pluginInfrastructureVersion.FileVersion;
       
       this.pluginManager = pluginManager;
@@ -138 +140 @@
       new ConnectionSetupView().ShowDialog();
     }
-
-    private void tabControl_Selected(object sender, TabControlEventArgs e) {
-      viewToolStripMenuItem.Visible = e.TabPage == availablePluginsTabPage;
-      toolStripStatusLabel.Text = string.Empty;
-      toolStripProgressBar.Visible = false;
-    }
-
-    private void simpleToolStripMenuItem_Click(object sender, EventArgs e) {
-      remotePluginInstaller.ShowAllPlugins = false;
-      advancedToolStripMenuItem.Checked = false;
-    }
-
-    private void advancedToolStripMenuItem_Click(object sender, EventArgs e) {
-      remotePluginInstaller.ShowAllPlugins = true;
-      simpleToolStripMenuItem.Checked = false;
-    }
     #endregion
 

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

@@ -156 +156 @@
       removeButton.Enabled = localPluginsListView.CheckedItems.Count > 0;
       updateSelectedButton.Enabled = localPluginsListView.CheckedItems.Count > 0;
+      foreach (ColumnHeader column in localPluginsListView.Columns) {
+        if (localPluginsListView.Items.Count > 0)
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        else column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      }
     }
 

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

@@ -97 +97 @@
         }
         foreach (ColumnHeader column in listView.Columns)
-          column.Width = -1;
+          if (listView.Items.Count > 0)
+            column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+          else column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
         //listView.suppressCheckedEvents = false;
         listView.CheckBoxes = true;

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

@@ -74 +74 @@
         }
         foreach (ColumnHeader column in listView.Columns)
-          column.Width = -1;
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+
         listView.SuppressItemCheckedEvents = false;
       }

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

@@ -89 +89 @@
         filesListView.Items.Add(fileItem);
       }
+      foreach (ColumnHeader column in dependenciesListView.Columns) {
+        if (dependenciesListView.Items.Count > 0)
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        else column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      }
+      foreach (ColumnHeader column in filesListView.Columns) {
+        if (filesListView.Items.Count > 0)
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        else
+          column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      }
       licenseButton.Enabled = !string.IsNullOrEmpty(plugin.LicenseText);
     }

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

@@ -229 +229 @@
         }
       }
+      foreach (ColumnHeader column in remotePluginsListView.Columns)
+        if (remotePluginsListView.Items.Count > 0)
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        else column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+
       remotePluginsListView.SuppressItemCheckedEvents = false;
     }

trunk/sources/HeuristicLab.PluginInfrastructure/Starter/StarterForm.Designer.cs

@@ -47 +47 @@
       this.components = new System.ComponentModel.Container();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StarterForm));
-      System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("Applications", System.Windows.Forms.HorizontalAlignment.Left);
-      System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("Plugin Management", System.Windows.Forms.HorizontalAlignment.Left);
+      System.Windows.Forms.ListViewGroup listViewGroup3 = new System.Windows.Forms.ListViewGroup("Applications", System.Windows.Forms.HorizontalAlignment.Left);
+      System.Windows.Forms.ListViewGroup listViewGroup4 = new System.Windows.Forms.ListViewGroup("Plugin Management", System.Windows.Forms.HorizontalAlignment.Left);
       this.startButton = new System.Windows.Forms.Button();
       this.largeImageList = new System.Windows.Forms.ImageList(this.components);
@@ -57 +57 @@
       this.smallImageList = new System.Windows.Forms.ImageList(this.components);
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.showListButton = new System.Windows.Forms.RadioButton();
+      this.showLargeIconsButton = new System.Windows.Forms.RadioButton();
       this.showDetailsButton = new System.Windows.Forms.RadioButton();
-      this.groupBox = new System.Windows.Forms.GroupBox();
-      this.groupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -67 +65 @@
       this.startButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.startButton.Enabled = false;
-      this.startButton.Location = new System.Drawing.Point(579, 507);
+      this.startButton.Location = new System.Drawing.Point(579, 511);
       this.startButton.Name = "startButton";
       this.startButton.Size = new System.Drawing.Size(75, 23);
@@ -91 +89 @@
             this.versionColumnHeader,
             this.descriptionColumnHeader});
-      listViewGroup1.Header = "Applications";
-      listViewGroup1.Name = "Applications";
-      listViewGroup2.Header = "Plugin Management";
-      listViewGroup2.Name = "Plugin Management";
+      listViewGroup3.Header = "Applications";
+      listViewGroup3.Name = "Applications";
+      listViewGroup4.Header = "Plugin Management";
+      listViewGroup4.Name = "Plugin Management";
       this.applicationsListView.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
-            listViewGroup1,
-            listViewGroup2});
+            listViewGroup3,
+            listViewGroup4});
       this.applicationsListView.LargeImageList = this.largeImageList;
       this.applicationsListView.Location = new System.Drawing.Point(12, 12);
@@ -103 +101 @@
       this.applicationsListView.Name = "applicationsListView";
       this.applicationsListView.ShowItemToolTips = true;
-      this.applicationsListView.Size = new System.Drawing.Size(642, 479);
+      this.applicationsListView.Size = new System.Drawing.Size(642, 493);
       this.applicationsListView.SmallImageList = this.smallImageList;
-      this.applicationsListView.TabIndex = 2;
+      this.applicationsListView.TabIndex = 0;
       this.applicationsListView.UseCompatibleStateImageBehavior = false;
       this.applicationsListView.ItemActivate += new System.EventHandler(this.applicationsListView_ItemActivate);
@@ -130 +128 @@
       this.smallImageList.Images.SetKeyName(0, "HeuristicLab.ico");
       // 
-      // showListButton
+      // showLargeIconsButton
       // 
-      this.showListButton.Appearance = System.Windows.Forms.Appearance.Button;
-      this.showListButton.Image = global::HeuristicLab.PluginInfrastructure.Properties.Resources.show_icons;
-      this.showListButton.Location = new System.Drawing.Point(6, 9);
-      this.showListButton.Name = "showListButton";
-      this.showListButton.Size = new System.Drawing.Size(25, 25);
-      this.showListButton.TabIndex = 3;
-      this.showListButton.TabStop = true;
-      this.toolTip.SetToolTip(this.showListButton, "Show List");
-      this.showListButton.UseVisualStyleBackColor = true;
-      this.showListButton.Click += new System.EventHandler(this.largeIconsButton_Click);
+      this.showLargeIconsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.showLargeIconsButton.Appearance = System.Windows.Forms.Appearance.Button;
+      this.showLargeIconsButton.Checked = true;
+      this.showLargeIconsButton.Image = global::HeuristicLab.PluginInfrastructure.Properties.Resources.show_icons;
+      this.showLargeIconsButton.Location = new System.Drawing.Point(12, 511);
+      this.showLargeIconsButton.Name = "showLargeIconsButton";
+      this.showLargeIconsButton.Size = new System.Drawing.Size(23, 23);
+      this.showLargeIconsButton.TabIndex = 2;
+      this.toolTip.SetToolTip(this.showLargeIconsButton, "Show Large Icons");
+      this.showLargeIconsButton.UseVisualStyleBackColor = false;
+      this.showLargeIconsButton.Click += new System.EventHandler(this.largeIconsButton_Click);
       // 
       // showDetailsButton
       // 
+      this.showDetailsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.showDetailsButton.Appearance = System.Windows.Forms.Appearance.Button;
       this.showDetailsButton.Image = global::HeuristicLab.PluginInfrastructure.Properties.Resources.show_details;
-      this.showDetailsButton.Location = new System.Drawing.Point(37, 9);
+      this.showDetailsButton.Location = new System.Drawing.Point(41, 511);
       this.showDetailsButton.Name = "showDetailsButton";
-      this.showDetailsButton.Size = new System.Drawing.Size(25, 25);
-      this.showDetailsButton.TabIndex = 4;
-      this.showDetailsButton.TabStop = true;
+      this.showDetailsButton.Size = new System.Drawing.Size(23, 23);
+      this.showDetailsButton.TabIndex = 3;
       this.toolTip.SetToolTip(this.showDetailsButton, "Show Details");
-      this.showDetailsButton.UseVisualStyleBackColor = true;
+      this.showDetailsButton.UseVisualStyleBackColor = false;
       this.showDetailsButton.Click += new System.EventHandler(this.detailsButton_Click);
-      // 
-      // groupBox
-      // 
-      this.groupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.groupBox.Controls.Add(this.showListButton);
-      this.groupBox.Controls.Add(this.showDetailsButton);
-      this.groupBox.Location = new System.Drawing.Point(12, 497);
-      this.groupBox.Name = "groupBox";
-      this.groupBox.Size = new System.Drawing.Size(68, 37);
-      this.groupBox.TabIndex = 5;
-      this.groupBox.TabStop = false;
       // 
       // StarterForm
@@ -172 +160 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(666, 546);
-      this.Controls.Add(this.groupBox);
+      this.Controls.Add(this.showDetailsButton);
+      this.Controls.Add(this.showLargeIconsButton);
       this.Controls.Add(this.applicationsListView);
       this.Controls.Add(this.startButton);
@@ -179 +168 @@
       this.Text = "HeuristicLab Starter";
       this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
-      this.groupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -194 +182 @@
     private System.Windows.Forms.ImageList smallImageList;
     private System.Windows.Forms.ToolTip toolTip;
-    private System.Windows.Forms.RadioButton showListButton;
+    private System.Windows.Forms.RadioButton showLargeIconsButton;
     private System.Windows.Forms.RadioButton showDetailsButton;
-    private System.Windows.Forms.GroupBox groupBox;
   }
 }

trunk/sources/HeuristicLab.PluginInfrastructure/Starter/StarterForm.cs

@@ -54 +54 @@
       : base() {
       InitializeComponent();
-      Text = "HeuristicLab " + this.GetType().Assembly.GetName().Version;
+      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
+      Text = "HeuristicLab " + pluginInfrastructureVersion.FileVersion;
 
       string pluginPath = Path.GetFullPath(Application.StartupPath);
@@ -113 +114 @@
     private void UpdateApplicationsList() {
       applicationsListView.Items.Clear();
-
+      FileVersionInfo pluginInfrastructureVersion = FileVersionInfo.GetVersionInfo(GetType().Assembly.Location);
       pluginManagerListViewItem = new ListViewItem("Plugin Manager", 0);
       pluginManagerListViewItem.Group = applicationsListView.Groups["Plugin Management"];
-      pluginManagerListViewItem.SubItems.Add(new ListViewItem.ListViewSubItem(pluginManagerListViewItem, GetType().Assembly.GetName().Version.ToString()));
+      pluginManagerListViewItem.SubItems.Add(new ListViewItem.ListViewSubItem(pluginManagerListViewItem, pluginInfrastructureVersion.FileVersion));
       pluginManagerListViewItem.SubItems.Add(new ListViewItem.ListViewSubItem(pluginManagerListViewItem, "Install, upgrade or delete plugins"));
       pluginManagerListViewItem.ToolTipText = "Install, upgrade or delete plugins";
@@ -130 +131 @@
         item.ToolTipText = info.Description;
         applicationsListView.Items.Add(item);
+      }
+      foreach (ColumnHeader column in applicationsListView.Columns) {
+        if (applicationsListView.Items.Count > 0)
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        else column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
       }
     }
@@ -165 +171 @@
     private void detailsButton_Click(object sender, EventArgs e) {
       applicationsListView.View = View.Details;
+      foreach (ColumnHeader column in applicationsListView.Columns) {
+        if (applicationsListView.Items.Count > 0)
+          column.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        else column.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      }
     }
 

trunk/sources/HeuristicLab.PluginInfrastructure/Starter/StarterForm.resx

@@ -213 +213 @@
 </value>
   </data>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>274, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">