ScenarioManager: added edit mode

source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp

@@ -54,7 +54,7 @@ ScenarioManagerWidgetController::ScenarioManagerWidgetController()
     , openScenarioController(packages, executor)
 {
     widget.setupUi(getWidget());
-    compactModeAction = new QAction("Compact Mode", this);
+    editModeAction = new QAction("Edit Mode", this);
 
 }
 
@@ -88,6 +88,9 @@ void ScenarioManagerWidgetController::init()
     QObject::connect(widget.scenarioView, SIGNAL(createScenario()),
                      &scenarioListController, SLOT(createScenario()));
 
+    QObject::connect(widget.scenarioView, SIGNAL(createScenario()),
+                     widget.applicationDatabase, SLOT(show()));
+
     QObject::connect(widget.scenarioView, SIGNAL(removeItem(QModelIndex)),
                      &scenarioListController, SLOT(removeItem(QModelIndex)));
 
@@ -167,10 +170,10 @@ void ScenarioManagerWidgetController::init()
     QObject::connect(&scenarioListController, SIGNAL(modelUpdated(FilterableTreeModelSortFilterProxyModelPtr)),
                      widget.scenarioView, SLOT(setModel(FilterableTreeModelSortFilterProxyModelPtr)));
 
-
-    connect(compactModeAction, SIGNAL(toggled(bool)), this, SLOT(compactMode(bool)));
-    compactModeAction->setCheckable(true);
-    compactModeAction->setToolTip("If toggled the application database and the application property view will be hidden.");
+    connect(editModeAction, SIGNAL(toggled(bool)), this, SLOT(editMode(bool)));
+    editModeAction->setCheckable(true);
+    //    editModeAction->setChecked(true);
+    editModeAction->setToolTip("If toggled the application database and the application property view will be hidden.");
 
     //Setting Global QSettings
     QCoreApplication::setOrganizationName("armarx");
@@ -194,8 +197,9 @@ void ScenarioManagerWidgetController::init()
         settings.setValue("packages", packages);
     }
 
-
-    compactModeAction->setChecked(settings.value("compactMode", false).toBool());
+    bool editModeState = settings.value("editMode", false).toBool();
+    editModeAction->setChecked(editModeState);
+    editMode(editModeState);
 
     settingsController.init();
 
@@ -217,7 +221,7 @@ QPointer<QWidget> ScenarioManagerWidgetController::getCustomTitlebarWidget(QWidg
     customToolbar = new QToolBar(parent);
     customToolbar->setIconSize(QSize(16, 16));
     customToolbar->addAction(QIcon(":/icons/configure-3.png"), "Configure", &settingsController, SLOT(showSettings()));
-    customToolbar->addAction(compactModeAction);
+    customToolbar->addAction(editModeAction);
     return customToolbar.data();
 }
 
@@ -271,10 +275,10 @@ void ScenarioManagerWidgetController::updateModels()
     //widget.scenarioView->setModel(scenarioListController.getTreeModel());
 }
 
-void ScenarioManagerWidgetController::compactMode(bool compact)
+void ScenarioManagerWidgetController::editMode(bool edit)
 {
     QSettings settings;
-    settings.setValue("compactMode", compact);
-    widget.detailedApplicationView->setVisible(!compact);
-    widget.applicationDatabase->setVisible(!compact);
+    settings.setValue("editMode", edit);
+    widget.detailedApplicationView->setVisible(edit);
+    widget.applicationDatabase->setVisible(edit);
 }

source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h

@@ -110,7 +110,7 @@ namespace armarx
         void reparsePackages();
         void reparsePackage(std::string name);
         void updateModels();
-        void compactMode(bool compact);
+        void editMode(bool edit);
 
     signals:
         /* QT signal declarations */
@@ -138,7 +138,7 @@ namespace armarx
         ScenarioManager::Controller::ScenarioListController scenarioListController;
         ScenarioManager::Controller::SettingsController settingsController;
         ScenarioManager::Controller::OpenScenarioController openScenarioController;
-        QAction* compactModeAction;
+        QAction* editModeAction;
         QSettings settings;
         QPointer<QToolBar> customToolbar;
         // ArmarXWidgetController interface

source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp

@@ -64,7 +64,7 @@ void DetailedApplicationController::showApplicationInstance(ApplicationInstanceP
 
     executor->loadAndSetCachedProperties(application, Parser::IceParser::getCacheDir(), false, false);
     application->load();
-
+    view->setVisible(true);
     view->showApplicationInstance(application);
 }
 
@@ -80,6 +80,7 @@ void DetailedApplicationController::showApplication(ApplicationPtr application)
 
     executor->loadAndSetCachedProperties(application, Parser::IceParser::getCacheDir());
 
+    view->setVisible(true);
     view->showApplication(application);
 }
 
@@ -93,6 +94,7 @@ void DetailedApplicationController::showScenario(ScenarioPtr scenario)
     currentApplication = ApplicationInstancePtr();
     currentScenario = scenario;
 
+    view->setVisible(true);
     view->showScenario(scenario);
 }