- Only record single key global shortcuts

- print a debug message when ignoring the entered shortcuts because
  of conflicts.

svn path=/trunk/KDE/kdebase/workspace/; revision=882188

kcmkwin/kwinrules/ruleswidget.cpp

@@ -778,6 +778,8 @@ ShortcutDialog::ShortcutDialog( const QKeySequence& cut, QWidget* parent )
     , widget( new KKeySequenceWidget( this ))
     {
     widget->setKeySequence( cut );
+    // It's a global shortcut so don't allow multikey shortcuts
+    widget->setMultiKeyShortcutsAllowed(false);
     setMainWidget( widget );
     }
 

utils.cpp

@@ -417,6 +417,8 @@ ShortcutDialog::ShortcutDialog( const QKeySequence& cut )
     // To not check for conflicting shortcuts. The widget would use a message
     // box which brings down kwin.
     widget->setCheckForConflictsAgainst(KKeySequenceWidget::None);
+    // It's a global shortcut so don't allow multikey shortcuts
+    widget->setMultiKeyShortcutsAllowed(false);
 
     // Listen to changed shortcuts
     connect(
@@ -462,8 +464,9 @@ void ShortcutDialog::done( int r )
 void ShortcutDialog::keySequenceChanged(const QKeySequence &seq)
     {
     // Check if the key sequence is used currently
-    QStringList conflicting = KGlobalAccel::findActionNameSystemwide(seq);
+    QList<KGlobalShortcutInfo> conflicting = KGlobalAccel::getGlobalShortcutsByKey(seq);
     if (!conflicting.isEmpty()) {
+        kDebug() << "TODO: Display conflicting shortcuts to user";
         // TODO: Inform the user somehow instead of just ignoring his wish
         widget->setKeySequence(shortcut());
         }