Ticket #887: UI_Lag.patch

HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -64 +64 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
       Caption = "Item Collection";
-      while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
-      itemsListView.Enabled = false;
-      detailsGroupBox.Enabled = false;
+      RemoveAllListViewItems();
+
       viewHost.Content = null;
-      addButton.Enabled = false;
-      sortAscendingButton.Enabled = false;
-      sortDescendingButton.Enabled = false;
+      
+      /*
+       * Where should the following code go? Here: Then it should be removed in RemoveAllListViewItems
+       * or in RemoveAllListViewItems in which case it should not be repeated here.
+       * Currently the code is in RemoveAllListViewItems
+       */
+      /*sortAscendingButton.Enabled = false;
+      sortDescendingButton.Enabled = false;*/
+
       removeButton.Enabled = false;
 
       if (Content != null) {
@@ -82 +87 @@
         sortAscendingButton.Enabled = itemsListView.Items.Count > 0;
         sortDescendingButton.Enabled = itemsListView.Items.Count > 0;
         SortItemsListView(SortOrder.Ascending);
+      } else {
+        itemsListView.Enabled = false;
+        addButton.Enabled = false;
       }
     }
 
@@ -116 +124 @@
       sortAscendingButton.Enabled = itemsListView.Items.Count > 0;
       sortDescendingButton.Enabled = itemsListView.Items.Count > 0;
     }
+    protected virtual void RemoveAllListViewItems() {
+      while (itemsListView.Items.Count > 0) {
+        ListViewItem listViewItem = itemsListView.Items[0];
+        ((T)listViewItem.Tag).Changed -= new ChangedEventHandler(Item_Changed);
+        listViewItem.Remove();
+      }
+      sortAscendingButton.Enabled = false;
+      sortDescendingButton.Enabled = false;
+    }
     protected virtual void UpdateListViewItem(ListViewItem listViewItem) {
       if (!listViewItem.Text.Equals(listViewItem.Tag.ToString())) {
         listViewItem.Text = listViewItem.Tag.ToString();
@@ -130 +147 @@
     }
 
     #region ListView Events
-    protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
+    private void itemsListView_MouseUp(object sender, MouseEventArgs e) {
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly;
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
         viewHost.Content = item;
-        detailsGroupBox.Enabled = true;
       } else {
         viewHost.Content = null;
-        detailsGroupBox.Enabled = false;
       }
     }
+
+    private void itemsListView_KeyUp(object sender, KeyEventArgs e) {
+      if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down
+        || e.KeyCode == Keys.PageUp || e.KeyCode == Keys.PageDown
+        || e.KeyCode == Keys.Home || e.KeyCode == Keys.End) {
+        removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly;
+        if (itemsListView.SelectedItems.Count == 1) {
+          T item = (T)itemsListView.SelectedItems[0].Tag;
+          viewHost.Content = item;
+        } else {
+          viewHost.Content = null;
+        }
+      }
+    }
     protected virtual void itemsListView_SizeChanged(object sender, EventArgs e) {
       if (itemsListView.Columns.Count > 0)
         itemsListView.Columns[0].Width = Math.Max(0, itemsListView.Width - 25);
@@ -269 +298 @@
       itemsListView.Sort();
       itemsListView.Sorting = SortOrder.None;
     }
-    #endregion
+    #endregion    
+
   }
 }

HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs

@@ -111 +111 @@
       this.itemsListView.TabIndex = 4;
       this.itemsListView.UseCompatibleStateImageBehavior = false;
       this.itemsListView.View = System.Windows.Forms.View.Details;
-      this.itemsListView.SelectedIndexChanged += new System.EventHandler(this.itemsListView_SelectedIndexChanged);
       this.itemsListView.SizeChanged += new System.EventHandler(this.itemsListView_SizeChanged);
       this.itemsListView.DoubleClick += new System.EventHandler(this.itemsListView_DoubleClick);
+      this.itemsListView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.itemsListView_MouseUp);
       this.itemsListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.itemsListView_DragDrop);
       this.itemsListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.itemsListView_DragEnterOver);
+      this.itemsListView.KeyUp += new System.Windows.Forms.KeyEventHandler(this.itemsListView_KeyUp);
       this.itemsListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.itemsListView_KeyDown);
       this.itemsListView.ItemDrag += new System.Windows.Forms.ItemDragEventHandler(this.itemsListView_ItemDrag);
       this.itemsListView.DragOver += new System.Windows.Forms.DragEventHandler(this.itemsListView_DragEnterOver);

HeuristicLab.Core.Views/3.3/NamedItemView.cs

@@ -63 +63 @@
       if (Content == null) {
         Caption = "NamedItem";
         nameTextBox.Text = "-";
-        nameTextBox.ReadOnly = false;
         nameTextBox.Enabled = false;
         descriptionTextBox.Text = "";
-        nameTextBox.ReadOnly = false;
         descriptionTextBox.Enabled = false;
       } else {
         Caption = Content.Name + " (" + Content.GetType().Name + ")";

HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.cs

@@ -52 +52 @@
       base.OnContentChanged();
       if (Content == null) {
         parameterCollectionView.Content = null;
-        parameterCollectionView.Enabled = false;
       } else {
         parameterCollectionView.Content = Content.Parameters;
-        parameterCollectionView.Enabled = true;
       }
     }
   }

HeuristicLab.Core.Views/3.3/ViewHost.cs

@@ -32 +32 @@
     public Type ViewType {
       get { return this.viewType; }
       set {
-        if (value != null && !ViewCanShowContent(value, content))
-          throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                    value.GetPrettyName(),
-                                                    content.GetType().GetPrettyName()));
-        viewType = value;
-        UpdateView();
+        if (viewType != value) {
+          viewType = value;
+          UpdateView();
+        }
       }
     }
 
