e04653c · unity8 · git.iko.soy

git.iko.soy/unity8

Expose real category ids and not just indices

commite04653c72952c943f4c91cf1d3fdda1d7ba25069 authorMichal Hruby <michal.mhr@gmail.com> dateMon 22 Jul 2013, 09:11 (13 years ago) parent6bc361d

5 files changed+14−6

compare with xenial

unifiedsplit

Dash/DashApps.qml+1−1 plugins/Unity/categories.cpp+4−1 plugins/Unity/categories.h+2−1 tests/mocks/Unity/fake_categories.cpp+5−2 tests/mocks/Unity/fake_categories.h+2−1

Dash/DashApps.qml+1−1

@@ -87,7 +87,7 @@ ScopeView {

8787 model: scopeView.scope.categories

8888

8989 delegate: Item {

90− Component.onCompleted: if (index == 3) scopeView.installedModel = Qt.binding(function() { return model.results; });

90+ Component.onCompleted: if (id == "installed") scopeView.installedModel = Qt.binding(function() { return model.results; });

9191 }

9292 }

9393

plugins/Unity/categories.cpp+4−1

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

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

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

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

45+ m_roles[Categories::RoleCategoryIndex] = "categoryIndex";

4546

4647 // TODO This should not be needed but accumulatting the count changes

4748 // makes the visualization more stable and also makes crashes on fast

@@ -131,7 +132,7 @@ Categories::data(const QModelIndex& index, int role) const

131132

132133 switch (role) {

133134 case RoleId:

134− return QVariant::fromValue(index.row());

135+ return DeeListModel::data(index, CategoryColumn::ID);

135136 case RoleName:

136137 return DeeListModel::data(index, CategoryColumn::DISPLAY_NAME);

137138 case RoleIcon:

@@ -149,6 +150,8 @@ Categories::data(const QModelIndex& index, int role) const

149150 return QVariant::fromValue(getResults(index.row()));

150151 case RoleCount:

151152 return QVariant::fromValue(getResults(index.row())->rowCount());

153+ case RoleCategoryIndex:

154+ return QVariant::fromValue(index.row());

152155 default:

153156 return QVariant();

154157 }

plugins/Unity/categories.h+2−1

@@ -49,7 +49,8 @@ public:

4949 RoleContentType,

5050 RoleHints,

5151 RoleResults,

52− RoleCount

52+ RoleCount,

53+ RoleCategoryIndex

5354 };

5455

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

tests/mocks/Unity/fake_categories.cpp+5−2

@@ -32,10 +32,11 @@ Categories::Categories(QObject* parent)

3232 m_roles[Categories::RoleName] = "name";

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

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

35− m_roles[Categories::RoleContentType] = "content_type";

35+ m_roles[Categories::RoleContentType] = "contentType";

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

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

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

39+ m_roles[Categories::RoleCategoryIndex] = "categoryIndex";

3940

4041 // TODO This should not be needed but accumulatting the count changes

4142 // makes the visualization more stable and also makes crashes on fast

@@ -154,7 +155,7 @@ Categories::data(const QModelIndex& index, int role) const

154155

155156 switch (role) {

156157 case RoleId:

157− return QVariant::fromValue(index.row());

158+ return DeeListModel::data(index, 0); //ID

158159 case RoleName:

159160 return DeeListModel::data(index, 1); //DISPLAY_NAME

160161 case RoleIcon:

@@ -172,6 +173,8 @@ Categories::data(const QModelIndex& index, int role) const

172173 return QVariant::fromValue(getFilter(index.row()));

173174 case RoleCount:

174175 return QVariant::fromValue(getFilter(index.row())->rowCount());

176+ case RoleCategoryIndex:

177+ return QVariant::fromValue(index.row());

175178 default:

176179 return QVariant();

177180 }

tests/mocks/Unity/fake_categories.h+2−1

@@ -41,7 +41,8 @@ public:

4141 RoleContentType,

4242 RoleHints,

4343 RoleResults,

44− RoleCount

44+ RoleCount,

45+ RoleCategoryIndex

4546 };

4647

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