Add all base system changes from the Assembly branch

2013-02-10 20:02:21 +01:00
parent 0215757e79
commit d739a2e41b
36 changed files with 877 additions and 171 deletions
--- a/src/Gui/Control.cpp
+++ b/src/Gui/Control.cpp
@@ -81,6 +81,16 @@ void ControlSingleton::showTaskView()
        _taskPanel->raise();
 }

+void ControlSingleton::showModelView()
+{
+    Gui::DockWnd::CombiView* pcCombiView = qobject_cast<Gui::DockWnd::CombiView*>
+        (Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
+    if (pcCombiView)
+        pcCombiView->showTreeView();
+    else if (_taskPanel)
+        _taskPanel->raise();
+}
+
 void ControlSingleton::showDialog(Gui::TaskView::TaskDialog *dlg)
 {
    // only one dialog at a time