Merge branch 'rockwork'

Conflicts:
	po/de.po
	po/en_GB.po
	po/eu.po
	po/fr.po
	po/hu.po
	po/it.po
	po/pt.po
	po/rockwork.mzanetti.pot
	po/ru.po
	po/template.pot
	rockwork/InfoPage.qml
	rockwork/Main.qml
	rockwork/NotificationsPage.qml
	rockworkd/rockworkd.pro
	version.pri

1 files changed, 6 insertions, 4 deletions

diff --git a/rockwork/notificationsourcemodel.cpp b/rockwork/notificationsourcemodel.cpp
index cbb75ca..83e87f0 100644
--- a/rockwork/notificationsourcemodel.cpp
+++ b/rockwork/notificationsourcemodel.cpp
@@ -1,5 +1,8 @@
 #include "notificationsourcemodel.h"
 
+#include <QStandardPaths>
+#include <QFileInfo>
+#include <QDir>
 #include <QSettings>
 #include <QDebug>
 
@@ -21,6 +24,8 @@ QVariant NotificationSourceModel::data(const QModelIndex &index, int role) const
         return item.m_displayName;
     case RoleEnabled:
         return item.m_enabled;
+    case RoleId:
+        return item.m_id;
     case RoleIcon:
         return item.m_icon;
     }
@@ -33,6 +38,7 @@ QHash<int, QByteArray> NotificationSourceModel::roleNames() const
     roles.insert(RoleName, "name");
     roles.insert(RoleEnabled, "enabled");
     roles.insert(RoleIcon, "icon");
+    roles.insert(RoleId, "id");
     return roles;
 }
 
@@ -59,10 +65,6 @@ void NotificationSourceModel::insert(const QString &sourceId, bool enabled)
     }
 }
 
-#include <QStandardPaths>
-#include <QFileInfo>
-#include <QDir>
-
 NotificationSourceItem NotificationSourceModel::fromDesktopFile(const QString &sourceId)
 {
     NotificationSourceItem ret;