From c218253c82d81f0ef46ac163e5e6c0e4996d463d Mon Sep 17 00:00:00 2001 From: Mirko Waechter <mirko.waechter@kit.edu> Date: Sat, 18 Jun 2016 15:19:16 +0200 Subject: [PATCH] icons for several guis --- .../applications/ArmarXGui/Widgets/ViewerWidget.cpp | 7 +++++++ .../applications/ArmarXGui/Widgets/ViewerWidget.h | 4 ++++ .../gui-plugins/ClockPlugin/ClockWidgetController.cpp | 6 ++++++ .../gui-plugins/ClockPlugin/ClockWidgetController.h | 4 ++++ .../ScenarioManager/ScenarioManagerWidgetController.cpp | 6 ++++++ .../ScenarioManager/ScenarioManagerWidgetController.h | 3 +++ .../SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp | 5 +++++ .../SystemStateMonitorPlugin/SystemStateMonitorWidget.h | 4 ++++ 8 files changed, 39 insertions(+) diff --git a/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp b/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp index 6054d63c..b5ae0c31 100644 --- a/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp +++ b/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp @@ -369,3 +369,10 @@ void Viewer3DWidget::configDialogLoadSettings() configDialogApplySettings(); } + + +QIcon armarx::Viewer3DWidget::getWidgetIcon() const +{ + ARMARX_IMPORTANT << "ICCCOOON"; + return QIcon(":icons/Outline-3D.png"); +} diff --git a/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h b/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h index 4564c98e..c61c4c4e 100644 --- a/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h +++ b/source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h @@ -93,6 +93,10 @@ namespace armarx Ui_ViewerWidgetConfigDialog* configDialogUi; QSettings settings; QAction* viewingModeAction; + + // ArmarXWidgetController interface + public: + QIcon getWidgetIcon() const; }; typedef IceUtil::Handle<Viewer3DWidget> Viewer3DWidgetPtr; } diff --git a/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp b/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp index f458b618..0e8e5f0c 100644 --- a/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp +++ b/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.cpp @@ -154,3 +154,9 @@ void ClockWidgetController::speedChanged(double newSpeed) timeServerPtr->setSpeed(newSpeed); } } + + +QIcon armarx::ClockWidgetController::getWidgetIcon() const +{ + return QIcon(":icons/Time-And-Date-Clock-icon.png"); +} diff --git a/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h b/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h index 17582044..6db75a1e 100644 --- a/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h +++ b/source/ArmarXGui/gui-plugins/ClockPlugin/ClockWidgetController.h @@ -126,6 +126,10 @@ namespace armarx Ui::ClockWidget widget; QTimer* updateTimer; TimeServerInterfacePtr timeServerPtr; + + // ArmarXWidgetController interface + public: + QIcon getWidgetIcon() const; }; } diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp index 23f6d895..3faeb814 100644 --- a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp +++ b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp @@ -275,6 +275,7 @@ void ScenarioManagerWidgetController::updateModels() //widget.scenarioView->setModel(scenarioListController.getTreeModel()); } + void ScenarioManagerWidgetController::editMode(bool edit) { QSettings settings; @@ -282,3 +283,8 @@ void ScenarioManagerWidgetController::editMode(bool edit) widget.detailedApplicationView->setVisible(edit); widget.applicationDatabase->setVisible(edit); } + +QIcon armarx::ScenarioManagerWidgetController::getWidgetIcon() const +{ + return QIcon(":icons/app-drawer.svg"); +} diff --git a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h index bc1b2ba3..1d9e8baf 100644 --- a/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h +++ b/source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h @@ -144,6 +144,9 @@ namespace armarx // ArmarXWidgetController interface public: QPointer<QWidget> getCustomTitlebarWidget(QWidget* parent); + // ArmarXWidgetController interface + public: + QIcon getWidgetIcon() const; }; } diff --git a/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp b/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp index 976da117..647dda6f 100644 --- a/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp +++ b/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp @@ -298,3 +298,8 @@ void SystemStateMonitorWidget::delayedFilterExpansion() { InfixFilterModel::ExpandFilterResults(ui.monitoredManagersTree); } + +QIcon armarx::SystemStateMonitorWidget::getWidgetIcon() const +{ + return QIcon(":icons/activity_monitor.png"); +} diff --git a/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.h b/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.h index 6c88d175..3259d202 100644 --- a/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.h +++ b/source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.h @@ -188,6 +188,10 @@ namespace armarx QStringList fetchOnlineManagers(); + + // ArmarXWidgetController interface + public: + QIcon getWidgetIcon() const; }; } -- GitLab