feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Keep the permissions sorted

Browse Source 
The order does not matter but this makes it easier for the user to find
his permission.

Change-Id: Iecb1082c3a67e002df6b0d384a3e02d45673d717
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-05-08 16:35:05 +02:00
parent 0146be396d
commit c5c2407297
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/android/androidpackagecreationwidget.cpp
View File

@@ -152,6 +152,7 @@ void PermissionsModel::setPermissions(const QStringList &permissions)
{ {
beginResetModel(); beginResetModel();
m_permissions = permissions; m_permissions = permissions;
qSort(m_permissions);
endResetModel(); endResetModel();
} }
@@ -162,9 +163,9 @@ const QStringList &PermissionsModel::permissions()
QModelIndex PermissionsModel::addPermission(const QString &permission) QModelIndex PermissionsModel::addPermission(const QString &permission)
{ {
const int idx = m_permissions.count(); const int idx = qLowerBound(m_permissions, permission) - m_permissions.constBegin();
beginInsertRows(QModelIndex(), idx, idx); beginInsertRows(QModelIndex(), idx, idx);
m_permissions.push_back(permission); m_permissions.insert(idx, permission);
endInsertRows(); endInsertRows();
return index(idx); return index(idx);
} }
@@ -175,11 +176,28 @@ bool PermissionsModel::updatePermission(QModelIndex index, const QString &permis
return false; return false;
if (m_permissions[index.row()] == permission) if (m_permissions[index.row()] == permission)
return false; return false;
int newIndex = qLowerBound(m_permissions.constBegin(), m_permissions.constEnd(), permission) - m_permissions.constBegin();
if (newIndex == index.row() || newIndex == index.row() + 1) {
m_permissions[index.row()] = permission; m_permissions[index.row()] = permission;
emit dataChanged(index, index); emit dataChanged(index, index);
return true; return true;
} }
beginMoveRows(QModelIndex(), index.row(), index.row(), QModelIndex(), newIndex);
if (newIndex > index.row()) {
m_permissions.insert(newIndex, permission);
m_permissions.removeAt(index.row());
} else {
m_permissions.removeAt(index.row());
m_permissions.insert(newIndex, permission);
}
endMoveRows();
return true;
}
void PermissionsModel::removePermission(int index) void PermissionsModel::removePermission(int index)
{ {
if (index >= m_permissions.size()) if (index >= m_permissions.size())