I should have done this a long time ago...
I've switched all hte plasma shortcuts to emacs/screen style, to avoid 
conflicts with other shortcuts. they start with alt-d now. 
(well, except for the zoom ones: I skipped them because they were standard 
shortcuts, but I should switch them in the morning. shame alt-d and +/- are 
opposite ends of the keyboard)

the later this is done the more painful it'll be to relearn shortcuts... so... 
do you think I should backport quickly before the tagging?

-- 
This message brought to you by eevil bananas and the number 3.
www.chani3.com
Property changes on: .
___________________________________________________________________
Modified: reviewboard:url
   - http://mattr.info
   + http://reviewboard.vidsolbach.de

Index: applet.cpp
===================================================================
--- applet.cpp	(revision 913903)
+++ applet.cpp	(working copy)
@@ -911,9 +911,9 @@
         closeApplet->setShortcutContext(Qt::WidgetShortcut); //don't clash with other views
         closeApplet->setText(i18nc("%1 is the name of the applet", "Remove this %1", name()));
         if (isContainment()) {
-            closeApplet->setShortcut(QKeySequence("ctrl+shift+r"));
+            closeApplet->setShortcut(QKeySequence("alt+d,alt+r"));
         } else {
-            closeApplet->setShortcut(QKeySequence("ctrl+r"));
+            closeApplet->setShortcut(QKeySequence("alt+d,r"));
         }
         connect(closeApplet, SIGNAL(triggered(bool)), this, SLOT(selectItemToDestroy()));
         d->actions.addAction("remove", closeApplet);
@@ -1289,10 +1289,10 @@
             configAction->setVisible(canConfig);
             configAction->setEnabled(canConfig);
             if (isContainment()) {
-                //kDebug() << "I am a containment";
-                configAction->setShortcut(QKeySequence("ctrl+shift+s"));
+                //FIXME containments don't seem to use this action any more
+                //configAction->setShortcut(QKeySequence("ctrl+shift+s"));
             } else {
-                configAction->setShortcut(QKeySequence("ctrl+s"));
+                configAction->setShortcut(QKeySequence("alt+d,s"));
             }
             connect(configAction, SIGNAL(triggered(bool)),
                     this, SLOT(showConfigurationInterface()));
Index: containment.cpp
===================================================================
--- containment.cpp	(revision 913903)
+++ containment.cpp	(working copy)
@@ -148,7 +148,7 @@
     appletBrowserAction->setEnabled(unlocked);
     connect(appletBrowserAction, SIGNAL(triggered()), this, SLOT(triggerShowAddWidgets()));
     appletBrowserAction->setShortcutContext(Qt::WidgetShortcut);
-    //appletBrowserAction->setShortcut(QKeySequence("ctrl+a")); //FIXME in KDE 4.3, see bug #165938
+    appletBrowserAction->setShortcut(QKeySequence("alt+d,a"));
     d->actions().addAction("add widgets", appletBrowserAction);
 
     QAction *configureActivityAction = new QAction(i18n("Appearance Settings"), this);
@@ -157,20 +157,22 @@
     configureActivityAction->setVisible(canConfig);
     configureActivityAction->setEnabled(canConfig);
     connect(configureActivityAction, SIGNAL(triggered()), this, SLOT(requestConfiguration()));
+    appletBrowserAction->setShortcutContext(Qt::WidgetShortcut);
+    configureActivityAction->setShortcut(QKeySequence("alt+d,alt+s"));
     d->actions().addAction("activity settings", configureActivityAction);
 
     QAction *action = new QAction(i18n("Next Widget"), this);
     //no icon
     connect(action, SIGNAL(triggered()), this, SLOT(focusNextApplet()));
     action->setShortcutContext(Qt::WidgetShortcut);
-    action->setShortcut(QKeySequence("ctrl+n"));
+    action->setShortcut(QKeySequence("alt+d,n"));
     d->actions().addAction("next applet", action);
 
     action = new QAction(i18n("Previous Widget"), this);
     //no icon
     connect(action, SIGNAL(triggered()), this, SLOT(focusPreviousApplet()));
     action->setShortcutContext(Qt::WidgetShortcut);
-    action->setShortcut(QKeySequence("ctrl+p"));
+    action->setShortcut(QKeySequence("alt+d,p"));
     d->actions().addAction("previous applet", action);
 
     if (immutability() != SystemImmutable) {
@@ -182,7 +184,7 @@
         connect(lockDesktopAction, SIGNAL(triggered(bool)),
                 this, SLOT(toggleDesktopImmutability()));
         lockDesktopAction->setShortcutContext(Qt::WidgetShortcut);
-        lockDesktopAction->setShortcut(QKeySequence("ctrl+l"));
+        lockDesktopAction->setShortcut(QKeySequence("alt+d,l"));
         d->actions().addAction("lock widgets", lockDesktopAction);
     }
 
@@ -212,7 +214,7 @@
         activityAction->setEnabled(unlocked);
         connect(activityAction, SIGNAL(triggered(bool)), this, SLOT(addSiblingContainment()));
         activityAction->setShortcutContext(Qt::WidgetShortcut);
-        activityAction->setShortcut(QKeySequence("ctrl+shift+a"));
+        activityAction->setShortcut(QKeySequence("alt+d,alt+a"));
         d->actions().addAction("add sibling containment", activityAction);
 
         if (d->type == DesktopContainment && d->toolBox) {

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Plasma-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/plasma-devel

Reply via email to