git.iko.soy/unity8
on xenial help sign in
Expose rendererHint to shell
commit1b907af071a919211948cf37c93b3ecb67fea86b authorMichal Hruby <michal.mhr@gmail.com> dateWed 2 Oct 2013, 14:02 (13 years ago) parent42f7317
5 files changed+17−2
compare with xenial
unifiedsplit
Dash/GenericScopeView.qml+3−2 plugins/Unity/categories.cpp+6 plugins/Unity/categories.h+1 tests/mocks/Unity/fake_categories.cpp+6 tests/mocks/Unity/fake_categories.h+1
Dash/GenericScopeView.qml+3−2
@@ -85,7 +85,7 @@ ScopeView {
8585 right: parent.right
8686 }
8787
88− source: getRenderer(model.renderer, model.contentType)
88+ source: getRenderer(model.renderer, model.contentType, model.rendererHint)
8989
9090 onLoaded: {
9191 if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {
@@ -188,10 +188,11 @@ ScopeView {
188188 }
189189 }
190190
191− function getRenderer(rendererId, contentType) {
191+ function getRenderer(rendererId, contentType, rendererHint) {
192192 if (rendererId == "default") {
193193 rendererId = getDefaultRendererId(contentType);
194194 }
195+ if (rendererHint) console.log("got a hint:", rendererHint);
195196 switch (rendererId) {
196197 case "grid": {
197198 switch (contentType) {
plugins/Unity/categories.cpp+6
@@ -40,6 +40,7 @@ Categories::Categories(QObject* parent)
4040 m_roles[Categories::RoleIcon] = "icon";
4141 m_roles[Categories::RoleRenderer] = "renderer";
4242 m_roles[Categories::RoleContentType] = "contentType";
43+ m_roles[Categories::RoleRendererHint] = "rendererHint";
4344 m_roles[Categories::RoleProgressSource] = "progressSource";
4445 m_roles[Categories::RoleHints] = "hints";
4546 m_roles[Categories::RoleResults] = "results";
@@ -209,6 +210,11 @@ Categories::data(const QModelIndex& index, int role) const
209210 auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
210211 return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));
211212 }
213+ case RoleRendererHint:
214+ {
215+ auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
216+ return hints.contains("renderer-hint") ? hints["renderer-hint"] : QVariant(QString());
217+ }
212218 case RoleProgressSource:
213219 {
214220 auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
plugins/Unity/categories.h+1
@@ -47,6 +47,7 @@ public:
4747 RoleIcon,
4848 RoleRenderer,
4949 RoleContentType,
50+ RoleRendererHint,
5051 RoleProgressSource,
5152 RoleHints,
5253 RoleResults,
tests/mocks/Unity/fake_categories.cpp+6
@@ -42,6 +42,7 @@ Categories::Categories(QObject* parent)
4242 m_roles[Categories::RoleIcon] = "icon";
4343 m_roles[Categories::RoleRenderer] = "renderer";
4444 m_roles[Categories::RoleContentType] = "contentType";
45+ m_roles[Categories::RoleRendererHint] = "rendererHint";
4546 m_roles[Categories::RoleHints] = "hints";
4647 m_roles[Categories::RoleResults] = "results";
4748 m_roles[Categories::RoleCount] = "count";
@@ -229,6 +230,11 @@ Categories::data(const QModelIndex& index, int role) const
229230 auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
230231 return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));
231232 }
233+ case RoleRendererHint:
234+ {
235+ auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
236+ return hints.contains("renderer-hint") ? hints["renderer-hint"] : QVariant(QString());
237+ }
232238 case RoleHints:
233239 return DeeListModel::data(index, CategoryColumn::HINTS);
234240 case RoleResults:
tests/mocks/Unity/fake_categories.h+1
@@ -39,6 +39,7 @@ public:
3939 RoleIcon,
4040 RoleRenderer,
4141 RoleContentType,
42+ RoleRendererHint,
4243 RoleHints,
4344 RoleResults,
4445 RoleCount