Skip to content

Commit

Permalink
Merge branch 'jb51880_permissionsmodel' into 'master'
Browse files Browse the repository at this point in the history
Add PermissionsModel

See merge request mer-core/nemo-qml-plugin-systemsettings!158
  • Loading branch information
Tomin1 committed Nov 18, 2020
2 parents 8ba8cea + 2fa13cd commit 48fd219
Show file tree
Hide file tree
Showing 5 changed files with 189 additions and 4 deletions.
3 changes: 2 additions & 1 deletion rpm/nemo-qml-plugin-systemsettings.spec
Expand Up @@ -13,14 +13,15 @@ Requires: libsailfishkeyprovider >= 0.0.14
Requires: connman-qt5 >= 1.2.21
Requires: user-managerd >= 0.4.0
Requires: udisks2 >= 2.8.1+git6
Requires: mlite-qt5 >= 0.3.0
Requires(post): coreutils
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5SystemInfo)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(timed-qt5)
BuildRequires: pkgconfig(profile)
BuildRequires: pkgconfig(mce) >= 1.21.0
BuildRequires: pkgconfig(mlite5)
BuildRequires: pkgconfig(mlite5) >= 0.3.0
BuildRequires: pkgconfig(usb-moded-qt5)
BuildRequires: pkgconfig(blkid)
BuildRequires: pkgconfig(libcrypto)
Expand Down
108 changes: 108 additions & 0 deletions src/permissionsmodel.cpp
@@ -0,0 +1,108 @@
/*
* Copyright (C) 2020 Open Mobile Platform LLC.
*
* You may use this file under the terms of the BSD license as follows:
*
* "Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Nemo Mobile nor the names of its contributors
* may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
*/

#include <MDesktopEntry>
#include <MPermission>
#include "permissionsmodel.h"

PermissionsModel::PermissionsModel(QObject *parent)
: QAbstractListModel(parent)
{
}

PermissionsModel::~PermissionsModel()
{
}

QString PermissionsModel::desktopFile() const
{
return m_desktopFile;
}

void PermissionsModel::setDesktopFile(QString file)
{
if (m_desktopFile != file) {
m_desktopFile = file;
loadPermissions();
emit desktopFileChanged();
}
}

QHash<int, QByteArray> PermissionsModel::roleNames() const
{
static const QHash<int, QByteArray> roles = {
{ Qt::DisplayRole, "display" },
{ DescriptionRole, "description" },
{ NameRole, "name" },
};
return roles;
}

int PermissionsModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
return m_permissions.count();
}

QVariant PermissionsModel::data(const QModelIndex &index, int role) const
{
if (index.row() < 0 || index.row() >= rowCount() || index.column() != 0)
return QVariant();

switch (role) {
case Qt::DisplayRole:
case DescriptionRole:
return m_permissions.at(index.row()).description();
case NameRole:
return m_permissions.at(index.row()).name();
default:
return QVariant();
}
}

void PermissionsModel::loadPermissions()
{
if (!m_permissions.isEmpty()) {
beginRemoveRows(QModelIndex(), 0, m_permissions.length() - 1);
m_permissions.clear();
endRemoveRows();
}

MDesktopEntry entry(m_desktopFile);
if (entry.isValid()) {
auto permissions = MPermission::fromDesktopEntry(entry);
if (!permissions.isEmpty()) {
beginInsertRows(QModelIndex(), 0, permissions.length() - 1);
m_permissions.swap(permissions);
endInsertRows();
}
}
}
71 changes: 71 additions & 0 deletions src/permissionsmodel.h
@@ -0,0 +1,71 @@
/*
* Copyright (C) 2020 Open Mobile Platform LLC.
*
* You may use this file under the terms of the BSD license as follows:
*
* "Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of Nemo Mobile nor the names of its contributors
* may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
*/

#ifndef PERMISSIONSMODEL_H
#define PERMISSIONSMODEL_H

#include <QAbstractListModel>
#include "systemsettingsglobal.h"

class MPermission;

class SYSTEMSETTINGS_EXPORT PermissionsModel: public QAbstractListModel
{
Q_OBJECT
Q_PROPERTY(QString desktopFile READ desktopFile WRITE setDesktopFile NOTIFY desktopFileChanged)

public:
explicit PermissionsModel(QObject *parent = nullptr);
~PermissionsModel();

enum Roles {
DescriptionRole = Qt::UserRole,
NameRole,
};

QString desktopFile() const;
void setDesktopFile(QString file);

QHash<int, QByteArray> roleNames() const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QVariant data(const QModelIndex &index, int role) const;

signals:
void desktopFileChanged();

private:
void loadPermissions();

QString m_desktopFile;
QList<MPermission> m_permissions;
};

#endif // PERMISSIONSMODEL_H
5 changes: 4 additions & 1 deletion src/plugin/plugin.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2013-2015 Jolla Ltd. <pekka.vuorela@jollamobile.com>
* Copyright (C) 2013 - 2017 Jolla Ltd.
* Copyright (C) 2019 - 2020 Open Mobile Platform LLC.
*
* You may use this file under the terms of the BSD license as follows:
*
Expand Down Expand Up @@ -54,6 +55,7 @@
#include "nfcsettings.h"
#include "userinfo.h"
#include "usermodel.h"
#include "permissionsmodel.h"

class AppTranslator: public QTranslator
{
Expand Down Expand Up @@ -115,6 +117,7 @@ class SystemSettingsPlugin : public QQmlExtensionPlugin
qmlRegisterType<NfcSettings>(uri, 1, 0, "NfcSettings");
qmlRegisterType<UserInfo>(uri, 1, 0, "UserInfo");
qmlRegisterType<UserModel>(uri, 1, 0, "UserModel");
qmlRegisterType<PermissionsModel>(uri, 1, 0, "PermissionsModel");
}
};

Expand Down
6 changes: 4 additions & 2 deletions src/src.pro
Expand Up @@ -39,7 +39,8 @@ SOURCES += \
udisks2job.cpp \
udisks2monitor.cpp \
userinfo.cpp \
usermodel.cpp
usermodel.cpp \
permissionsmodel.cpp

PUBLIC_HEADERS = \
languagemodel.h \
Expand All @@ -64,7 +65,8 @@ PUBLIC_HEADERS = \
locationsettings.h \
timezoneinfo.h \
userinfo.h \
usermodel.h
usermodel.h \
permissionsmodel.h

HEADERS += \
$$PUBLIC_HEADERS \
Expand Down

0 comments on commit 48fd219

Please sign in to comment.