a toggleActivityManager action
still a stub, will be completely managed in qml
This commit is contained in:
parent
9b002a8bea
commit
0baecfcdb5
@ -30,6 +30,11 @@ Rectangle {
|
|||||||
|
|
||||||
property Item containment
|
property Item containment
|
||||||
|
|
||||||
|
function toggleActivityManager() {
|
||||||
|
console.log("Activity manger toggled")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
onContainmentChanged: {
|
onContainmentChanged: {
|
||||||
print("New Containment: " + containment);
|
print("New Containment: " + containment);
|
||||||
print("Old Containment: " + internal.oldContainment);
|
print("Old Containment: " + internal.oldContainment);
|
||||||
|
@ -117,6 +117,14 @@ ShellCorona::ShellCorona(QObject *parent)
|
|||||||
|
|
||||||
//Activity stuff
|
//Activity stuff
|
||||||
|
|
||||||
|
QAction *activityAction = actions()->addAction("manage activities");
|
||||||
|
connect(activityAction, &QAction::triggered,
|
||||||
|
this, &ShellCorona::toggleActivityManager);
|
||||||
|
activityAction->setText(i18n("Activities..."));
|
||||||
|
activityAction->setIcon(QIcon::fromTheme("preferences-activities"));
|
||||||
|
activityAction->setData(Plasma::Types::ConfigureAction);
|
||||||
|
activityAction->setShortcut(QKeySequence("alt+d, alt+a"));
|
||||||
|
activityAction->setShortcutContext(Qt::ApplicationShortcut);
|
||||||
|
|
||||||
connect(this, SIGNAL(immutabilityChanged(Plasma::ImmutabilityType)),
|
connect(this, SIGNAL(immutabilityChanged(Plasma::ImmutabilityType)),
|
||||||
this, SLOT(updateImmutability(Plasma::ImmutabilityType)));
|
this, SLOT(updateImmutability(Plasma::ImmutabilityType)));
|
||||||
@ -455,6 +463,18 @@ void ShellCorona::showWidgetExplorer()
|
|||||||
d->widgetExplorerView->show();
|
d->widgetExplorerView->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ShellCorona::toggleActivityManager()
|
||||||
|
{
|
||||||
|
QPoint cursorPos = QCursor::pos();
|
||||||
|
foreach (DesktopView *view, d->views) {
|
||||||
|
if (view->screen()->geometry().contains(cursorPos)) {
|
||||||
|
//The view QML has to provide something to display the activity explorer
|
||||||
|
view->rootObject()->metaObject()->invokeMethod(view->rootObject(), "toggleActivityManager");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void ShellCorona::syncAppConfig()
|
void ShellCorona::syncAppConfig()
|
||||||
{
|
{
|
||||||
qDebug() << "Syncing plasma-shellrc config";
|
qDebug() << "Syncing plasma-shellrc config";
|
||||||
|
@ -72,6 +72,10 @@ public:
|
|||||||
|
|
||||||
PanelView *panelView(Plasma::Containment *containment) const;
|
PanelView *panelView(Plasma::Containment *containment) const;
|
||||||
|
|
||||||
|
Activity* activity(const QString &id);
|
||||||
|
|
||||||
|
KActivities::Controller *activityController();
|
||||||
|
|
||||||
public Q_SLOTS:
|
public Q_SLOTS:
|
||||||
/**
|
/**
|
||||||
* Request saving applicationConfig on disk, it's event compressed, not immediate
|
* Request saving applicationConfig on disk, it's event compressed, not immediate
|
||||||
@ -119,14 +123,11 @@ protected Q_SLOTS:
|
|||||||
*/
|
*/
|
||||||
void processUpdateScripts();
|
void processUpdateScripts();
|
||||||
|
|
||||||
Activity* activity(const QString &id);
|
|
||||||
|
|
||||||
KActivities::Controller *activityController();
|
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void checkLoadingDesktopsComplete();
|
void checkLoadingDesktopsComplete();
|
||||||
void handleContainmentAdded(Plasma::Containment *c);
|
void handleContainmentAdded(Plasma::Containment *c);
|
||||||
void showWidgetExplorer();
|
void showWidgetExplorer();
|
||||||
|
void toggleActivityManager();
|
||||||
void syncAppConfig();
|
void syncAppConfig();
|
||||||
void setDashboardShown(bool show);
|
void setDashboardShown(bool show);
|
||||||
void checkActivities();
|
void checkActivities();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user