@@ -61 +59 @@
     }
 
     private void Initialize() {
-      viewsLabel.Enabled = false;
-      viewsLabel.Visible = false;
-      viewContextMenuStrip.Enabled = false;
-      messageLabel.Visible = false;
-
-      if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
-      viewPanel.Controls.Clear();
-      viewPanel.Enabled = false;
-      viewPanel.Visible = false;
-
-      if (Content != null) {
-        if (viewContextMenuStrip.Items.Count == 0) {
-          messageLabel.Visible = true;
-        } else {
-          viewsLabel.Enabled = true;
-          viewsLabel.Visible = true;
-          viewContextMenuStrip.Enabled = true;
-          messageLabel.Visible = false;
-        }
-
-        if (!ViewCanShowContent(viewType, Content)) {
-          viewType = MainFormManager.GetDefaultViewType(Content.GetType());
-          if ((viewType == null) && (viewContextMenuStrip.Items.Count > 0))  // create first available view if default view is not available
-            viewType = (Type)viewContextMenuStrip.Items[0].Tag;
-        }
-        UpdateView();
+      if (!ViewCanShowContent(viewType, Content)) {
+        viewType = MainFormManager.GetDefaultViewType(Content.GetType());
+        if ((viewType == null) && (viewContextMenuStrip.Items.Count > 0))  // create first available view if default view is not available
+          viewType = (Type)viewContextMenuStrip.Items[0].Tag;
       }
+      UpdateView();
     }
 
     private void UpdateView() {
-      if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
-      viewPanel.Controls.Clear();
+      if (viewPanel.Controls.Count > 0) {
+        Control tmp = viewPanel.Controls[0];
+        viewPanel.Controls.Remove(tmp);
+        tmp.Dispose();
+      }
 
-      if (viewType == null || content == null)
+      if (viewType == null || content == null) {
+        if (viewsLabel.Visible) viewsLabel.Visible = false;
+        if (viewContextMenuStrip.Enabled) viewContextMenuStrip.Enabled = false;
         return;
+      }
 
-      if (!ViewCanShowContent(viewType, content))
+      // FIXME: It's not a good idea to throw an exception here.
+      // Such a case should be prevented to occur in those classes that use ViewHost.
+      // Also ArgumentException seems to be the wrong type of exception to throw (the method doesn't have any arguments).
+      // From MSDN documentation on ArgumentException: "If the method call does not have any argument or if the failure does not involve the arguments themselves, then InvalidOperationException should be used."
+      /*if (!ViewCanShowContent(viewType, content))
         throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
                                                   viewType.GetPrettyName(),
-                                                  Content.GetType().GetPrettyName()));
+                                                  Content.GetType().GetPrettyName()));*/
 
-      UpdateActiveMenuItem();
       Control view = (Control)MainFormManager.CreateView(viewType, Content);
+      this.SuspendLayout();
+      viewsLabel.Visible = true;
+      if (viewContextMenuStrip.Items.Count == 0) {
+        viewsLabel.Enabled = false;
+        viewContextMenuStrip.Enabled = false;
+        messageLabel.Visible = true;
+      } else {
+        viewsLabel.Enabled = true;
+        viewContextMenuStrip.Enabled = true;
+        messageLabel.Visible = false;
+        UpdateActiveMenuItem();
+      }
       viewPanel.Controls.Add(view);
       viewPanel.Tag = view;
       view.Dock = DockStyle.Fill;
-      viewPanel.Enabled = true;
-      viewPanel.Visible = true;
+      this.ResumeLayout(false);
     }
 
     private void UpdateActiveMenuItem() {

HeuristicLab.Core.Views/3.3/ViewHost.Designer.cs

@@ -44 +44 @@
     /// the contents of this method with the code editor.
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container(); 
+      this.components = new System.ComponentModel.Container();
       this.viewPanel = new System.Windows.Forms.Panel();
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -71 +71 @@
       this.messageLabel.TabIndex = 2;
       this.messageLabel.Text = "No view available.";
       this.messageLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+      this.messageLabel.Visible = false;
       // 
       // viewsLabel
       // 
@@ -81 +82 @@
       this.viewsLabel.Name = "viewsLabel";
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
       this.viewsLabel.TabIndex = 0;
-      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change current view.");
+      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
+              "rent view.");
+      this.viewsLabel.Visible = false;
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
       // 
       // viewContextMenuStrip
       // 
+      this.viewContextMenuStrip.Enabled = false;
       this.viewContextMenuStrip.Item = null;
       this.viewContextMenuStrip.Name = "viewContextMenuStrip";
       this.viewContextMenuStrip.Size = new System.Drawing.Size(61, 4);

HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs

@@ -90 +90 @@
       base.OnContentChanged();
       if (Content == null) {
         Caption = "ConstrainedValueParameter";
-        valueGroupBox.Enabled = false;
         FillValueComboBox();
         viewHost.Content = null;
       } else {
         Caption = Content.Name + " (" + Content.GetType().Name + ")";
-        valueGroupBox.Enabled = true;
         FillValueComboBox();
         viewHost.Content = Content.Value;
       }

HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

@@ -85 +85 @@
         Caption = "ValueParameter";
         setValueButton.Enabled = false;
         clearValueButton.Enabled = false;
-        valueGroupBox.Enabled = false;
         viewHost.Content = null;
       } else {
         Caption = Content.Name + " (" + Content.GetType().Name + ")";
         setValueButton.Enabled = Content.Value == null;
         clearValueButton.Enabled = Content.Value != null;
-        valueGroupBox.Enabled = true;
         viewHost.Content = Content.Value;
       }
     }