diff --git a/src/plugins/scxmleditor/common/common.qrc b/src/plugins/scxmleditor/common/common.qrc
index 345d2aab57b..b23f1972c7f 100644
--- a/src/plugins/scxmleditor/common/common.qrc
+++ b/src/plugins/scxmleditor/common/common.qrc
@@ -9,24 +9,14 @@
images/align_right.png
images/align_top.png
images/align_vertical.png
- images/arrow_down.png
- images/arrow_right.png
images/colorthemes.png
images/final.png
images/font_color.png
images/fullnamespace.png
images/history.png
- images/icon-close.png
- images/icon-copy.png
- images/icon-cut.png
images/icon-export-canvas.png
- images/icon-filter.png
images/icon-fit-screen.png
images/icon-pan.png
- images/icon-paste.png
- images/icon-redo.png
- images/icon-search.png
- images/icon-undo.png
images/icon-zoom-in.png
images/icon-zoom-out.png
images/initial.png
@@ -36,7 +26,6 @@
images/parallel_icon.png
images/properties.png
images/screenshot.png
- images/search.png
images/state.png
images/state_color.png
images/statistics.png
diff --git a/src/plugins/scxmleditor/common/images/arrow_down.png b/src/plugins/scxmleditor/common/images/arrow_down.png
deleted file mode 100644
index f94254fa266..00000000000
Binary files a/src/plugins/scxmleditor/common/images/arrow_down.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/arrow_right.png b/src/plugins/scxmleditor/common/images/arrow_right.png
deleted file mode 100644
index 9e8d3a2a2a7..00000000000
Binary files a/src/plugins/scxmleditor/common/images/arrow_right.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-close.png b/src/plugins/scxmleditor/common/images/icon-close.png
deleted file mode 100644
index b2233f150ec..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-close.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-copy.png b/src/plugins/scxmleditor/common/images/icon-copy.png
deleted file mode 100644
index 7d1e9455bf4..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-copy.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-cut.png b/src/plugins/scxmleditor/common/images/icon-cut.png
deleted file mode 100644
index 640bb76d04c..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-cut.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-filter.png b/src/plugins/scxmleditor/common/images/icon-filter.png
deleted file mode 100644
index 9ed69c43409..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-filter.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-paste.png b/src/plugins/scxmleditor/common/images/icon-paste.png
deleted file mode 100644
index e281dbd3f2f..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-paste.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-redo.png b/src/plugins/scxmleditor/common/images/icon-redo.png
deleted file mode 100644
index c8e81ab96f6..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-redo.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-search.png b/src/plugins/scxmleditor/common/images/icon-search.png
deleted file mode 100644
index 39239be15d7..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-search.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/icon-undo.png b/src/plugins/scxmleditor/common/images/icon-undo.png
deleted file mode 100644
index aaf47a0b7eb..00000000000
Binary files a/src/plugins/scxmleditor/common/images/icon-undo.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/images/search.png b/src/plugins/scxmleditor/common/images/search.png
deleted file mode 100644
index 6b0d4b20ca8..00000000000
Binary files a/src/plugins/scxmleditor/common/images/search.png and /dev/null differ
diff --git a/src/plugins/scxmleditor/common/navigator.cpp b/src/plugins/scxmleditor/common/navigator.cpp
index f9dc6095c3c..bc48b02a3b8 100644
--- a/src/plugins/scxmleditor/common/navigator.cpp
+++ b/src/plugins/scxmleditor/common/navigator.cpp
@@ -28,6 +28,8 @@
#include "graphicsview.h"
#include "sizegrip.h"
+#include
+
#include
using namespace ScxmlEditor::Common;
@@ -36,6 +38,7 @@ Navigator::Navigator(QWidget *parent)
: MovableFrame(parent)
{
m_ui.setupUi(this);
+ m_ui.m_closeButton->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon());
connect(m_ui.m_closeButton, &QToolButton::clicked, this, &Navigator::hideFrame);
m_sizeGrip = new SizeGrip(this);
m_sizeGrip->setGeometry(0, 0, 18, 18);
diff --git a/src/plugins/scxmleditor/common/navigator.ui b/src/plugins/scxmleditor/common/navigator.ui
index cedf2069b1f..fc0d24cd9b6 100644
--- a/src/plugins/scxmleditor/common/navigator.ui
+++ b/src/plugins/scxmleditor/common/navigator.ui
@@ -89,13 +89,6 @@
30
-
-
-
-
-
- :/scxmleditor/images/icon-close.png:/scxmleditor/images/icon-close.png
-
true
@@ -139,8 +132,6 @@
1
-
-
-
+
diff --git a/src/plugins/scxmleditor/common/shapegroupwidget.cpp b/src/plugins/scxmleditor/common/shapegroupwidget.cpp
index 6ec8a84ef1c..b6ebaf00249 100644
--- a/src/plugins/scxmleditor/common/shapegroupwidget.cpp
+++ b/src/plugins/scxmleditor/common/shapegroupwidget.cpp
@@ -28,6 +28,7 @@
#include "shapeprovider.h"
#include
+#include
using namespace ScxmlEditor::PluginInterface;
using namespace ScxmlEditor::Common;
@@ -36,6 +37,7 @@ ShapeGroupWidget::ShapeGroupWidget(ShapeProvider *shapeProvider, int groupIndex,
: QWidget(parent)
{
m_ui.setupUi(this);
+ m_ui.m_closeButton->setIcon(Utils::Icons::COLLAPSE_TOOLBAR.icon());
auto layout = new Utils::FlowLayout;
layout->setContentsMargins(0, 0, 0, 0);
@@ -52,7 +54,9 @@ ShapeGroupWidget::ShapeGroupWidget(ShapeProvider *shapeProvider, int groupIndex,
connect(m_ui.m_closeButton, &QToolButton::clicked, this, [this]() {
m_ui.m_content->setVisible(!m_ui.m_content->isVisible());
- m_ui.m_closeButton->setIcon(QIcon(QLatin1String(m_ui.m_content->isVisible() ? ":/scxmleditor/images/arrow_down.png" : ":/scxmleditor/images/arrow_right.png")));
+ m_ui.m_closeButton->setIcon(m_ui.m_content->isVisible()
+ ? Utils::Icons::COLLAPSE_TOOLBAR.icon()
+ : Utils::Icons::EXPAND_TOOLBAR.icon());
});
m_ui.m_content->setLayout(layout);
diff --git a/src/plugins/scxmleditor/common/shapegroupwidget.ui b/src/plugins/scxmleditor/common/shapegroupwidget.ui
index f01bc9fccc2..41a20880ab0 100644
--- a/src/plugins/scxmleditor/common/shapegroupwidget.ui
+++ b/src/plugins/scxmleditor/common/shapegroupwidget.ui
@@ -120,13 +120,6 @@
-
-
- ...
-
-
-
- :/scxmleditor/images/arrow_down.png:/scxmleditor/images/arrow_down.png
-
false
@@ -159,8 +152,6 @@
-
-
-
+
diff --git a/src/plugins/scxmleditor/common/structure.cpp b/src/plugins/scxmleditor/common/structure.cpp
index ee575ed7560..18eaf042055 100644
--- a/src/plugins/scxmleditor/common/structure.cpp
+++ b/src/plugins/scxmleditor/common/structure.cpp
@@ -42,6 +42,7 @@
#include
#include
+#include
#include
using namespace ScxmlEditor::PluginInterface;
@@ -103,6 +104,8 @@ Structure::Structure(QWidget *parent)
{
m_ui.setupUi(this);
+ m_ui.m_checkboxButton->setIcon(Utils::Icons::FILTER.icon());
+
addCheckbox(tr("Common states"), State);
addCheckbox(tr("Metadata"), Metadata);
addCheckbox(tr("Other tags"), OnEntry);
diff --git a/src/plugins/scxmleditor/common/structure.ui b/src/plugins/scxmleditor/common/structure.ui
index fc7c5e47453..65b7b385647 100644
--- a/src/plugins/scxmleditor/common/structure.ui
+++ b/src/plugins/scxmleditor/common/structure.ui
@@ -153,13 +153,6 @@
-
-
- ...
-
-
-
- :/scxmleditor/images/icon-filter.png:/scxmleditor/images/icon-filter.png
-
true
diff --git a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
index 58e94fc6cd6..c090e680cf2 100644
--- a/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/actionhandler.cpp
@@ -26,6 +26,8 @@
#include "actionhandler.h"
#include "mytypes.h"
+#include
+
#include
using namespace ScxmlEditor::PluginInterface;
@@ -36,43 +38,43 @@ ActionHandler::ActionHandler(QObject *parent)
using AH = ActionHandler;
const struct {
- const char *icon;
+ const Utils::Icon icon;
QString name;
QString tooltip;
const char *keyseq;
bool checkable;
} actionInfos[] = {
- { ":/scxmleditor/images/icon-zoom-in.png", AH::tr("Zoom In"), AH::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
- { ":/scxmleditor/images/icon-zoom-out.png", AH::tr("Zoom Out"), AH::tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false },
- { ":/scxmleditor/images/icon-fit-screen.png", AH::tr("Fit to View"), AH::tr("Fit to View (F11)"), "F11", false },
- { ":/scxmleditor/images/icon-pan.png", AH::tr("Panning"), AH::tr("Panning (Shift)"), "Shift", true },
+ { Utils::Icon(":/scxmleditor/images/icon-zoom-in.png"), AH::tr("Zoom In"), AH::tr("Zoom In (Ctrl + + / Ctrl + Wheel)"), "Ctrl++", false },
+ { Utils::Icon(":/scxmleditor/images/icon-zoom-out.png"), AH::tr("Zoom Out"), AH::tr("Zoom Out (Ctrl + - / Ctrl + Wheel)"), "Ctrl+-", false },
+ { Utils::Icon(":/scxmleditor/images/icon-fit-screen.png"), AH::tr("Fit to View"), AH::tr("Fit to View (F11)"), "F11", false },
+ { Utils::Icon(":/scxmleditor/images/icon-pan.png"), AH::tr("Panning"), AH::tr("Panning (Shift)"), "Shift", true },
- { ":/scxmleditor/images/icon-search.png", AH::tr("Magnifier"), AH::tr("Magnifier Tool (Alt)"), "Alt", true },
- { ":/scxmleditor/images/navigator.png", AH::tr("Navigator"), AH::tr("Navigator (Ctrl+E)"), "Ctrl+E", true },
+ { Utils::Icons::ZOOM_TOOLBAR, AH::tr("Magnifier"), AH::tr("Magnifier Tool (Alt)"), "Alt", true },
+ { Utils::Icon(":/scxmleditor/images/navigator.png"), AH::tr("Navigator"), AH::tr("Navigator (Ctrl+E)"), "Ctrl+E", true },
- { ":/scxmleditor/images/icon-copy.png", AH::tr("Copy"), AH::tr("Copy (Ctrl + C)"), "Ctrl+C", false },
- { ":/scxmleditor/images/icon-cut.png", AH::tr("Cut"), AH::tr("Cut (Ctrl + X)"), "Ctrl+X", false },
- { ":/scxmleditor/images/icon-paste.png", AH::tr("Paste"), AH::tr("Paste (Ctrl + V)"), "Ctrl+V", false },
- { ":/scxmleditor/images/screenshot.png", AH::tr("Screenshot"), AH::tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false },
- { ":/scxmleditor/images/icon-export-canvas.png", AH::tr("Export to Image"), AH::tr("Export to Image"), "Ctrl+Shift+E", false },
- { ":/scxmleditor/images/fullnamespace.png", AH::tr("Toggle Full Namespace"), AH::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true },
+ { Utils::Icons::COPY, AH::tr("Copy"), AH::tr("Copy (Ctrl + C)"), "Ctrl+C", false },
+ { Utils::Icons::CUT, AH::tr("Cut"), AH::tr("Cut (Ctrl + X)"), "Ctrl+X", false },
+ { Utils::Icons::PASTE, AH::tr("Paste"), AH::tr("Paste (Ctrl + V)"), "Ctrl+V", false },
+ { Utils::Icon(":/scxmleditor/images/screenshot.png"), AH::tr("Screenshot"), AH::tr("Screenshot (Ctrl + Shift + C)"), "Ctrl+Shift+C", false },
+ { Utils::Icon(":/scxmleditor/images/icon-export-canvas.png"), AH::tr("Export to Image"), AH::tr("Export to Image"), "Ctrl+Shift+E", false },
+ { Utils::Icon(":/scxmleditor/images/fullnamespace.png"), AH::tr("Toggle Full Namespace"), AH::tr("Toggle Full Namespace"), "Ctrl+Shift+N", true },
- { ":/scxmleditor/images/align_left.png", AH::tr("Align Left"), AH::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false },
- { ":/scxmleditor/images/align_right.png", AH::tr("Align Right"), AH::tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false },
- { ":/scxmleditor/images/align_top.png", AH::tr("Align Top"), AH::tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false },
- { ":/scxmleditor/images/align_bottom.png", AH::tr("Align Bottom"), AH::tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false },
- { ":/scxmleditor/images/align_horizontal.png", AH::tr("Align Horizontal"), AH::tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false },
- { ":/scxmleditor/images/align_vertical.png", AH::tr("Align Vertical"), AH::tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false },
- { ":/scxmleditor/images/adjust_width.png", AH::tr("Adjust Width"), AH::tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false },
- { ":/scxmleditor/images/adjust_height.png", AH::tr("Adjust Height"), AH::tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false },
- { ":/scxmleditor/images/adjust_size.png", AH::tr("Adjust Size"), AH::tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false },
+ { Utils::Icon(":/scxmleditor/images/align_left.png"), AH::tr("Align Left"), AH::tr("Align Left (Ctrl+L,1)"), "Ctrl+L,1", false },
+ { Utils::Icon(":/scxmleditor/images/align_right.png"), AH::tr("Align Right"), AH::tr("Align Right (Ctrl+L,2)"), "Ctrl+L,2", false },
+ { Utils::Icon(":/scxmleditor/images/align_top.png"), AH::tr("Align Top"), AH::tr("Align Top (Ctrl+L,3)"), "Ctrl+L,3", false },
+ { Utils::Icon(":/scxmleditor/images/align_bottom.png"), AH::tr("Align Bottom"), AH::tr("Align Bottom (Ctrl+L,4)"), "Ctrl+L,4", false },
+ { Utils::Icon(":/scxmleditor/images/align_horizontal.png"), AH::tr("Align Horizontal"), AH::tr("Align Horizontal (Ctrl+L,5)"), "Ctrl+L,5", false },
+ { Utils::Icon(":/scxmleditor/images/align_vertical.png"), AH::tr("Align Vertical"), AH::tr("Align Vertical (Ctrl+L,6)"), "Ctrl+L,6", false },
+ { Utils::Icon(":/scxmleditor/images/adjust_width.png"), AH::tr("Adjust Width"), AH::tr("Adjust Width (Ctrl+L,7)"), "Ctrl+L,7", false },
+ { Utils::Icon(":/scxmleditor/images/adjust_height.png"), AH::tr("Adjust Height"), AH::tr("Adjust Height (Ctrl+L,8)"), "Ctrl+L,8", false },
+ { Utils::Icon(":/scxmleditor/images/adjust_size.png"), AH::tr("Adjust Size"), AH::tr("Adjust Size (Ctrl+L,9)"), "Ctrl+L,9", false },
- { ":/scxmleditor/images/statistics.png", AH::tr("Show Statistics..."), AH::tr("Show Statistics"), "", false }
+ { Utils::Icon(":/scxmleditor/images/statistics.png"), AH::tr("Show Statistics..."), AH::tr("Show Statistics"), "", false }
};
// Init actions
- for (auto info: actionInfos) {
- auto action = new QAction(QIcon(QLatin1String(info.icon)), info.name, this);
+ for (const auto &info: actionInfos) {
+ auto action = new QAction(info.icon.icon(), info.name, this);
action->setCheckable(info.checkable);
action->setToolTip(info.tooltip);
action->setShortcut(QKeySequence(QLatin1String(info.keyseq)));
diff --git a/src/plugins/scxmleditor/scxmleditordata.cpp b/src/plugins/scxmleditor/scxmleditordata.cpp
index 76f01b692d7..7e2fb96eaf7 100644
--- a/src/plugins/scxmleditor/scxmleditordata.cpp
+++ b/src/plugins/scxmleditor/scxmleditordata.cpp
@@ -45,6 +45,7 @@
#include
#include
+#include
#include
@@ -136,11 +137,11 @@ void ScxmlEditorData::fullInit()
// Create undo/redo group/actions
m_undoGroup = new QUndoGroup(m_widgetToolBar);
m_undoAction = m_undoGroup->createUndoAction(m_widgetToolBar);
- m_undoAction->setIcon(QIcon(":/scxmleditor/images/icon-undo.png"));
+ m_undoAction->setIcon(Utils::Icons::UNDO.icon());
m_undoAction->setToolTip(tr("Undo (Ctrl + Z)"));
m_redoAction = m_undoGroup->createRedoAction(m_widgetToolBar);
- m_redoAction->setIcon(QIcon(":/scxmleditor/images/icon-redo.png"));
+ m_redoAction->setIcon(Utils::Icons::REDO.icon());
m_redoAction->setToolTip(tr("Redo (Ctrl + Y)"));
ActionManager::registerAction(m_undoAction, Core::Constants::UNDO, m_contexts);