Changeset View
Changeset View
Standalone View
Standalone View
dataengines/statusnotifieritem/statusnotifieritemsource.cpp
| Show First 20 Lines • Show All 297 Lines • ▼ Show 20 Line(s) | 293 | if (!iconName.isEmpty()) { | |||
|---|---|---|---|---|---|
| 298 | } | 298 | } | ||
| 299 | } | 299 | } | ||
| 300 | } else { | 300 | } else { | ||
| 301 | icon = imageVectorToPixmap(image); | 301 | icon = imageVectorToPixmap(image); | ||
| 302 | if (!icon.isNull() && !overlay.isNull()) { | 302 | if (!icon.isNull() && !overlay.isNull()) { | ||
| 303 | overlayIcon(&icon, &overlay); | 303 | overlayIcon(&icon, &overlay); | ||
| 304 | } | 304 | } | ||
| 305 | } | 305 | } | ||
| 306 | setData(QStringLiteral("Icon"), icon); | 306 | setData(QStringLiteral("Icon"), icon.isNull() ? QVariant() : icon); | ||
| 307 | setData(QStringLiteral("IconName"), iconName); | 307 | setData(QStringLiteral("IconName"), iconName); | ||
| 308 | } | 308 | } | ||
| 309 | 309 | | |||
| 310 | //Attention icon | 310 | //Attention icon | ||
| 311 | { | 311 | { | ||
| 312 | KDbusImageVector image; | 312 | KDbusImageVector image; | ||
| 313 | QIcon attentionIcon; | 313 | QIcon attentionIcon; | ||
| 314 | 314 | | |||
| Show All 9 Lines | 319 | if (!iconName.isEmpty()) { | |||
| 324 | } | 324 | } | ||
| 325 | } | 325 | } | ||
| 326 | } else { | 326 | } else { | ||
| 327 | attentionIcon = imageVectorToPixmap(image); | 327 | attentionIcon = imageVectorToPixmap(image); | ||
| 328 | if (!attentionIcon.isNull() && !overlay.isNull()) { | 328 | if (!attentionIcon.isNull() && !overlay.isNull()) { | ||
| 329 | overlayIcon(&attentionIcon, &overlay); | 329 | overlayIcon(&attentionIcon, &overlay); | ||
| 330 | } | 330 | } | ||
| 331 | } | 331 | } | ||
| 332 | setData(QStringLiteral("AttentionIcon"), attentionIcon); | 332 | setData(QStringLiteral("AttentionIcon"), attentionIcon.isNull() ? QVariant() : attentionIcon); | ||
| 333 | } | 333 | } | ||
| 334 | 334 | | |||
| 335 | //ToolTip | 335 | //ToolTip | ||
| 336 | { | 336 | { | ||
| 337 | KDbusToolTipStruct toolTip; | 337 | KDbusToolTipStruct toolTip; | ||
| 338 | properties[QStringLiteral("ToolTip")].value<QDBusArgument>() >> toolTip; | 338 | properties[QStringLiteral("ToolTip")].value<QDBusArgument>() >> toolTip; | ||
| 339 | if (toolTip.title.isEmpty()) { | 339 | if (toolTip.title.isEmpty()) { | ||
| 340 | setData(QStringLiteral("ToolTipTitle"), QString()); | 340 | setData(QStringLiteral("ToolTipTitle"), QString()); | ||
| ▲ Show 20 Lines • Show All 180 Lines • Show Last 20 Lines | |||||