Changeset 13640

Timestamp:

03/02/16 14:46:53 (9 years ago)

Author:

mkommend

Message:

#2578: Merged r13621 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (2 diffs)

stable/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -456 +456 @@
     #region create menu and toolbar
     private void CreateGUI() {
-      IEnumerable<object> allUserInterfaceItems = ApplicationManager.Manager.GetInstances(userInterfaceItemType);
-
-      IEnumerable<IPositionableUserInterfaceItem> toolStripMenuItems =
-        from mi in allUserInterfaceItems
-        where (mi is IPositionableUserInterfaceItem) &&
-              (mi is IMenuItem || mi is IMenuSeparatorItem)
-        orderby ((IPositionableUserInterfaceItem)mi).Position
-        select (IPositionableUserInterfaceItem)mi;
-
-      foreach (IPositionableUserInterfaceItem menuItem in toolStripMenuItems) {
-        if (menuItem is IMenuItem)
-          AddToolStripMenuItem((IMenuItem)menuItem);
-        else if (menuItem is IMenuSeparatorItem)
-          AddToolStripMenuItem((IMenuSeparatorItem)menuItem);
-      }
-
-      IEnumerable<IPositionableUserInterfaceItem> toolStripButtonItems =
-        from bi in allUserInterfaceItems
-        where (bi is IPositionableUserInterfaceItem) &&
-              (bi is IToolBarItem || bi is IToolBarSeparatorItem)
-        orderby ((IPositionableUserInterfaceItem)bi).Position
-        select (IPositionableUserInterfaceItem)bi;
-
-      foreach (IPositionableUserInterfaceItem toolStripButtonItem in toolStripButtonItems) {
-        if (toolStripButtonItem is IToolBarItem)
-          AddToolStripButtonItem((IToolBarItem)toolStripButtonItem);
-        else if (toolStripButtonItem is IToolBarSeparatorItem)
-          AddToolStripButtonItem((IToolBarSeparatorItem)toolStripButtonItem);
-      }
-
+      if (userInterfaceItemType != null) {
+        IEnumerable<object> allUserInterfaceItems = ApplicationManager.Manager.GetInstances(userInterfaceItemType);
+
+        IEnumerable<IPositionableUserInterfaceItem> toolStripMenuItems =
+          from mi in allUserInterfaceItems
+          where (mi is IPositionableUserInterfaceItem) &&
+                (mi is IMenuItem || mi is IMenuSeparatorItem)
+          orderby ((IPositionableUserInterfaceItem)mi).Position
+          select (IPositionableUserInterfaceItem)mi;
+
+        foreach (IPositionableUserInterfaceItem menuItem in toolStripMenuItems) {
+          if (menuItem is IMenuItem)
+            AddToolStripMenuItem((IMenuItem)menuItem);
+          else if (menuItem is IMenuSeparatorItem)
+            AddToolStripMenuItem((IMenuSeparatorItem)menuItem);
+        }
+
+        IEnumerable<IPositionableUserInterfaceItem> toolStripButtonItems =
+          from bi in allUserInterfaceItems
+          where (bi is IPositionableUserInterfaceItem) &&
+                (bi is IToolBarItem || bi is IToolBarSeparatorItem)
+          orderby ((IPositionableUserInterfaceItem)bi).Position
+          select (IPositionableUserInterfaceItem)bi;
+
+        foreach (IPositionableUserInterfaceItem toolStripButtonItem in toolStripButtonItems) {
+          if (toolStripButtonItem is IToolBarItem)
+            AddToolStripButtonItem((IToolBarItem)toolStripButtonItem);
+          else if (toolStripButtonItem is IToolBarSeparatorItem)
+            AddToolStripButtonItem((IToolBarSeparatorItem)toolStripButtonItem);
+        }
+
+      }
       this.AdditionalCreationOfGuiElements();
+
+      if (menuStrip.Items.Count == 0) menuStrip.Visible = false;
+      if (toolStrip.Items.Count == 0) toolStrip.Visible = false;
     }
 
@@ -555 +560 @@
       try {
         ((IActionUserInterfaceItem)item.Tag).Execute();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
       }