Changeset 4435 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

09/19/10 19:43:05 (14 years ago)

Author:

mkommend

Message:

Adjusted the SetEnabledStateOfControls method in all views, added the Enabled property into the IView interface and adapted the ViewHost, View and ContentView class (ticket #1155).

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• ResultView.cs (modified) (3 diffs)
• RunCollectionComparisonConstraintView.cs (modified) (1 diff)
• RunCollectionConstraintView.cs (modified) (1 diff)
• RunCollectionEqualityConstraintView.cs (modified) (1 diff)
• RunCollectionTabularView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Views/3.3/ResultView.cs

@@ -45 +45 @@
 
     public override bool ReadOnly {
-      get { return base.ReadOnly; }
+      get { return true; }
       set { /*not needed because results are always readonly */}
     }
@@ -54 +54 @@
     public ResultView() {
       InitializeComponent();
-      base.ReadOnly = true;
     }
 
@@ -91 +90 @@
       dataTypeTextBox.Enabled = Content != null;
       viewHost.Enabled = Content != null;
+      viewHost.ReadOnly = this.ReadOnly;
     }
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs

@@ -86 +86 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      txtConstraintData.ReadOnly = Content == null || this.ReadOnly;
+      txtConstraintData.Enabled = Content != null;
+      txtConstraintData.ReadOnly = ReadOnly;
     }
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs

@@ -83 +83 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      cmbConstraintColumn.Enabled = !this.ReadOnly && !this.Locked && Content != null;
-      cmbConstraintOperation.Enabled = !this.ReadOnly && !this.Locked && Content != null;
+      cmbConstraintColumn.Enabled = !this.ReadOnly && Content != null;
+      cmbConstraintOperation.Enabled = !this.ReadOnly && Content != null;
       chbActive.Enabled = !this.Locked && Content != null;
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.cs

@@ -45 +45 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      txtConstraintData.ReadOnly = Content == null || this.ReadOnly;
+      txtConstraintData.Enabled = Content != null;
+      txtConstraintData.ReadOnly = ReadOnly;
     }
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionTabularView.cs

@@ -35 +35 @@
     public RunCollectionTabularView() {
       InitializeComponent();
-      base.ReadOnly = true;
     }
 
     public override bool ReadOnly {
-      get { return base.ReadOnly; }
+      get { return true; }
       set { /*not needed because results are always readonly */}
     }