diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
index b56988547ad55b570bebb46a0ec9a049c2124161..3425ed3cfe1118e7d528a3ea03072163ae1c42c9 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp
@@ -181,6 +181,8 @@ void ScenarioManagerWidgetController::init()
QObject::connect(widget.detailedApplicationView, SIGNAL(applicationEnabledChange(bool)),
&scenarioListController, SLOT(updateModel()));
+ QObject::connect(&openScenarioController, SIGNAL(showPackageDialog()),
+ &settingsController, SLOT(showPackageAdderView()));
QObject::connect(widget.detailedApplicationView, SIGNAL(saveScenario(ScenarioManager::Data_Structure::ApplicationInstancePtr)),
&scenarioListController, SLOT(saveScenario(ScenarioManager::Data_Structure::ApplicationInstancePtr)));
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp
index ef1f6f6b4ad04568959e03a34fe199ab1501a132..38a45f620d409956006a5e80e4b1973516b5ebb0 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp
@@ -57,6 +57,9 @@ OpenScenarioController::OpenScenarioController(PackageVectorPtr packages, Exec::
QObject::connect(&openScenarioView, SIGNAL(openScenario(int, int, QModelIndex)),
this, SLOT(on_openScenario(int, int, QModelIndex)));
+
+ QObject::connect(&openScenarioView, SIGNAL(showAddPackageDialog()),
+ this, SLOT(on_showAddPackageDialog()));
}
OpenScenarioController::~OpenScenarioController()
@@ -180,6 +183,11 @@ void OpenScenarioController::showOpenScenarioView()
openScenarioView.exec();
}
+void OpenScenarioController::on_showAddPackageDialog()
+{
+ emit showPackageDialog();
+}
+
void OpenScenarioController::updateModel()
{
treemodel->clear();
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.h b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.h
index 1ea9fea70642ee6c0b635a0d122523c9d7b9f602..2e7536193f60ba0bff82072357252ba67258da27 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.h
@@ -65,12 +65,14 @@ namespace ScenarioManager
* This signal gets emitted if the data structure has changed.
*/
void updated();
+ void showPackageDialog();
public slots:
/**
* Shows the OpenScenarioView which allows the User to open and load in a Scenario.
*/
void showOpenScenarioView();
+ void on_showAddPackageDialog();
/**
* Finds a scenario in the model, based on the given data and
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
index 9512e49ababca68dcb3736dd2af2bef5a8f9e777..3670234f34314ea2062bad280811f306956d5263 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/buttondelegate.cpp
@@ -71,16 +71,19 @@ QWidget* ButtonDelegate::createEditor(QWidget* parent, const QStyleOptionViewIte
cb->setCurrentIndex(1);
}
cb->setIconSize(QSize(size, size));
+ cb->setToolTip("Start");
}
else if (index.data().toString().compare("Stop") == 0)
{
cb->addItem(stopPixmap, "Stop");
cb->setIconSize(QSize(size, size));
+ cb->setToolTip("Stop");
}
else if (index.data().toString().compare("Restart") == 0)
{
cb->addItem(restartPixmap, "Restart");
cb->setIconSize(QSize(size, size));
+ cb->setToolTip("Restart");
}
else
{
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.cpp
index d790a15189e8b27086d39f3d537970492ee40903..3881bb223e4743e0592e127a99842d8f97fac3f4 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.cpp
@@ -70,3 +70,8 @@ void OpenScenarioView::on_treeView_doubleClicked(const QModelIndex& index)
{
emit openScenario(index.row(), index.column(), index.parent());
}
+
+void OpenScenarioView::on_openPackageButton_clicked()
+{
+ emit showAddPackageDialog();
+}
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.h b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.h
index aa65a862dcfb57fb114d8e9b213e1ffa18b46512..4f9b956616feb2297bf85a133502555e63ae1cae 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.h
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.h
@@ -60,6 +60,7 @@ public:
signals:
void openScenario(int row, int column, QModelIndex parent);
+ void showAddPackageDialog();
private slots:
void openButtonClicked(int row, int column, QModelIndex parent);
@@ -67,6 +68,8 @@ private slots:
void on_treeView_doubleClicked(const QModelIndex& index);
+ void on_openPackageButton_clicked();
+
private:
Ui::OpenScenarioView* ui;
FilterableTreeModelSortFilterProxyModelPtr model;
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.ui b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.ui
index 08b7a02ef7d4060e6ee43a4788b6c2a38b5556e5..2d7840b2b4ab201b3cf7dde705efc9f954c99093 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.ui
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.ui
@@ -24,6 +24,27 @@
<item>
<widget class="QTreeView" name="treeView"/>
</item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>If you cant find your Scenario maybe you need to open the Package first: </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="openPackageButton">
+ <property name="text">
+ <string>Open Package</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
index b0ad257b462fa3a49b4ea9a55f5fd97c7a08ba0e..78cc96c22489c5165ba6788010c19105200626fd 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp
@@ -41,7 +41,7 @@ ScenarioListView::ScenarioListView(QWidget* parent) :
startButtonDelegate(this),
stopButtonDelegate(this),
restartButtonDelegate(this),
- removeAction("Close", &contextMenu)
+ removeAction("Remove", &contextMenu)
{
ui->setupUi(this);
@@ -156,7 +156,7 @@ void ScenarioListView::onCustomContextMenu(const QPoint& point)
{
QModelIndex index = ui->treeView->currentIndex();
- removeAction.setText("Close " + index.data().toString());
+ removeAction.setText("Remove " + index.data().toString());
QList<QAction*> actions;
actions.append(&removeAction);
diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.ui b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.ui
index 55f3d4adb9dc8b5a57c05457a5a488051e26ffc0..8df620db16ae4e12f1b0b6fa607395bd0dac6f48 100644
--- a/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.ui
+++ b/source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.ui
@@ -36,21 +36,21 @@
</property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="openButton">
- <property name="toolTip">
- <string>Add an Package</string>
- </property>
- <property name="text">
- <string>Open</string>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
<widget class="QTreeView" name="treeView"/>
</item>
+ <item>
+ <widget class="QPushButton" name="openButton">
+ <property name="toolTip">
+ <string>Add an Package</string>
+ </property>
+ <property name="text">
+ <string>Open new Package</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="killStrategyTab">