4da7de7 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

merge expose-renderer-hints

4da7de7Michał Sawicz13 years ago

plugins/Unity/categoryresults.cpp+6−4

compare with xenial

unifiedsplit

@@ -46,7 +46,7 @@ CategoryResults::CategoryResults(QObject* parent)

46 m_roles[CategoryResults::RoleComment] = "comment";

47 m_roles[CategoryResults::RoleDndUri] = "dndUri";

48 m_roles[CategoryResults::RoleMetadata] = "metadata";

49− m_roles[CategoryResults::RoleMetadataScopeDisabled] = "scopeDisabled";

49+ m_roles[CategoryResults::RoleRendererHints] = "rendererHints";

50}

52int CategoryResults::categoryIndex() const

@@ -94,14 +94,16 @@ CategoryResults::data(const QModelIndex& index, int role) const

94 return DeeListModel::data(index, ResultsColumn::DND_URI);

95 case RoleMetadata:

96 return DeeListModel::data(index, ResultsColumn::METADATA);

97− // FIXME nasty hack while we don't support annotated icons

97+ case RoleRendererHints:

98− case RoleMetadataScopeDisabled: {

98+ {

99 QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());

100 if (hash.contains("content")) {

101+ QVariantMap hints;

101 QVariantHash innerHash(hash["content"].toHash());

102 QVariantHash innerHash(hash["content"].toHash());

102 if (innerHash.contains("scope_disabled")) {

103 if (innerHash.contains("scope_disabled")) {

103− return innerHash["scope_disabled"];

104+ hints["scope_disabled"] = innerHash["scope_disabled"];

104 }

105 }

106+ return hints.empty() ? QVariant() : QVariant::fromValue(hints);

105 }

107 }

106 return QVariant();

108 return QVariant();

107 }

109 }

plugins/Unity/categoryresults.h+1−1

@@ -44,7 +44,7 @@ public:

44 RoleComment,

45 RoleDndUri,

46 RoleMetadata,

47− RoleMetadataScopeDisabled

47+ RoleRendererHints

48 };

50 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;