Merge pull request #562 from ivaradi/qaction2

Further QAction constructor fixes
This commit is contained in:
Camila Ayres 2018-08-15 17:32:43 +02:00 committed by GitHub
commit 0d9de74726
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -383,7 +383,7 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
// create menu with checkable permissions // create menu with checkable permissions
QMenu *menu = new QMenu(this); QMenu *menu = new QMenu(this);
_permissionReshare= new QAction(tr("Can reshare")); _permissionReshare= new QAction(tr("Can reshare"), this);
_permissionReshare->setCheckable(true); _permissionReshare->setCheckable(true);
_permissionReshare->setEnabled(maxSharingPermissions & SharePermissionShare); _permissionReshare->setEnabled(maxSharingPermissions & SharePermissionShare);
menu->addAction(_permissionReshare); menu->addAction(_permissionReshare);
@ -393,19 +393,19 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
* Files can't have create or delete permissions * Files can't have create or delete permissions
*/ */
if (!_isFile) { if (!_isFile) {
_permissionCreate = new QAction(tr("Can create")); _permissionCreate = new QAction(tr("Can create"), this);
_permissionCreate->setCheckable(true); _permissionCreate->setCheckable(true);
_permissionCreate->setEnabled(maxSharingPermissions & SharePermissionCreate); _permissionCreate->setEnabled(maxSharingPermissions & SharePermissionCreate);
menu->addAction(_permissionCreate); menu->addAction(_permissionCreate);
connect(_permissionCreate, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged); connect(_permissionCreate, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged);
_permissionChange = new QAction(tr("Can change")); _permissionChange = new QAction(tr("Can change"), this);
_permissionChange->setCheckable(true); _permissionChange->setCheckable(true);
_permissionChange->setEnabled(maxSharingPermissions & SharePermissionUpdate); _permissionChange->setEnabled(maxSharingPermissions & SharePermissionUpdate);
menu->addAction(_permissionChange); menu->addAction(_permissionChange);
connect(_permissionChange, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged); connect(_permissionChange, &QAction::triggered, this, &ShareUserLine::slotPermissionsChanged);
_permissionDelete = new QAction(tr("Can delete")); _permissionDelete = new QAction(tr("Can delete"), this);
_permissionDelete->setCheckable(true); _permissionDelete->setCheckable(true);
_permissionDelete->setEnabled(maxSharingPermissions & SharePermissionDelete); _permissionDelete->setEnabled(maxSharingPermissions & SharePermissionDelete);
menu->addAction(_permissionDelete); menu->addAction(_permissionDelete);