alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit mode action

Browse Source 
Summary: needed for the context menu entry

Test Plan: with the p-w- portion the action shows in the context menu

Reviewers: #plasma, #vdg, GB_2, ngraham, davidedmundson

Reviewed By: #plasma, #vdg, ngraham, davidedmundson

Subscribers: davidedmundson, broulik, GB_2, ngraham, kde-frameworks-devel

Tags: #frameworks

Maniphest Tasks: T10190, T11094, T10402

Differential Revision: https://phabricator.kde.org/D24263
This commit is contained in:
Marco Martin 2019-10-18 12:56:21 +02:00
parent 573b9a439f
commit acbb200ac2
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/plasma/corona.cpp
View File

@ -372,6 +372,25 @@ void Corona::setImmutability(const Types::ImmutabilityType immutable)
}
}
action = d->actions.action(QStringLiteral("edit mode"));
if (action) {
switch (d->immutability) {
case Types::UserImmutable:
action->setEnabled(false);
action->setVisible(true);
break;
case Types::SystemImmutable:
action->setEnabled(false);
action->setVisible(false);
break;
case Types::Mutable:
default:
action->setEnabled(true);
action->setVisible(true);
break;
}
}
if (d->immutability != Types::SystemImmutable) {
KConfigGroup cg(config(), "General");
@ -382,19 +401,27 @@ void Corona::setImmutability(const Types::ImmutabilityType immutable)
}
if (d->immutability != Types::Mutable) {
d->editMode = false;
emit editModeChanged();
setEditMode(false);
}
}
void Corona::setEditMode(bool edit)
{
if (d->immutability != Plasma::Types::Mutable || edit == d->editMode) {
if (edit == d->editMode || (edit && d->immutability != Plasma::Types::Mutable)) {
return;
}
QAction *editAction = d->actions.action(QStringLiteral("edit mode"));
if (editAction) {
if (edit) {
editAction->setText(i18n("Finish Customizing Layout"));
} else {
editAction->setText(i18n("Customize Layout..."));
}
}
d->editMode = edit;
emit editModeChanged();
emit editModeChanged(edit);
}
bool Corona::isEditMode() const
@ -467,6 +494,17 @@ void CoronaPrivate::init()
//fake containment/applet actions
KActionCollection *containmentActions = AppletPrivate::defaultActions(q); //containment has to start with applet stuff
ContainmentPrivate::addDefaultActions(containmentActions); //now it's really containment
QAction *editAction = actions.add<QAction>(QStringLiteral("edit mode"));
QObject::connect(editAction, &QAction::triggered, q, [this] () {
q->setEditMode(!q->isEditMode());
});
editAction->setText(i18n("Customize Layout..."));
editAction->setAutoRepeat(true);
editAction->setIcon(QIcon::fromTheme(QStringLiteral("document-edit")));
editAction->setData(Plasma::Types::ControlAction);
editAction->setShortcut(QKeySequence(QStringLiteral("alt+d, e")));
editAction->setShortcutContext(Qt::ApplicationShortcut);
}
void CoronaPrivate::toggleImmutability()

3
src/plasma/corona.h
View File

@ -42,6 +42,7 @@ class PLASMA_EXPORT Corona : public QObject
{
Q_OBJECT
Q_PROPERTY(bool isStartupCompleted READ isStartupCompleted NOTIFY startupCompleted)
Q_PROPERTY(bool editMode READ isEditMode WRITE setEditMode NOTIFY editModeChanged)
Q_PROPERTY(Package package READ package NOTIFY packageChanged)
Q_PROPERTY(KPackage::Package kPackage READ kPackage NOTIFY kPackageChanged)
@ -390,7 +391,7 @@ Q_SIGNALS:
* @see isEditMode()
* @since 5.63
*/
void editModeChanged();
void editModeChanged(bool edit);
#if PLASMA_ENABLE_DEPRECATED_SINCE(5, 6)
/**