[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2009-03-19 18:13:13
Message-ID: 1237486393.125679.4886.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 941473 by hein:

On KDE 4.2+, call the new setMultiKeyShortcutsAllowed(false)
on the first-run dialog's KKeySequenceWidget, for consistency
with KShortcutsDialog which doesn't allow multi-key global
shortcuts as they don't work.


 M  +4 -0      ChangeLog  
 M  +5 -0      app/firstrundialog.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #941472:941473
@@ -14,6 +14,10 @@
   or higher and KDE 4.3 or higher.
 * Added a feature to disable keyboard input for a session (via a user-con-
   figured shortcut or the context menu).
+* On KDE 4.2 and higher, the first-run dialog now no longer allows setting
+  a multi-key shortcut to open/close the window, consistent with the short-
+  cut configuration dialog (the required API is new in 4.2). The reason
+  multi-key global shortcuts are not allowed in KDE is that they don't work.
 
 
 Changes in 2.9.4:
--- trunk/extragear/utils/yakuake/app/firstrundialog.cpp #941472:941473
@@ -24,6 +24,7 @@
 #include "ui_firstrundialog.h"
 
 #include <KGlobalAccel>
+#include <kdeversion.h>
 
 
 FirstRunDialog::FirstRunDialog(MainWindow* mainWindow) : KDialog(mainWindow)
@@ -55,6 +56,10 @@
 
 void FirstRunDialog::initKeyButton()
 {
+#if KDE_IS_VERSION(4,2,0)
+    m_ui->keyButton->setMultiKeyShortcutsAllowed(false);
+#endif
+
     m_ui->keyButton->blockSignals(true);
 
     KAction* action = \
static_cast<KAction*>(m_mainWindow->actionCollection()->action("toggle-window-state"));



[prev in list] [next in list] [prev in thread] [next in thread]