74c685c · unity8 · git.iko.soy

debian/control+1−1

compare with xenial

unifiedsplit

@@ -20,7 +20,7 @@ Build-Depends: cmake,

20 libsigc++-2.0-dev,

21 libunity-api-dev (>= 7.80.3),

22 libunity-core-6.0-dev (<< 7.80),

23− libunity-dev (>= 7.0.3),

23+ libunity-dev (>= 7.0.12),

24 libunity-scopes-json-def-phone,

25 libupstart-dev,

26 libusermetricsoutput1-dev,

plugins/Unity/categories.cpp+6

@@ -39,6 +39,7 @@ Categories::Categories(QObject* parent)

39 m_roles[Categories::RoleIcon] = "icon";

40 m_roles[Categories::RoleRenderer] = "renderer";

41 m_roles[Categories::RoleContentType] = "contentType";

42+ m_roles[Categories::RoleProgressSource] = "progressSource";

42 m_roles[Categories::RoleHints] = "hints";

43 m_roles[Categories::RoleHints] = "hints";

43 m_roles[Categories::RoleResults] = "results";

44 m_roles[Categories::RoleResults] = "results";

44 m_roles[Categories::RoleCount] = "count";

45 m_roles[Categories::RoleCount] = "count";

@@ -198,6 +199,11 @@ Categories::data(const QModelIndex& index, int role) const

198 auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

199 auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

199 return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

200 return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

200 }

201 }

202+ case RoleProgressSource:

203+ {

204+ auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

205+ return hints.contains("progress-source") ? hints["progress-source"] : QVariant();

206+ }

201 case RoleHints:

207 case RoleHints:

202 return DeeListModel::data(index, CategoryColumn::HINTS);

208 return DeeListModel::data(index, CategoryColumn::HINTS);

203 case RoleResults:

209 case RoleResults:

plugins/Unity/categories.h+1

@@ -47,6 +47,7 @@ public:

47 RoleIcon,

48 RoleRenderer,

49 RoleContentType,

50+ RoleProgressSource,

50 RoleHints,

51 RoleHints,

51 RoleResults,

52 RoleResults,

52 RoleCount,

53 RoleCount,