From d10d0f73e9704c026fda3e262c5aa1cfeb3f4a9d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 11 Oct 2016 01:04:14 +0200 Subject: [PATCH] TextEditor: Highpi-able and themable refactor marker Change-Id: I1866e4c5eba7b1afd60e2c461644cbfd6b7efd75 Reviewed-by: David Schulz --- src/plugins/texteditor/images/lightbulb.png | Bin 0 -> 167 bytes .../texteditor/images/lightbulb@2x.png | Bin 0 -> 175 bytes .../texteditor/images/lightbulbcap.png | Bin 0 -> 115 bytes .../texteditor/images/lightbulbcap@2x.png | Bin 0 -> 126 bytes .../texteditor/images/refactormarker.png | Bin 1361 -> 0 bytes src/plugins/texteditor/refactoroverlay.cpp | 6 ++- src/plugins/texteditor/texteditor.qrc | 5 ++- src/tools/icons/qtcreatoricons.svg | 36 ++++++++++++++++++ 8 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 src/plugins/texteditor/images/lightbulb.png create mode 100644 src/plugins/texteditor/images/lightbulb@2x.png create mode 100644 src/plugins/texteditor/images/lightbulbcap.png create mode 100644 src/plugins/texteditor/images/lightbulbcap@2x.png delete mode 100644 src/plugins/texteditor/images/refactormarker.png diff --git a/src/plugins/texteditor/images/lightbulb.png b/src/plugins/texteditor/images/lightbulb.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2e904000d85fe12bf661010dc0db243a2d1cb2 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0y~yU;weXS(q6Z7`8YtYBMk}=mz+NxPm0OxVX8wg@lBJ zg@r{#M8w3zEG#VY^76X6x|S?ivUKUv*RNl{ef#$R|NjzmGx`}A7)(7~978x{lPk8z ztoS8+*qe>5t&+#TAw}kJvck*bADBG88Se2-NU%NrA&;5)yLDT+LW3t0gSnIZg}<5w RtPBhc44$rjF6*2Ung9aYGk5?1 literal 0 HcmV?d00001 diff --git a/src/plugins/texteditor/images/lightbulb@2x.png b/src/plugins/texteditor/images/lightbulb@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ec43d8f1c1f338a7bac4e2db2146620fbed69e8c GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0y~yU=U$oU=ZVAU|?W)s`dC50|P^ur;B5VM0oNKex~=! zerpsKYyb4CXMbkY(4pzX6QE!ssuppkfyGOqX}3hc0kaJYlvgbfj+h`GIze1VqeDxB zMQn?c=oU8abMB%s3}Sy4cIYho!Tji)?1`q?iFRD>9j*uV{*-yguy1+6!T-gHO~rzY dO?+$%6&OONvn;w6!LAE(iKnZd%Q~loCIAnFIuif@ literal 0 HcmV?d00001 diff --git a/src/plugins/texteditor/images/lightbulbcap.png b/src/plugins/texteditor/images/lightbulbcap.png new file mode 100644 index 0000000000000000000000000000000000000000..f860c9c408022c6b4a9ccd72db4ea723275305ed GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0y~yU;weXS(q6Z7`8YtYBMk}@CW#WxH2#>I5;?jhKAPH z*Z=?j|6;0sHUk5Lyr+v}2uE~s0V5;ZA`f*{QH7Uh5|~tEB_bRiHRI14-?iy0WWg+Q3`(%rg0 z3=9k`>5jgR3=A9lYJLY!W?*1YNcITwWnidMWngG%W?=aFpMjy_B?CjL0RzLU1O^7H z84L{K`IF+0x-l@Y9QSl_45_$PdMP$XBvgd`!~dGx@{M<6w{4v2#kxDm(W|wCGr^;S zU&=K=$RyB5Vb2T+R{0N{s)kujNjVdQdic%MgbZe6bOdlu+qT8kTXRdd#H}scQoX%* z=YFqFFH3tDbKb{XR_K-QznRv%i|f9hxhZP-JVN8vdyXvM9}e%=>`VN!w>v$W+2(iq zfnt%jOi?d(+wx!ADHu7K;hM)zH_v+3w%I5Cs;z0QPj-pCAEchYV`CUcJzMt8x)d9^ zB{p4ibysPauIN4G`#W;g#_W?C5h-0Wq7A)fFnyhVYwM*;<+r-b%EGuBOE-K9jQFK7 z<Dv8kBhyViw2a{G@S3EO?mEa!BqWK_a~1=l`5);m90o=qp2>CP#q zxGij(@>O-ro*j5#xGSD1Fzi`DB-@JO#V&jq=6?ILq_;gi)U7!+f3D%BmAOebjjueF zWw5fi&fv(DUe1^;Glxmh{qCvHI~*+dD-)MZUVo!4cV~g&(j0Xi$)h(n)^7MxS701= zLc&5_q$O$6xj@c2?`I@*+D$&dvW><2+oY$5-XC5xqf=pd`;0Q)s5ikgveY0M2Up5%GoD*W$ zvA{|5fS16e?LuM4ScJ|xb`;O!4Q~!U;J!d7J2ANJbCtklgU{&)e=>+_zk7W-bj$8# z=}Q)IdF;#D5Xmg2y}N7GFToip6EhDt$S{N^e*AWrcjvpFQ$l6W{R$t3auX_%{ z(QOvIJo`YJg^?_C)`OqSyc>%8p8l)w|HDwRdf}9?CCvIYMM>Wttyy>f^!bNgmPZyn z=eX%~lkMhrqtacScIzF!eG_?mduz{0f zZisXl&!(6NhnAvAX0c{GdEfk=InVRRD32~r=eVx_yKw1B4)Jr_7QOtleMiMg_P3wb zi8&-Rl*%5k-}3*m;fbQe2P{t|RNVp@7yf--to)L*@N;(dw|UMVU%fZXlRfnE*;dOnn8xP#l6>}bvrpo#tFz9%x(wZ0 zy3@4`?Szl*{h_7)F~#iSMd`zjA7)*-az#Og@343j>&f6*`)p$x8!s;P%j36i+a0_# zMaPCKon=yne3F&qyLInncTK)g_#z^F)%W + #include #include @@ -37,7 +39,9 @@ RefactorOverlay::RefactorOverlay(TextEditor::TextEditorWidget *editor) : QObject(editor), m_editor(editor), m_maxWidth(0), - m_icon(QLatin1String(":/texteditor/images/refactormarker.png")) + m_icon(Utils::Icon({ + {QLatin1String(":/texteditor/images/lightbulbcap.png"), Utils::Theme::PanelTextColorMid}, + {QLatin1String(":/texteditor/images/lightbulb.png"), Utils::Theme::IconsWarningColor}}, Utils::Icon::Tint).icon()) { } diff --git a/src/plugins/texteditor/texteditor.qrc b/src/plugins/texteditor/texteditor.qrc index 7f829e91594..286644c33a7 100644 --- a/src/plugins/texteditor/texteditor.qrc +++ b/src/plugins/texteditor/texteditor.qrc @@ -2,7 +2,10 @@ images/finddocuments.png images/finddirectory.png - images/refactormarker.png + images/lightbulb.png + images/lightbulb@2x.png + images/lightbulbcap.png + images/lightbulbcap@2x.png images/snippet.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index e4149743035..a267532496e 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3360,6 +3360,42 @@ style="fill:#000000" id="rect5132-95" /> + + + + + + + +