summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@theqtcompany.com>2015-11-04 17:51:18 +0100
committerAlessandro Portale <alessandro.portale@theqtcompany.com>2015-11-05 08:46:19 +0000
commit18365814ad06e2f699d8e08a5780e7e43bcdeefa (patch)
treef3dcfdcdb29727fe7acaf62ae99a0688c8fbb215 /src
parentb0771016fe2064a49fcb2a657f30dfe2a2d1084b (diff)
downloadqt-creator-18365814ad06e2f699d8e08a5780e7e43bcdeefa.tar.gz
Find: Add a HighDPI wrap indicator
Change-Id: Id31e779a98b3f048a42838590b6ace02c2b86bfd Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/find/find.qrc1
-rw-r--r--src/plugins/coreplugin/find/ifindsupport.cpp4
-rw-r--r--src/plugins/coreplugin/find/images/wrapindicator.pngbin1949 -> 1312 bytes
-rw-r--r--src/plugins/coreplugin/find/images/wrapindicator@2x.pngbin0 -> 2271 bytes
-rw-r--r--src/tools/icons/qtcreatoricons.svg29
5 files changed, 33 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/find/find.qrc b/src/plugins/coreplugin/find/find.qrc
index dc4b240bfe..e1de185dac 100644
--- a/src/plugins/coreplugin/find/find.qrc
+++ b/src/plugins/coreplugin/find/find.qrc
@@ -6,6 +6,7 @@
<file>images/expand.png</file>
<file>images/expand@2x.png</file>
<file>images/wrapindicator.png</file>
+ <file>images/wrapindicator@2x.png</file>
<file>images/preservecase.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/coreplugin/find/ifindsupport.cpp b/src/plugins/coreplugin/find/ifindsupport.cpp
index 87665ff4d0..8aa29995c8 100644
--- a/src/plugins/coreplugin/find/ifindsupport.cpp
+++ b/src/plugins/coreplugin/find/ifindsupport.cpp
@@ -31,6 +31,7 @@
#include "ifindsupport.h"
#include <utils/fadingindicator.h>
+#include <utils/stylehelper.h>
using namespace Core;
@@ -59,5 +60,6 @@ int IFindSupport::replaceAll(const QString &before, const QString &after, FindFl
void IFindSupport::showWrapIndicator(QWidget *parent)
{
- Utils::FadingIndicator::showPixmap(parent, QLatin1String(":/find/images/wrapindicator.png"));
+ Utils::FadingIndicator::showPixmap(parent, Utils::StyleHelper::dpiSpecificImageFile(
+ QLatin1String(":/find/images/wrapindicator.png")));
}
diff --git a/src/plugins/coreplugin/find/images/wrapindicator.png b/src/plugins/coreplugin/find/images/wrapindicator.png
index a4f8ddf417..dcca1cee66 100644
--- a/src/plugins/coreplugin/find/images/wrapindicator.png
+++ b/src/plugins/coreplugin/find/images/wrapindicator.png
Binary files differ
diff --git a/src/plugins/coreplugin/find/images/wrapindicator@2x.png b/src/plugins/coreplugin/find/images/wrapindicator@2x.png
new file mode 100644
index 0000000000..2869ccbd1b
--- /dev/null
+++ b/src/plugins/coreplugin/find/images/wrapindicator@2x.png
Binary files differ
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index be0cd63442..54b15ba8ed 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -1229,6 +1229,35 @@
y="0"
x="0" />
</g>
+ <g
+ id="src/plugins/coreplugin/find/images/wrapindicator">
+ <rect
+ ry="11"
+ y="450"
+ x="279"
+ height="50"
+ width="50"
+ id="rect4682"
+ style="opacity:1;fill:#a5a7a7;fill-opacity:0.8;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ d="m 319.99025,475.55839 a 16,16 0 0 1 -11.78175,14.87821 16,16 0 0 1 -17.70276,-6.83981 16,16 0 0 1 1.28254,-18.93477 16,16 0 0 1 18.46342,-4.3901"
+ sodipodi:end="5.1138147"
+ sodipodi:start="0.034906585"
+ sodipodi:ry="16"
+ sodipodi:rx="16"
+ sodipodi:cy="475"
+ sodipodi:cx="304"
+ sodipodi:type="arc"
+ id="path4692"
+ style="opacity:1;fill:none;fill-opacity:0.8;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccc"
+ inkscape:connector-curvature="0"
+ id="path4694"
+ d="m 322.76517,465.96966 -17.45581,2.61872 5.9902,-17.11022"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
</g>
<g
inkscape:groupmode="layer"