Differential D29544 Diff 82321 applets/systemtray/systemtraymodel.cpp

Changeset View

Standalone View

View Options

applets/systemtray/systemtraymodel.cpp

Show First 20 Lines • Show All 321 Lines • ▼ Show 20 Line(s)311{
322 QVariant icon = data.value("Icon"); 322​ QVariant icon = data.value("Icon");
323 if (icon.isValid() && icon.canConvert<QIcon>() && !icon.value<QIcon>().isNull()) { 323​ if (icon.isValid() && icon.canConvert<QIcon>() && !icon.value<QIcon>().isNull()) {
324 dataItem->setData(icon, Qt::DecorationRole); 324​ dataItem->setData(icon, Qt::DecorationRole);
325 dataItem->setData(icon, static_cast<int>(Role::Icon)); 325​ dataItem->setData(icon, static_cast<int>(Role::Icon));
326 } else { 326​ } else {
327 dataItem->setData(data.value("IconName"), Qt::DecorationRole); 327​ dataItem->setData(data.value("IconName"), Qt::DecorationRole);
328 dataItem->setData(QVariant(), static_cast<int>(Role::Icon)); 328​ dataItem->setData(QVariant(), static_cast<int>(Role::Icon));
329 } 329​ }
330​ QVariant attentionIcon = data.value("AttentionIcon");
331​ if (attentionIcon.isValid() && attentionIcon.canConvert<QIcon>() && !attentionIcon.value<QIcon>().isNull()) {
332​ dataItem->setData(attentionIcon, static_cast<int>(Role::AttentionIcon));
333​ } else {
334​ dataItem->setData(QVariant(), static_cast<int>(Role::AttentionIcon));
335​ }
330 336​
331 dataItem->setData(data.value("Id"), static_cast<int>(BaseModel::BaseRole::ItemId)); 337​ dataItem->setData(data.value("Id"), static_cast<int>(BaseModel::BaseRole::ItemId));
332 QVariant category = data.value("Category"); 338​ QVariant category = data.value("Category");
333 dataItem->setData(category.isNull() ? QStringLiteral("UnknownCategory") : data.value("Category"), static_cast<int>(BaseModel::BaseRole::Category)); 339​ dataItem->setData(category.isNull() ? QStringLiteral("UnknownCategory") : data.value("Category"), static_cast<int>(BaseModel::BaseRole::Category));
334 340​
335 QString status = data.value("Status").toString(); 341​ QString status = data.value("Status").toString();
336 if (status == QLatin1String("Active")) { 342​ if (status == QLatin1String("Active")) {
337 dataItem->setData(Plasma::Types::ItemStatus::ActiveStatus, static_cast<int>(BaseModel::BaseRole::Status)); 343​ dataItem->setData(Plasma::Types::ItemStatus::ActiveStatus, static_cast<int>(BaseModel::BaseRole::Status));
338 } else if (status == QLatin1String("NeedsAttention")) { 344​ } else if (status == QLatin1String("NeedsAttention")) {
339 dataItem->setData(Plasma::Types::ItemStatus::NeedsAttentionStatus, static_cast<int>(BaseModel::BaseRole::Status)); 345​ dataItem->setData(Plasma::Types::ItemStatus::NeedsAttentionStatus, static_cast<int>(BaseModel::BaseRole::Status));
340 } else { 346​ } else {
341 dataItem->setData(Plasma::Types::ItemStatus::PassiveStatus, static_cast<int>(BaseModel::BaseRole::Status)); 347​ dataItem->setData(Plasma::Types::ItemStatus::PassiveStatus, static_cast<int>(BaseModel::BaseRole::Status));
342 } 348​ }
343 349​
344 dataItem->setData(sourceName, static_cast<int>(Role::DataEngineSource)); 350​ dataItem->setData(sourceName, static_cast<int>(Role::DataEngineSource));
345 updateItemData(dataItem, data, Role::AttentionIcon); ​
346 updateItemData(dataItem, data, Role::AttentionIconName); 351​ updateItemData(dataItem, data, Role::AttentionIconName);
347 updateItemData(dataItem, data, Role::AttentionMovieName); 352​ updateItemData(dataItem, data, Role::AttentionMovieName);
348 updateItemData(dataItem, data, Role::Category); 353​ updateItemData(dataItem, data, Role::Category);
349 updateItemData(dataItem, data, Role::IconName); 354​ updateItemData(dataItem, data, Role::IconName);
350 updateItemData(dataItem, data, Role::IconThemePath); 355​ updateItemData(dataItem, data, Role::IconThemePath);
351 updateItemData(dataItem, data, Role::IconsChanged); 356​ updateItemData(dataItem, data, Role::IconsChanged);
352 updateItemData(dataItem, data, Role::Id); 357​ updateItemData(dataItem, data, Role::Id);
353 updateItemData(dataItem, data, Role::ItemIsMenu); 358​ updateItemData(dataItem, data, Role::ItemIsMenu);
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines