diff --git a/source/RobotAPI/libraries/skills_gui/CMakeLists.txt b/source/RobotAPI/libraries/skills_gui/CMakeLists.txt
index a1e53c1a2d96b3a6e50d4720efbd9be38d6760de..2d2e9b57de36b5119a3bcf3e3802ffc9bca76548 100644
--- a/source/RobotAPI/libraries/skills_gui/CMakeLists.txt
+++ b/source/RobotAPI/libraries/skills_gui/CMakeLists.txt
@@ -63,7 +63,7 @@ set(SOURCES
SkillMemoryGui.cpp
gui_utils.cpp
- StatusLabel.cpp
+
)
set(HEADERS
aron_tree_widget/visitors/AronTreeWidgetCreator.h
@@ -105,7 +105,6 @@ set(HEADERS
SkillMemoryGui.h
gui_utils.h
- StatusLabel.h
)
armarx_gui_library("${LIB_NAME}" "${SOURCES}" "${GUI_MOC_HDRS}" "${GUI_UIS}" "" "${LIBRARIES}")
diff --git a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h
index 64361f811ef2251ad679fad0c2efa1395a5aa563..648f7cee806866a36363559267f68c537f203c1c 100644
--- a/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h
+++ b/source/RobotAPI/libraries/skills_gui/SkillMemoryGui.h
@@ -10,8 +10,7 @@
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXGui/libraries/ArmarXGuiBase/widgets/PeriodicUpdateWidget.h>
-
-#include "RobotAPI/libraries/skills_gui/StatusLabel.h"
+#include <ArmarXGui/libraries/ArmarXGuiBase/widgets/StatusLabel.h>
#include "./aron_tree_widget/widgets/SkillDescriptionWidget.h"
#include "./executions/SkillExecutionTreeWidget.h"
diff --git a/source/RobotAPI/libraries/skills_gui/StatusLabel.cpp b/source/RobotAPI/libraries/skills_gui/StatusLabel.cpp
deleted file mode 100644
index 6b65f166aa9677f0eed55b95436a1a76777471f3..0000000000000000000000000000000000000000
--- a/source/RobotAPI/libraries/skills_gui/StatusLabel.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "StatusLabel.h"
-
-#include <QHBoxLayout>
-
-namespace armarx::skills::gui
-{
-
- StatusLabel::StatusLabel()
- {
- this->label = new QLabel("");
- this->resetButton = new QPushButton("");
- this->setupUi();
- }
-
- void
- StatusLabel::handleMessage(const std::string& message, std::string const& error)
- {
- this->label->setText(QString::fromStdString(message));
- this->resetButton->setHidden(false);
- label->setToolTip(QString::fromStdString(error));
- }
-
- void
- StatusLabel::resetLabel()
- {
- this->label->setText(QString::fromStdString(""));
- this->resetButton->setHidden(true);
- }
-
- void
- StatusLabel::setupUi()
- {
- QHBoxLayout* layout = new QHBoxLayout();
- layout->addWidget(resetButton);
- layout->addWidget(label);
- this->setLayout(layout);
- layout->setStretch(1, 2);
- label->setStyleSheet("QLabel { color : red; }");
- this->resetButton->setHidden(true);
-
- label->setMinimumHeight(35);
- label->setMaximumHeight(35);
-
- QPixmap pixmap(":/icons/delete.ico");
- QIcon ButtonIcon(pixmap);
- resetButton->setIcon(ButtonIcon);
- resetButton->setIconSize(pixmap.rect().size() / 2);
-
- connect(this->resetButton, &QPushButton::clicked, this, &StatusLabel::resetLabel);
- }
-
-} // namespace armarx::skills::gui
diff --git a/source/RobotAPI/libraries/skills_gui/StatusLabel.h b/source/RobotAPI/libraries/skills_gui/StatusLabel.h
deleted file mode 100644
index b8e0f91e425e3715d5d5f617f877cfeeceee9a39..0000000000000000000000000000000000000000
--- a/source/RobotAPI/libraries/skills_gui/StatusLabel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <QLabel>
-#include <QPushButton>
-
-namespace armarx::skills::gui
-{
- class StatusLabel : public QWidget
- {
- public:
- /**
- * @brief Constructor for StatusLabel
- */
- StatusLabel();
-
- public slots:
- /**
- * @brief Display a message to indicate an update.
- */
- void handleMessage(std::string const& message, std::string const& error);
-
- private slots:
- /**
- * @brief Reset the label to default state.
- */
- void resetLabel();
-
- private:
- void setupUi();
-
- // contents
- QLabel* label = nullptr;
- QPushButton* resetButton = nullptr;
- };
-} // namespace armarx::skills::gui
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp
index 20295978a7ea67e75136277af2a1e617e5a9aae5..ac56b71debaed0b901378d931fc03b51cb78ea26 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.cpp
@@ -7,6 +7,14 @@
namespace armarx::skills::gui
{
+ QIcon
+ getIcon(const std::string name)
+ {
+ QPixmap pix(QString::fromStdString(":icons/" + name));
+ QIcon icon(pix);
+ return icon;
+ }
+
void
ProfileMenuWidget::setupUi()
{
@@ -33,7 +41,9 @@ namespace armarx::skills::gui
// Text
setArgsFromClipboard->setText(QString::fromStdString(SET_ARGS_BUTTON_TEXT));
copyArgsToClipboard->setText(QString::fromStdString(COPY_ARGS_BUTTON_TEXT));
+ copyArgsToClipboard->setIcon(getIcon("edit-copy-4.svg"));
resetArgsToProfile->setText(QString::fromStdString(RESET_ARGS_BUTTON_TEXT));
+ resetArgsToProfile->setIcon(getIcon("refresh-black.svg"));
profileSelector->addItem(QString::fromStdString(DEFAULT_PROFILE_TEXT));
profileSelector->setDisabled(true);
profileSelector->setToolTip(QString::fromStdString(PROFILE_NOT_IMPLEMENTED));
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h
index 32dc1f278649060b97d58f680f2a8c74d5e1f75a..3046b18b8d0a60224395eea24347f14cc98e1e80 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/ProfileMenuWidget.h
@@ -14,8 +14,8 @@ namespace armarx::skills::gui
Q_OBJECT
public:
static const constexpr char* SET_ARGS_BUTTON_TEXT = "Set Args from Clipboard";
- static const constexpr char* COPY_ARGS_BUTTON_TEXT = "Copy Args to Clipboard";
- static const constexpr char* RESET_ARGS_BUTTON_TEXT = "Reset Args to Profile";
+ static const constexpr char* COPY_ARGS_BUTTON_TEXT = " Copy Args to Clipboard";
+ static const constexpr char* RESET_ARGS_BUTTON_TEXT = " Reset Args to Profile";
static const constexpr char* DEFAULT_PROFILE_TEXT = "<No Profile selected. Using root>";
static const constexpr char* PROFILE_NOT_IMPLEMENTED =
"Profiles other than the root profile are currently not supported.";
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
index b54d55c8a21b3ef8f1eb912e52473a9bcfbd230f..137140d252e90e4e6d2fc92c4c3d51cb18ad514e 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp
@@ -113,6 +113,12 @@ namespace armarx::skills::gui
// Text
this->executeSkillButton->setText(
QString::fromStdString(SkillDetailGroupBox::EXECUTE_SKILL_BUTTON_TEXT));
+ {
+ QPixmap pix(QString::fromStdString(":icons/run.svg"));
+ QIcon icon(pix);
+ this->executeSkillButton->setIcon(icon);
+ }
+
connectSignals();
}
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
index 918fa2ec3241ae512645c878de16d53042fb0005..f777490cfba0c7d45b83f601ec69ea2d91903728 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h
@@ -19,7 +19,7 @@ namespace armarx::skills::gui
{
Q_OBJECT
public:
- static const constexpr char* EXECUTE_SKILL_BUTTON_TEXT = "Request Execution";
+ static const constexpr char* EXECUTE_SKILL_BUTTON_TEXT = " Request Execution";
static const constexpr char* GROUP_BOX_TITLE = "Skill Description";
SkillDetailGroupBox(std::shared_ptr<SkillManagerWrapper> _memory,