Changeset 2870

Timestamp:

02/26/10 01:39:14 (14 years ago)

Author:

swagner

Message:

Added some of the changes suggested by abeham to improve UI reaction times (#887)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/NamedItemView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ViewHost.cs (modified) (4 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/ContentView.Designer.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -160 +160 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = itemsListView.SelectedItems[0].Tag as T;
+        detailsGroupBox.Enabled = true;
         viewHost.Content = item;
-        detailsGroupBox.Enabled = true;
       } else {
         viewHost.Content = null;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -135 +135 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
+        detailsGroupBox.Enabled = true;
         viewHost.Content = item;
-        detailsGroupBox.Enabled = true;
       } else {
         viewHost.Content = null;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -162 +162 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
+        detailsGroupBox.Enabled = true;
         viewHost.Content = item;
-        detailsGroupBox.Enabled = true;
       } else {
         viewHost.Content = null;

trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs

@@ -64 +64 @@
         Caption = "NamedItem";
         nameTextBox.Text = "-";
-        nameTextBox.ReadOnly = false;
         nameTextBox.Enabled = false;
         descriptionTextBox.Text = "";
-        nameTextBox.ReadOnly = false;
         descriptionTextBox.Enabled = false;
       } else {

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterizedNamedItemView.cs

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

trunk/sources/HeuristicLab.Core.Views/3.3/ViewHost.cs

@@ -33 +33 @@
       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) {
+          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();
+        }
       }
     }
@@ -62 +64 @@
 
     private void Initialize() {
-      viewsLabel.Enabled = false;
       viewsLabel.Visible = false;
       viewContextMenuStrip.Enabled = false;
       messageLabel.Visible = false;
 
+      viewPanel.Visible = false;
       if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
       viewPanel.Controls.Clear();
-      viewPanel.Enabled = false;
-      viewPanel.Visible = false;
 
       if (Content != null) {
@@ -76 +76 @@
           messageLabel.Visible = true;
         } else {
-          viewsLabel.Enabled = true;
           viewsLabel.Visible = true;
           viewContextMenuStrip.Enabled = true;
-          messageLabel.Visible = false;
         }
 
@@ -99 +97 @@
 
       if (!ViewCanShowContent(viewType, content))
-        throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                  viewType.GetPrettyName(),
-                                                  Content.GetType().GetPrettyName()));
+        throw new InvalidOperationException(string.Format("View \"{0}\" cannot display content \"{1}\".",
+                                                          viewType.GetPrettyName(),
+                                                          Content.GetType().GetPrettyName()));
 
       UpdateActiveMenuItem();
       Control view = (Control)MainFormManager.CreateView(viewType, Content);
-      viewPanel.Controls.Add(view);
       viewPanel.Tag = view;
       view.Dock = DockStyle.Fill;
-      viewPanel.Enabled = true;
+      viewPanel.Controls.Add(view);
       viewPanel.Visible = true;
     }

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ContentView.Designer.cs

@@ -25 +25 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      this.SuspendLayout();
+      // 
+      // ContentView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Name = "ContentView";
+      this.ResumeLayout(false);
+
     }
 

trunk/sources/HeuristicLab.Parameters.Views/3.3/ConstrainedValueParameterView.cs

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

trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

@@ -86 +86 @@
         setValueButton.Enabled = false;
         clearValueButton.Enabled = false;
+        viewHost.Content = null;
         valueGroupBox.Enabled = false;
-        viewHost.Content = null;
       } else {
         Caption = Content.Name + " (" + Content.GetType().Name + ")";