diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2016-10-19 17:31:15 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2016-10-24 12:04:26 +0000 |
commit | f45293dae6b3b9012b6f64bfc8389b4122ae40fb (patch) | |
tree | 6e7350697a02b7d2fa334d3ee1e5df5a6839de5c | |
parent | 6cd31a2b985e419531fe7c67e55be4c1de2f37cf (diff) | |
download | qt-creator-f45293dae6b3b9012b6f64bfc8389b4122ae40fb.tar.gz |
BareMetal: Themable, HighDPI-able device icon
Change-Id: Id8d9c0885895f582dbb034546b701ec82f1492e6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r-- | src/plugins/baremetal/baremetal.pro | 3 | ||||
-rw-r--r-- | src/plugins/baremetal/baremetal.qbs | 1 | ||||
-rw-r--r-- | src/plugins/baremetal/baremetal.qrc | 8 | ||||
-rw-r--r-- | src/plugins/baremetal/baremetaldevice.cpp | 13 | ||||
-rw-r--r-- | src/plugins/baremetal/images/baremetaldevice.png | bin | 0 -> 184 bytes | |||
-rw-r--r-- | src/plugins/baremetal/images/baremetaldevice@2x.png | bin | 0 -> 277 bytes | |||
-rw-r--r-- | src/plugins/baremetal/images/baremetaldevicesmall.png | bin | 0 -> 183 bytes | |||
-rw-r--r-- | src/plugins/baremetal/images/baremetaldevicesmall@2x.png | bin | 0 -> 194 bytes | |||
-rw-r--r-- | src/tools/icons/qtcreatoricons.svg | 122 |
9 files changed, 147 insertions, 0 deletions
diff --git a/src/plugins/baremetal/baremetal.pro b/src/plugins/baremetal/baremetal.pro index b79db4aac5..f77ad11412 100644 --- a/src/plugins/baremetal/baremetal.pro +++ b/src/plugins/baremetal/baremetal.pro @@ -47,3 +47,6 @@ HEADERS += baremetalplugin.h \ openocdgdbserverprovider.h \ defaultgdbserverprovider.h \ stlinkutilgdbserverprovider.h + +RESOURCES += \ + baremetal.qrc diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs index 81b4503f7d..0474e562d1 100644 --- a/src/plugins/baremetal/baremetal.qbs +++ b/src/plugins/baremetal/baremetal.qbs @@ -13,6 +13,7 @@ QtcPlugin { Depends { name: "QtSupport" } files: [ + "baremetal.qrc", "baremetalconstants.h", "baremetalcustomrunconfiguration.cpp", "baremetalcustomrunconfiguration.h", "baremetaldevice.cpp", "baremetaldevice.h", diff --git a/src/plugins/baremetal/baremetal.qrc b/src/plugins/baremetal/baremetal.qrc new file mode 100644 index 0000000000..8badc224d0 --- /dev/null +++ b/src/plugins/baremetal/baremetal.qrc @@ -0,0 +1,8 @@ +<RCC> + <qresource prefix="/baremetal"> + <file>images/baremetaldevice.png</file> + <file>images/baremetaldevice@2x.png</file> + <file>images/baremetaldevicesmall.png</file> + <file>images/baremetaldevicesmall@2x.png</file> + </qresource> +</RCC> diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp index 67c80b7c41..643355c06a 100644 --- a/src/plugins/baremetal/baremetaldevice.cpp +++ b/src/plugins/baremetal/baremetaldevice.cpp @@ -33,6 +33,7 @@ #include <coreplugin/id.h> #include <ssh/sshconnection.h> +#include <utils/icon.h> #include <utils/qtcassert.h> #include <QCoreApplication> @@ -152,16 +153,28 @@ DeviceProcess *BareMetalDevice::createProcess(QObject *parent) const return new GdbServerProviderProcess(sharedFromThis(), parent); } +static const QList<Utils::Icon> &bareMetalDeviceIcon() +{ + static const QList<Utils::Icon> icon = { + Utils::Icon({{":/baremetal/images/baremetaldevicesmall.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint), + Utils::Icon({{":/baremetal/images/baremetaldevice.png", + Utils::Theme::IconsBaseColor}})}; + return icon; +} + BareMetalDevice::BareMetalDevice(const QString &name, Core::Id type, MachineType machineType, Origin origin, Core::Id id) : IDevice(type, origin, machineType, id) { setDisplayName(name); + setDeviceIcon(bareMetalDeviceIcon()); } BareMetalDevice::BareMetalDevice(const BareMetalDevice &other) : IDevice(other) { setGdbServerProviderId(other.gdbServerProviderId()); + setDeviceIcon(bareMetalDeviceIcon()); } } //namespace Internal diff --git a/src/plugins/baremetal/images/baremetaldevice.png b/src/plugins/baremetal/images/baremetaldevice.png Binary files differnew file mode 100644 index 0000000000..34ac48c118 --- /dev/null +++ b/src/plugins/baremetal/images/baremetaldevice.png diff --git a/src/plugins/baremetal/images/baremetaldevice@2x.png b/src/plugins/baremetal/images/baremetaldevice@2x.png Binary files differnew file mode 100644 index 0000000000..d1341f90ee --- /dev/null +++ b/src/plugins/baremetal/images/baremetaldevice@2x.png diff --git a/src/plugins/baremetal/images/baremetaldevicesmall.png b/src/plugins/baremetal/images/baremetaldevicesmall.png Binary files differnew file mode 100644 index 0000000000..19aeca1b35 --- /dev/null +++ b/src/plugins/baremetal/images/baremetaldevicesmall.png diff --git a/src/plugins/baremetal/images/baremetaldevicesmall@2x.png b/src/plugins/baremetal/images/baremetaldevicesmall@2x.png Binary files differnew file mode 100644 index 0000000000..633f0d847a --- /dev/null +++ b/src/plugins/baremetal/images/baremetaldevicesmall@2x.png diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 7002b7fd40..a413bed3b5 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -6424,5 +6424,127 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" /> </g> + <g + transform="translate(-48,32)" + id="src/plugins/baremetal/images/baremetaldevice"> + <rect + style="fill:#ffffff" + x="554" + y="347" + width="32" + height="32" + id="rect5230-4-4" /> + <path + style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-opacity:1" + d="m 563.5,354.5 13,0 2,2 0,13 -2,2 -13,0 -2,-2 0,-13 z" + id="rect5155" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccc" /> + <circle + style="fill:#000000" + id="path5159" + cx="565" + cy="368" + r="1.5" /> + <g + id="g5189" + transform="translate(-0.5,-1)"> + <path + id="path5432-0" + style="color:#000000" + d="m 565.5,352 1,0 0,3 -1,0 z m 3,0 1,0 0,3 -1,0 z m 3,0 1,0 0,3 -1,0 z m 3,0 1,0 0,3 -1,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccccc" /> + </g> + <use + x="0" + y="0" + xlink:href="#g5189" + id="use5200" + transform="matrix(1,0,0,-1,0,726)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g5189" + id="use5202" + transform="matrix(0,1,-1,0,933,-207)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g5189" + id="use5204" + transform="matrix(0,-1,1,0,207,933)" + width="100%" + height="100%" /> + <path + id="rect5208-6-6" + style="fill:#000000" + d="m 565,363 7,0 0,1 -7,0 z m 0,-2 6,0 0,1 -6,0 z m 0,-3 10,0 0,2 -10,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccc" /> + </g> + <g + id="src/plugins/baremetal/images/baremetaldevicesmall" + transform="translate(-32,32)"> + <rect + id="rect5759-5-9-0-8-6-4" + height="16" + width="16" + y="363" + x="570" + style="fill:#ffffff" /> + <path + style="fill:#999999;fill-opacity:1;stroke:#000000;stroke-width:0.5" + d="m 575.5,367.25 6,0 1.25,1.25 0,6 -1.25,1.25 -6,0 -1.25,-1.25 0,-6 z" + id="rect5492" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccc" /> + <path + id="rect5494-5" + style="fill:#4d4d4d" + d="m 580,365 1,0 0,2 -1,0 z m -2,0 1,0 0,2 -1,0 z m -2,0 1,0 0,2 -1,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccscc" /> + <use + x="0" + y="0" + xlink:href="#rect5494-5" + id="use5529" + transform="matrix(0,1,-1,0,950,-207)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#rect5494-5" + id="use5531" + transform="matrix(1,0,0,-1,0,743)" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#rect5494-5" + id="use5533" + transform="matrix(0,-1,1,0,207,950)" + width="100%" + height="100%" /> + <circle + style="fill:#000000" + id="path5159-4" + cx="576" + cy="374" + r="1" /> + <path + id="rect5535-8" + style="fill:#000000;fill-opacity:1" + d="m 576,371 4,0 0,0.5 -4,0 z m 0,-2 5,0 0,0.5 -5,0 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> + </g> </g> </svg> |