From ee6b19cb3944fe55c5b41bfb80da820ddc8a7ea9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 16 Sep 2016 18:12:52 +0200 Subject: [PATCH] Themable, HighDpi Android/iOS device icons Also used as option category icons Change-Id: I40916ff4683554a3e7de7126d737286eba4a525f Reviewed-by: Vikas Pachdha Reviewed-by: Alessandro Portale --- src/plugins/android/android.qrc | 5 +- src/plugins/android/androidconstants.h | 1 - src/plugins/android/androiddevice.cpp | 5 +- src/plugins/android/images/QtAndroid.png | Bin 8217 -> 0 bytes src/plugins/android/images/androiddevice.png | Bin 0 -> 211 bytes .../android/images/androiddevice@2x.png | Bin 0 -> 255 bytes .../android/images/androiddevicesmall.png | Bin 0 -> 158 bytes .../android/images/androiddevicesmall@2x.png | Bin 0 -> 192 bytes src/plugins/ios/images/QtIos.png | Bin 3793 -> 0 bytes src/plugins/ios/images/iosdevice.png | Bin 0 -> 196 bytes src/plugins/ios/images/iosdevice@2x.png | Bin 0 -> 349 bytes src/plugins/ios/images/iosdevicesmall.png | Bin 0 -> 145 bytes src/plugins/ios/images/iosdevicesmall@2x.png | Bin 0 -> 206 bytes src/plugins/ios/images/iossettings.png | Bin 633 -> 0 bytes src/plugins/ios/ios.qrc | 5 +- src/plugins/ios/iosconfigurations.cpp | 1 - src/plugins/ios/iosconstants.h | 1 - src/plugins/ios/iosdevice.cpp | 5 +- src/tools/icons/qtcreatoricons.svg | 162 ++++++++++++++++++ 19 files changed, 178 insertions(+), 7 deletions(-) delete mode 100644 src/plugins/android/images/QtAndroid.png create mode 100644 src/plugins/android/images/androiddevice.png create mode 100644 src/plugins/android/images/androiddevice@2x.png create mode 100644 src/plugins/android/images/androiddevicesmall.png create mode 100644 src/plugins/android/images/androiddevicesmall@2x.png delete mode 100644 src/plugins/ios/images/QtIos.png create mode 100644 src/plugins/ios/images/iosdevice.png create mode 100644 src/plugins/ios/images/iosdevice@2x.png create mode 100644 src/plugins/ios/images/iosdevicesmall.png create mode 100644 src/plugins/ios/images/iosdevicesmall@2x.png delete mode 100644 src/plugins/ios/images/iossettings.png diff --git a/src/plugins/android/android.qrc b/src/plugins/android/android.qrc index 26eb13809d6..13a40d9427a 100644 --- a/src/plugins/android/android.qrc +++ b/src/plugins/android/android.qrc @@ -1,6 +1,9 @@ - images/QtAndroid.png + images/androiddevice.png + images/androiddevice@2x.png + images/androiddevicesmall.png + images/androiddevicesmall@2x.png images/download.png Android.mimetypes.xml diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index 1966164d4bb..a76d830b205 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -48,7 +48,6 @@ enum AndroidQemuStatus { namespace Constants { const char ANDROID_SETTINGS_ID[] = "BB.Android Configurations"; -const char ANDROID_SETTINGS_CATEGORY_ICON[] = ":/android/images/QtAndroid.png"; const char ANDROID_TOOLCHAIN_ID[] = "Qt4ProjectManager.ToolChain.Android"; const char ANDROIDQT[] = "Qt4ProjectManager.QtVersion.Android"; diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 34e915164e4..40f80836692 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -45,7 +45,10 @@ AndroidDevice::AndroidDevice() { setDisplayName(QCoreApplication::translate("Android::Internal::AndroidDevice", "Run on Android")); setDeviceState(DeviceReadyToUse); - setDeviceIcon({Utils::Icon(":/android/images/QtAndroid.png")}); + setDeviceIcon({Utils::Icon({{":/android/images/androiddevicesmall.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint), + Utils::Icon({{":/android/images/androiddevice.png", + Utils::Theme::IconsBaseColor}})}); } AndroidDevice::AndroidDevice(const AndroidDevice &other) diff --git a/src/plugins/android/images/QtAndroid.png b/src/plugins/android/images/QtAndroid.png deleted file mode 100644 index 0e79b184fcf8cc47dede6d7ccde00d1a1e2d9c23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8217 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 HoD!M<38F8U literal 0 HcmV?d00001 diff --git a/src/plugins/android/images/androiddevicesmall@2x.png b/src/plugins/android/images/androiddevicesmall@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6451d1e5900cc57abf27500d41ad5733c994fecb GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8>H$6>t_%zeLPA3F^70A_ z3MwipAt51QVPTPxk@4~IU0q$9H*emvXV3rt|5J+Hb~7+Agm}6*hG?8mwrFOP*ua&O z#K4@pqk+k#fm83m1}+|n6}kq2LcRwYS$!2uc|sfJHZE)kY7CW?&DdsOFhR#*=l6vS t>lscY*)Uz`NNVHGaqIWmvyq>nYq{1$<6lpT85kHCJYD@<);T3K0RVf(JMsVk literal 0 HcmV?d00001 diff --git a/src/plugins/ios/images/QtIos.png b/src/plugins/ios/images/QtIos.png deleted file mode 100644 index 1bb8adb4244236627166d25fce9d854db695b6e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3793 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 diff --git a/src/plugins/ios/images/iosdevice.png b/src/plugins/ios/images/iosdevice.png new file mode 100644 index 0000000000000000000000000000000000000000..9b3fabeaf35006752d4ba26e91371977ecfe1ea8 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=Zci7-5R22vKl~XC0{jok zRkEol>}Pjo?6L`9ZDV38g~!EtDP!s1IMHC&UXym^x<6ZSYHfSpgd`KyH} zOS9;chuf6I)*O)C-el)t6Y{uhiKItdg=ik@={t)r&r#?5cjC}u2GIur3YOW^RN`10 xXPdJ>2vFcRO;kI=!g{7>v4g_n3wocK7@p<7dKU5W#XOMnJYD@<);T3K0RU~SL<|4` literal 0 HcmV?d00001 diff --git a/src/plugins/ios/images/iosdevice@2x.png b/src/plugins/ios/images/iosdevice@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1e078270c64bd7ef75116a4d444ddcfb521bed28 GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4h9AWhJGeJCI$vZ6;Bt(kch*{Kl~LFBupE` z*!FZiOh3T*<8i#8*@LM(%yJ5!yB08hiHQze zL57Pq_3$ts5%?9EHsN8bs|Vi&MRkF61<3@rK1S~eJOX#O%-m#<(4l^uL0^Sg!uh1Z z0`8qw28!ycvlMnNm@mVeR&bd2gPOka)y;+mt0X=d8oXGqZft%|YwqsK&%d6v^)6oe zX$7P6WrmuDb8H(_bYdjVJ2f&s*kmw|iCJvXb%7Mg4GkvDEFY>JCoEtL)M%9Gm+RHO8kMoouF{@boFyt=akR{0GA1X A00000 literal 0 HcmV?d00001 diff --git a/src/plugins/ios/images/iosdevicesmall.png b/src/plugins/ios/images/iosdevicesmall.png new file mode 100644 index 0000000000000000000000000000000000000000..41478f90a58fd0806e737eebed45e5684e869722 GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqM0mP5hDd}b|LA9vaA?tH zme_HKRl=;9v4vMSqE&6fN$$`Ckx`e#BNHqyoUlo0^qs`Rlcf=LD%8a2Le9Yr(;66< vn^$U1a1e{w$rO2@xAEYS8I1>d^%{5>HY9HDY+G=0H^?qeS3j3^P6kh$77NTdKFw73 z2LTDY680I!v3@qspXa}h$>W&eJpQdtjK;4u1x{3@JkMj;^7U+$y6>VjAcuOo`njxg HN@xNAZZSme literal 0 HcmV?d00001 diff --git a/src/plugins/ios/images/iossettings.png b/src/plugins/ios/images/iossettings.png deleted file mode 100644 index cebff4d440c98de6517d94dfdf1c9ee809543524..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 633 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuL896VhdLp+Xe4fXE39 zJ?pl8nJ*vxz0hoS?emw~{l@&0Qze&XMs2znH93fDeV_aMzySYFt*W~*A4 zl2`1hbDMup-IDO7YH!lnidi}X^O|>jbclfzStzBSN7d{tCZTyAyC!L zXv}uOa>DmLRvs%0L>UF*wAGrPZ(8@+?tlBtnX`mDiX>R%?3hCjeth@*Jkv_m53Q@4 z>}{3?sU)qI-{vUzgLmGM=HrDv%?BN>F^IGG@U3qAZZv(3M%MoO_8gK|EZrxcY_Xc_ z=eTGJm;c23H5M`*w;4)z$0|zmwYL;65X@7Dgo_#vu{n4jo16~`E9S=qyC1nw?Q9ItahpD{b~KZ#<#1a z|G2X1_a&AGe?PsOYbG5tQ*ZI{y*vhU;_73YY5fUY7<&Y%~06dv`taFJ7Ok2Or#6^4o!dfq}u()z4*}Q$iB}`0XSv diff --git a/src/plugins/ios/ios.qrc b/src/plugins/ios/ios.qrc index cf041359ad6..36158632ec7 100644 --- a/src/plugins/ios/ios.qrc +++ b/src/plugins/ios/ios.qrc @@ -1,5 +1,8 @@ - images/iossettings.png + images/iosdevice.png + images/iosdevice@2x.png + images/iosdevicesmall.png + images/iosdevicesmall@2x.png diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 99829102f06..e594913ae12 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -175,7 +175,6 @@ static void printKits(const QSet &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); diff --git a/src/plugins/ios/iosconstants.h b/src/plugins/ios/iosconstants.h index 6dffc21e381..30b1a989c92 100644 --- a/src/plugins/ios/iosconstants.h +++ b/src/plugins/ios/iosconstants.h @@ -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"; diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp index 69d1703124b..e63c4945afb 100644 --- a/src/plugins/ios/iosdevice.cpp +++ b/src/plugins/ios/iosdevice.cpp @@ -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) diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index eab60e8d73e..825723b71e1 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5769,5 +5769,167 @@ d="m 852,591 13,0 0,1 -13,0 z" sodipodi:nodetypes="ccccc" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +