diff --git a/source/RobotAPI/libraries/skills_gui/CMakeLists.txt b/source/RobotAPI/libraries/skills_gui/CMakeLists.txt index e0c518a468b90a948fe79b4babade9ccc797434b..a1e53c1a2d96b3a6e50d4720efbd9be38d6760de 100644 --- a/source/RobotAPI/libraries/skills_gui/CMakeLists.txt +++ b/source/RobotAPI/libraries/skills_gui/CMakeLists.txt @@ -3,7 +3,6 @@ set(LIB_NAME skills_gui) armarx_component_set_name("${LIB_NAME}") armarx_set_target("Library: ${LIB_NAME}") - set(LIBRARIES ArmarXCore ArmarXCoreInterfaces diff --git a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp index 8d3dc6bd1459a74bc2bbf82af98235605e09de9a..a06d624b7916a733079ecb5414e6e76664c0ff0d 100644 --- a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp +++ b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp @@ -102,6 +102,8 @@ namespace armarx::skills::gui ___qtreewidgetitem->setText(1, "Executor"); ___qtreewidgetitem->setText(0, "Timestamp"); + this->setColumnWidth(4, 30); + connectSignals(); } diff --git a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidgetItem.cpp b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidgetItem.cpp index 4e392e78440187727b9df2f7b1a398c153a40bec..6eb51efac3f1fcefd8b84e54fcfc485497b17494 100644 --- a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidgetItem.cpp +++ b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidgetItem.cpp @@ -1,5 +1,9 @@ #include "SkillExecutionTreeWidgetItem.h" +#include <ArmarXCore/core/system/ArmarXDataPath.h> + +#include "../gui_utils.h" + namespace armarx::skills::gui { SkillExecutionTreeWidgetItem* @@ -62,10 +66,15 @@ namespace armarx::skills::gui SkillExecutionTreeWidgetItem::setupUi() { parentTree->insertTopLevelItem(0, this); - abortButton = new QPushButton("Abort"); + abortButton = new QPushButton(); abortButton->setMinimumHeight(20); abortButton->setMaximumHeight(20); parentTree->setItemWidget(this, 4, abortButton); + + QIcon icon = armarx::gui::getIcon("process-stop-7.ico"); + + abortButton->setIcon(icon); + connectSignals(); }