Merge lp:~aacid/unity-scopes-shell/addscopestitle into lp:unity-scopes-shell

[Albert Astals Cid]

Add a title role

This way this model can be fed directly to the new TabBar api

[Michał Sawicz (saviq)]

Yup.

review: Approve

[Michal Hruby (mhr3)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2013-11-08 17:01:37 +0000
+++ src/Unity/scopes.cpp	2013-11-25 10:49:22 +0000
@@ -36,6 +36,7 @@
     m_roles[Scopes::RoleScope] = "scope";
     m_roles[Scopes::RoleId] = "id";
     m_roles[Scopes::RoleVisible] = "visible";
+    m_roles[Scopes::RoleTitle] = "title";
 
     m_unityScopes->scope_added.connect(sigc::mem_fun(this, &Scopes::onScopeAdded));
     m_unityScopes->scope_removed.connect(sigc::mem_fun(this, &Scopes::onScopeRemoved));
@@ -71,6 +72,8 @@
         return QVariant::fromValue(scope->id());
     } else if (role == Scopes::RoleVisible) {
         return QVariant::fromValue(scope->visible());
+    } else if (role == Scopes::RoleTitle) {
+        return QVariant::fromValue(scope->name());
     } else {
         return QVariant();
     }

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2013-11-08 17:01:37 +0000
+++ src/Unity/scopes.h	2013-11-25 10:49:22 +0000
@@ -54,7 +54,8 @@
     enum Roles {
         RoleScope,
         RoleId,
-        RoleVisible
+        RoleVisible,
+        RoleTitle
     };
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;