Changeset 3290 for trunk

Timestamp:

04/09/10 02:04:57 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893).

Location:

trunk/sources

Files:

• HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/Properties/Settings.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/app.config (modified) (1 diff)
• HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs

@@ -48 +48 @@
       if (menuItem != null) {
         menuItem.CheckOnClick = true;
-        menuItem.Checked = true;
+        menuItem.Checked = Properties.Settings.Default.ShowOperatorsSidebar;
       }
     }
 
     private void MainForm_ViewShown(object sender, ViewShownEventArgs e) {
-      if ((e.View is OperatorsSidebar) && (menuItem != null))
+      if ((e.View is OperatorsSidebar) && (menuItem != null)) {
         menuItem.Checked = true;
+        Properties.Settings.Default.ShowOperatorsSidebar = true;
+        Properties.Settings.Default.Save();
+      }
     }
     private void MainForm_ViewHidden(object sender, ViewEventArgs e) {
-      if ((e.View is OperatorsSidebar) && (menuItem != null))
+      if ((e.View is OperatorsSidebar) && (menuItem != null)) {
         menuItem.Checked = false;
+        Properties.Settings.Default.ShowOperatorsSidebar = false;
+        Properties.Settings.Default.Save();
+      }
     }
 
     public override void Execute() {
       var view = MainFormManager.MainForm.Views.OfType<OperatorsSidebar>().FirstOrDefault();
-      if (view.IsShown)
+      if (view == null) {
+        OperatorsSidebar operatorsSidebar = new OperatorsSidebar();
+        operatorsSidebar.Dock = DockStyle.Left;
+        operatorsSidebar.Show();
+      } else if (view.IsShown) {
         view.Hide();
-      else
+      } else {
         view.Show();
+      }
     }
   }

trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs

@@ -47 +47 @@
       if (version != null) Title += " " + version.Version;
       ViewClosed += new EventHandler<ViewEventArgs>(FileManager.ViewClosed);
-      OperatorsSidebar operatorsSidebar = new OperatorsSidebar();
-      operatorsSidebar.Dock = DockStyle.Left;
-      operatorsSidebar.Show();
+      if (Properties.Settings.Default.ShowOperatorsSidebar) {
+        OperatorsSidebar operatorsSidebar = new OperatorsSidebar();
+        operatorsSidebar.Dock = DockStyle.Left;
+        operatorsSidebar.Show();
+      }
       if (Properties.Settings.Default.ShowStartPage) {
         StartPage startPage = new StartPage();

trunk/sources/HeuristicLab.Optimizer/3.3/Properties/Settings.Designer.cs

@@ -35 +35 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool ShowOperatorsSidebar {
+            get {
+                return ((bool)(this["ShowOperatorsSidebar"]));
+            }
+            set {
+                this["ShowOperatorsSidebar"] = value;
+            }
+        }
     }
 }

trunk/sources/HeuristicLab.Optimizer/3.3/Properties/Settings.settings

@@ -6 +6 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="ShowOperatorsSidebar" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

trunk/sources/HeuristicLab.Optimizer/3.3/app.config

@@ -11 +11 @@
                 <value>True</value>
             </setting>
+            <setting name="ShowOperatorsSidebar" serializeAs="String">
+                <value>False</value>
+            </setting>
         </HeuristicLab.Optimizer.Properties.Settings>
     </userSettings>

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -63 +63 @@
         }
         if (operation.Operator.Breakpoint) {
-          Log.LogMessage(string.Format("Breakpoint: {0} ({1})", operation.Operator.Name, operation.Operator.ItemName));
+          Log.LogMessage(string.Format("Breakpoint: {0}", operation.Operator.Name != string.Empty ? operation.Operator.Name : operation.Operator.ItemName));
           Pause();
         }