Themable, HighDpi Android/iOS device icons

Also used as option category icons

Change-Id: I40916ff4683554a3e7de7126d737286eba4a525f
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2016-09-16 18:12:52 +02:00
parent de41e85c3b
commit ee6b19cb39
19 changed files with 178 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 633 B

View File

@@ -1,5 +1,8 @@
<RCC>
<qresource prefix="/ios">
<file>images/iossettings.png</file>
<file>images/iosdevice.png</file>
<file>images/iosdevice@2x.png</file>
<file>images/iosdevicesmall.png</file>
<file>images/iosdevicesmall@2x.png</file>
</qresource>
</RCC>

View File

@@ -175,7 +175,6 @@ static void printKits(const QSet<Kit *> &kits)
static void setupKit(Kit *kit, Core::Id pDeviceType, ClangToolChain *pToolchain,
const QVariant &debuggerId, const Utils::FileName &sdkPath, BaseQtVersion *qtVersion)
{
kit->setIconPath(FileName::fromString(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON)));
DeviceTypeKitInformation::setDeviceTypeId(kit, pDeviceType);
ToolChainKitInformation::setToolChain(kit, pToolchain);
QtKitInformation::setQtVersion(kit, qtVersion);

View File

@@ -35,7 +35,6 @@ Q_DECLARE_LOGGING_CATEGORY(iosLog)
namespace Constants {
const char IOS_SETTINGS_ID[] = "CC.Ios Configurations";
const char IOS_SETTINGS_CATEGORY_ICON[] = ":/ios/images/iossettings.png";
const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // this literal is replicated to avoid dependencies
const char IOS_DEVICE_TYPE[] = "Ios.Device.Type";

View File

@@ -92,7 +92,10 @@ IosDevice::IosDevice()
ports.addRange(Utils::Port(Constants::IOS_DEVICE_PORT_START),
Utils::Port(Constants::IOS_DEVICE_PORT_END));
setFreePorts(ports);
setDeviceIcon({Utils::Icon(":/ios/images/iossettings.png")});
setDeviceIcon({Utils::Icon({{":/ios/images/iosdevicesmall.png",
Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint),
Utils::Icon({{":/ios/images/iosdevice.png",
Utils::Theme::IconsBaseColor}})});
}
IosDevice::IosDevice(const IosDevice &other)