From ef208bf8a4f290fa9251c8f64616922fc4ea0275 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 27 Sep 2016 14:32:12 +0200 Subject: [PATCH] ScxmlEditor: Remove duplicated icons Some of the icons that came with the scxml editor were already present elsewhere in Qt Creator in a themable/HighDPI-able form. Remove the own .png files, use the existing icons. Change-Id: I891305faee45eeb39dac4135d2ff96fc06727731 Reviewed-by: Alessandro Portale --- src/plugins/scxmleditor/common/common.qrc | 11 ---- .../scxmleditor/common/images/arrow_down.png | Bin 177 -> 0 bytes .../scxmleditor/common/images/arrow_right.png | Bin 136 -> 0 bytes .../scxmleditor/common/images/icon-close.png | Bin 179 -> 0 bytes .../scxmleditor/common/images/icon-copy.png | Bin 1519 -> 0 bytes .../scxmleditor/common/images/icon-cut.png | Bin 1736 -> 0 bytes .../scxmleditor/common/images/icon-filter.png | Bin 146 -> 0 bytes .../scxmleditor/common/images/icon-paste.png | Bin 1861 -> 0 bytes .../scxmleditor/common/images/icon-redo.png | Bin 745 -> 0 bytes .../scxmleditor/common/images/icon-search.png | Bin 997 -> 0 bytes .../scxmleditor/common/images/icon-undo.png | Bin 726 -> 0 bytes .../scxmleditor/common/images/search.png | Bin 919 -> 0 bytes src/plugins/scxmleditor/common/navigator.cpp | 3 + src/plugins/scxmleditor/common/navigator.ui | 11 +--- .../scxmleditor/common/shapegroupwidget.cpp | 6 +- .../scxmleditor/common/shapegroupwidget.ui | 11 +--- src/plugins/scxmleditor/common/structure.cpp | 3 + src/plugins/scxmleditor/common/structure.ui | 7 --- .../plugin_interface/actionhandler.cpp | 52 +++++++++--------- src/plugins/scxmleditor/scxmleditordata.cpp | 5 +- 20 files changed, 43 insertions(+), 66 deletions(-) delete mode 100644 src/plugins/scxmleditor/common/images/arrow_down.png delete mode 100644 src/plugins/scxmleditor/common/images/arrow_right.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-close.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-copy.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-cut.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-filter.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-paste.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-redo.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-search.png delete mode 100644 src/plugins/scxmleditor/common/images/icon-undo.png delete mode 100644 src/plugins/scxmleditor/common/images/search.png 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 f94254fa266eab2c1d4044915d1fd53a63b077ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdu3Nd_r9R|NqYb1GjJAj*gDL zef##ZWy@~ex^?^Z?RCb=y$lQtTqQw%!3=C%B8EOmjSK!*OT7qVU|_KDba4#fh)zyW z;N0L~*qqM9?7WP5!a}>=#@t;@6As4AoDj(qmSUH@i*d%mm`I+h=~)b^21XCq8NM81 TuQ;~n4%lK(S3j3^P6FVdQ&MBb@0A&#@6951J 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 b2233f150ecdc76f22ba1e91380a5ea6dc42985a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICT0c(20oEV=?n}EJOMr-t_%ze4KVO`f>$;J z0|QG*kY6xEe8}dAGo^(L3=Bb@E{-7*;mHXL1U5JtHrFt-7@x3DNLaycc%$CH;2*Om zqo;y2%PVPzO$n|Est&I92fZ4){y9%!5VdtkKCtvb*TY+hY=_o1M01t1-AOE1K8b;$ YMoCfIdzRlG1_lNOPgg&ebxsLQ0B1=yH2?qr 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 7d1e9455bf469d081893e7947e2dfffe499d83f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1519 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 Ib4q9e0K;l7ng9R* 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 9ed69c43409066fb462a027ce5b245eabe2c7907..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(1Vrjj7PU7&Z4)aSFGUA36f`M zbcqg_xT?!!$*QQOp0n@fiQSgee_SY}pIn{OZ~IN>{+;TI8HMII{gmV$dfd0UBYF0J z`M>9PitT>H^KZTOko&%q?QioVp>OhYGJj6uuv=jN*IF>J`}1aTx!Y$q`po;&$>{ap z^rAoi!vCLqz8+rxZ^ygz@8yMSLbOg*8QK|Y_Psz?9+*XP!siBq$jrLcRB_Uxr0H;ozs^`C7p|K-+`pt-Jf^CXU~_Gm+OaJzjoav>(%VP3eS4_<9gz&KAy;5 z@YtefdLEa8g4!8rqs?)}zMaYI_j)K_)xE6az4kUY^`H0n>s)U?E0Zxl(0|P| z!~Di`c2kQu7fo}84zo+9WtqP(Ts^(j*!%h!_RHn_xeIqIGH|7`d~!YAS6ybbY;(@d zOB`HlL|?tGxpgZma>tCM_lxfzPnw|ls?7Tz7yN$m@V=}--H*>V zPX6$}C;P-iU>(20)BXz)uV&A-{NZ8VeOj?~kE6?n+V)>2ZaG3Ylj!Gel|I zh${v5_Wg2Enl?$$S7v9ZZ!O|n zdwN@b4L8darnim)8FyB+^Rgs6X3y|_ZdqB<@ZH~c^M~v9k6+k$Fb1@!Iv=05)~4XU zoK%vX_4`*T+3CU)XZh**?r&dgaKJb3V3xea11qlM`pMl5udVlde9!1MZQg-5^|KZy zGj3BzVBuW2So6W&&-KsO$;#&3yW%8pMJcE^{HoWcZCRoR)|fr`#W3|-h}4wDcALVr zt*oRfpI@!N^yk9oIWhbCUAR=Zm+HK^%hx;ey5UmMDOwL-DZOBrQxvS-y4FHLesbhv zsdZUauO`1w3tw)5Uv* zG#(v}T=!+U;k6{!4N5v^o=ZshT(0|WH|A_36%rZIeFS`jtKX zK=H!*3!j4g*)uaAZC>tv<6`L1J5DEFYP*IUf7~NuapvX@r7sTQjk=AWPJKvXofzt> zX)dsx@qtA_uFaCv+qNe5KV_Vk`xWRJc0^x2^l2gc%h=4+iZyq9zxr;-zRWdg-om9@ zxlNhF-n26`9o-q*ki;oxDUkRkUcdNff78E5+aqrjH%zSb@O4gPjk>*HH*1+*+|qBi z1ZPQ$cb3R6vwxXm8@2a4PK<)ST|984(+_{S5;{SjSa%8JiuwduL9l z?R>2=+4c;dkHCt|N%B4gFMh8tbYJf7JM~~xVsNx_-{T861b$y=>|b&}-8-mWVXZ zA_k*;<)@DBdi>6d3qES`^eJtXWLWBwvouF+smX%CzW$;`8jBVz@`;z;yw_I#%y}I{ zc9DFp1ydJ_M5SGxu!pg>a7USJ`;i_~(h6(-ZA{GgZB>J((GM%E;R2 z?ABt=b2h(I_jP`Nrx*Gd>bfc;;v%vt-}V8&`Oae04MLVLevy?~kRux%u}PJ3BjWR%Y(Z zQt5KGJjX;f!N}CM_44;l)c*ey`0nlE>SO)u=XmZb|8}B$!L*|ecUX)U;XB}c}RH5 zjL_NVKm7UVY@3i0@Ai@L!Uxw+QEXcN>*gdfB>L4Uvc(BM`?{1LpPq6b zUjF@k-2Z>S3_m?R+bzHD?cD`GpTCbcV~iASv#9D3M`TZ}}<>7wm z6_wwm4xgWIzv0n(`#OUUUYZSGZZj*-6Sfq!RQ&lzR-oF;%gfG5sG9Ler@#K(4r{yh zpRX_GJ}z0uz;DR(iQfKiIe(}&BepR>(5BqTA(zA+-ukMk(g1pal7H)~x| zZbdMP+A^!jIVSA*f8>CD!w+j=cINdB3uFxBLK4K@wEcQy!Fbql=k`{2&*=}Zub*%6 z@%4Ip$s;LG9ACvII&P8cIM3Al+?tVl)z2$EOSUd)m9&^q|8PC?lBW{y;&w7{Eql3P zP7eQ;2MThw3h(1slgxxpIZSA7m2_Wy=3zdgLjxnjK0nv<|7{<7F)%PNc)I$ztaD0e F0sx?gRcZhL 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 39239be15d76016ad6f21a67bbc981af7b03d29b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 997 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 + #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);