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
|
@ -365,7 +365,7 @@ QString Device::iconForStatus(bool reachable, bool trusted) const
|
||||||
QString status = (reachable? (trusted? QStringLiteral("connected") : QStringLiteral("disconnected")) : QStringLiteral("trusted"));
|
QString status = (reachable? (trusted? QStringLiteral("connected") : QStringLiteral("disconnected")) : QStringLiteral("trusted"));
|
||||||
QString type = type2str(deviceType);
|
QString type = type2str(deviceType);
|
||||||
|
|
||||||
return type+'-'+status;
|
return type+status;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Device::setName(const QString &name)
|
void Device::setName(const QString &name)
|
||||||
|
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 231 B |
Before Width: | Height: | Size: 928 B After Width: | Height: | Size: 928 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 185 B |
Before Width: | Height: | Size: 875 B After Width: | Height: | Size: 875 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 183 B |
Before Width: | Height: | Size: 896 B After Width: | Height: | Size: 896 B |
|
@ -15,24 +15,24 @@ DESTINATION
|
||||||
|
|
||||||
ecm_install_icons(
|
ecm_install_icons(
|
||||||
ICONS
|
ICONS
|
||||||
32-status-laptop-connected.png
|
32-status-laptopconnected.png
|
||||||
32-status-laptop-disconnected.png
|
32-status-laptopdisconnected.png
|
||||||
32-status-laptop-trusted.png
|
32-status-laptoptrusted.png
|
||||||
32-status-smartphone-connected.png
|
32-status-smartphoneconnected.png
|
||||||
32-status-smartphone-disconnected.png
|
32-status-smartphonedisconnected.png
|
||||||
32-status-smartphone-trusted.png
|
32-status-smartphonetrusted.png
|
||||||
32-status-tablet-connected.png
|
32-status-tabletconnected.png
|
||||||
32-status-tablet-disconnected.png
|
32-status-tabletdisconnected.png
|
||||||
32-status-tablet-trusted.png
|
32-status-tablettrusted.png
|
||||||
sc-status-laptop-connected.svg
|
sc-status-laptopconnected.svg
|
||||||
sc-status-laptop-disconnected.svg
|
sc-status-laptopdisconnected.svg
|
||||||
sc-status-laptop-trusted.svg
|
sc-status-laptoptrusted.svg
|
||||||
sc-status-smartphone-connected.svg
|
sc-status-smartphoneconnected.svg
|
||||||
sc-status-smartphone-disconnected.svg
|
sc-status-smartphonedisconnected.svg
|
||||||
sc-status-smartphone-trusted.svg
|
sc-status-smartphonetrusted.svg
|
||||||
sc-status-tablet-connected.svg
|
sc-status-tabletconnected.svg
|
||||||
sc-status-tablet-disconnected.svg
|
sc-status-tabletdisconnected.svg
|
||||||
sc-status-tablet-trusted.svg
|
sc-status-tablettrusted.svg
|
||||||
DESTINATION
|
DESTINATION
|
||||||
${ICON_INSTALL_DIR}
|
${ICON_INSTALL_DIR}
|
||||||
)
|
)
|
||||||
|
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |