From e72bbfe1d2efcc7dcc31408bf59af69408426430 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 28 Nov 2016 16:27:13 +0100 Subject: [PATCH] Remove dash in icon We use it to display the state and we're providing them as fallback, they will always be available. Otherwise, on some platform this clashes with the icon engine falling back to less specific version of the icon (i.e. smartphone instead of smartphone-connected). https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html Reviewed by Albert Vaca --- core/device.cpp | 2 +- ...cted.png => 32-status-laptopconnected.png} | Bin ...d.png => 32-status-laptopdisconnected.png} | Bin ...rusted.png => 32-status-laptoptrusted.png} | Bin ....png => 32-status-smartphoneconnected.png} | Bin ...g => 32-status-smartphonedisconnected.png} | Bin ...ed.png => 32-status-smartphonetrusted.png} | Bin ...cted.png => 32-status-tabletconnected.png} | Bin ...d.png => 32-status-tabletdisconnected.png} | Bin ...rusted.png => 32-status-tablettrusted.png} | Bin icon/CMakeLists.txt | 36 +++++++++--------- ...cted.svg => sc-status-laptopconnected.svg} | 0 ...d.svg => sc-status-laptopdisconnected.svg} | 0 ...rusted.svg => sc-status-laptoptrusted.svg} | 0 ....svg => sc-status-smartphoneconnected.svg} | 0 ...g => sc-status-smartphonedisconnected.svg} | 0 ...ed.svg => sc-status-smartphonetrusted.svg} | 0 ...cted.svg => sc-status-tabletconnected.svg} | 0 ...d.svg => sc-status-tabletdisconnected.svg} | 0 ...rusted.svg => sc-status-tablettrusted.svg} | 0 20 files changed, 19 insertions(+), 19 deletions(-) rename icon/{32-status-laptop-connected.png => 32-status-laptopconnected.png} (100%) rename icon/{32-status-laptop-disconnected.png => 32-status-laptopdisconnected.png} (100%) rename icon/{32-status-laptop-trusted.png => 32-status-laptoptrusted.png} (100%) rename icon/{32-status-smartphone-connected.png => 32-status-smartphoneconnected.png} (100%) rename icon/{32-status-smartphone-disconnected.png => 32-status-smartphonedisconnected.png} (100%) rename icon/{32-status-smartphone-trusted.png => 32-status-smartphonetrusted.png} (100%) rename icon/{32-status-tablet-connected.png => 32-status-tabletconnected.png} (100%) rename icon/{32-status-tablet-disconnected.png => 32-status-tabletdisconnected.png} (100%) rename icon/{32-status-tablet-trusted.png => 32-status-tablettrusted.png} (100%) rename icon/{sc-status-laptop-connected.svg => sc-status-laptopconnected.svg} (100%) rename icon/{sc-status-laptop-disconnected.svg => sc-status-laptopdisconnected.svg} (100%) rename icon/{sc-status-laptop-trusted.svg => sc-status-laptoptrusted.svg} (100%) rename icon/{sc-status-smartphone-connected.svg => sc-status-smartphoneconnected.svg} (100%) rename icon/{sc-status-smartphone-disconnected.svg => sc-status-smartphonedisconnected.svg} (100%) rename icon/{sc-status-smartphone-trusted.svg => sc-status-smartphonetrusted.svg} (100%) rename icon/{sc-status-tablet-connected.svg => sc-status-tabletconnected.svg} (100%) rename icon/{sc-status-tablet-disconnected.svg => sc-status-tabletdisconnected.svg} (100%) rename icon/{sc-status-tablet-trusted.svg => sc-status-tablettrusted.svg} (100%) diff --git a/core/device.cpp b/core/device.cpp index de73773bc..23589fc94 100644 --- a/core/device.cpp +++ b/core/device.cpp @@ -365,7 +365,7 @@ QString Device::iconForStatus(bool reachable, bool trusted) const QString status = (reachable? (trusted? QStringLiteral("connected") : QStringLiteral("disconnected")) : QStringLiteral("trusted")); QString type = type2str(deviceType); - return type+'-'+status; + return type+status; } void Device::setName(const QString &name) diff --git a/icon/32-status-laptop-connected.png b/icon/32-status-laptopconnected.png similarity index 100% rename from icon/32-status-laptop-connected.png rename to icon/32-status-laptopconnected.png diff --git a/icon/32-status-laptop-disconnected.png b/icon/32-status-laptopdisconnected.png similarity index 100% rename from icon/32-status-laptop-disconnected.png rename to icon/32-status-laptopdisconnected.png diff --git a/icon/32-status-laptop-trusted.png b/icon/32-status-laptoptrusted.png similarity index 100% rename from icon/32-status-laptop-trusted.png rename to icon/32-status-laptoptrusted.png diff --git a/icon/32-status-smartphone-connected.png b/icon/32-status-smartphoneconnected.png similarity index 100% rename from icon/32-status-smartphone-connected.png rename to icon/32-status-smartphoneconnected.png diff --git a/icon/32-status-smartphone-disconnected.png b/icon/32-status-smartphonedisconnected.png similarity index 100% rename from icon/32-status-smartphone-disconnected.png rename to icon/32-status-smartphonedisconnected.png diff --git a/icon/32-status-smartphone-trusted.png b/icon/32-status-smartphonetrusted.png similarity index 100% rename from icon/32-status-smartphone-trusted.png rename to icon/32-status-smartphonetrusted.png diff --git a/icon/32-status-tablet-connected.png b/icon/32-status-tabletconnected.png similarity index 100% rename from icon/32-status-tablet-connected.png rename to icon/32-status-tabletconnected.png diff --git a/icon/32-status-tablet-disconnected.png b/icon/32-status-tabletdisconnected.png similarity index 100% rename from icon/32-status-tablet-disconnected.png rename to icon/32-status-tabletdisconnected.png diff --git a/icon/32-status-tablet-trusted.png b/icon/32-status-tablettrusted.png similarity index 100% rename from icon/32-status-tablet-trusted.png rename to icon/32-status-tablettrusted.png diff --git a/icon/CMakeLists.txt b/icon/CMakeLists.txt index 850a669e7..cf05f32f6 100644 --- a/icon/CMakeLists.txt +++ b/icon/CMakeLists.txt @@ -15,24 +15,24 @@ DESTINATION ecm_install_icons( ICONS - 32-status-laptop-connected.png - 32-status-laptop-disconnected.png - 32-status-laptop-trusted.png - 32-status-smartphone-connected.png - 32-status-smartphone-disconnected.png - 32-status-smartphone-trusted.png - 32-status-tablet-connected.png - 32-status-tablet-disconnected.png - 32-status-tablet-trusted.png - sc-status-laptop-connected.svg - sc-status-laptop-disconnected.svg - sc-status-laptop-trusted.svg - sc-status-smartphone-connected.svg - sc-status-smartphone-disconnected.svg - sc-status-smartphone-trusted.svg - sc-status-tablet-connected.svg - sc-status-tablet-disconnected.svg - sc-status-tablet-trusted.svg + 32-status-laptopconnected.png + 32-status-laptopdisconnected.png + 32-status-laptoptrusted.png + 32-status-smartphoneconnected.png + 32-status-smartphonedisconnected.png + 32-status-smartphonetrusted.png + 32-status-tabletconnected.png + 32-status-tabletdisconnected.png + 32-status-tablettrusted.png + sc-status-laptopconnected.svg + sc-status-laptopdisconnected.svg + sc-status-laptoptrusted.svg + sc-status-smartphoneconnected.svg + sc-status-smartphonedisconnected.svg + sc-status-smartphonetrusted.svg + sc-status-tabletconnected.svg + sc-status-tabletdisconnected.svg + sc-status-tablettrusted.svg DESTINATION ${ICON_INSTALL_DIR} ) diff --git a/icon/sc-status-laptop-connected.svg b/icon/sc-status-laptopconnected.svg similarity index 100% rename from icon/sc-status-laptop-connected.svg rename to icon/sc-status-laptopconnected.svg diff --git a/icon/sc-status-laptop-disconnected.svg b/icon/sc-status-laptopdisconnected.svg similarity index 100% rename from icon/sc-status-laptop-disconnected.svg rename to icon/sc-status-laptopdisconnected.svg diff --git a/icon/sc-status-laptop-trusted.svg b/icon/sc-status-laptoptrusted.svg similarity index 100% rename from icon/sc-status-laptop-trusted.svg rename to icon/sc-status-laptoptrusted.svg diff --git a/icon/sc-status-smartphone-connected.svg b/icon/sc-status-smartphoneconnected.svg similarity index 100% rename from icon/sc-status-smartphone-connected.svg rename to icon/sc-status-smartphoneconnected.svg diff --git a/icon/sc-status-smartphone-disconnected.svg b/icon/sc-status-smartphonedisconnected.svg similarity index 100% rename from icon/sc-status-smartphone-disconnected.svg rename to icon/sc-status-smartphonedisconnected.svg diff --git a/icon/sc-status-smartphone-trusted.svg b/icon/sc-status-smartphonetrusted.svg similarity index 100% rename from icon/sc-status-smartphone-trusted.svg rename to icon/sc-status-smartphonetrusted.svg diff --git a/icon/sc-status-tablet-connected.svg b/icon/sc-status-tabletconnected.svg similarity index 100% rename from icon/sc-status-tablet-connected.svg rename to icon/sc-status-tabletconnected.svg diff --git a/icon/sc-status-tablet-disconnected.svg b/icon/sc-status-tabletdisconnected.svg similarity index 100% rename from icon/sc-status-tablet-disconnected.svg rename to icon/sc-status-tabletdisconnected.svg diff --git a/icon/sc-status-tablet-trusted.svg b/icon/sc-status-tablettrusted.svg similarity index 100% rename from icon/sc-status-tablet-trusted.svg rename to icon/sc-status-tablettrusted.svg