yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ok, I meant KKeySequenceWidget, not KShortcutWidget.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=731739
This commit is contained in:
Luboš Luňák 2007-11-01 19:01:01 +00:00
parent 26149b29fb
commit 95d28eb246
2 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
kcmkwin/kwinrules/ruleswidget.cpp
View file

@ -740,7 +740,7 @@ EditShortcut::EditShortcut( QWidget* parent )
void EditShortcut::editShortcut()
{
ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
ShortcutDialog dlg( QKeySequence( shortcut->text()), topLevelWidget());
if( dlg.exec() == QDialog::Accepted )
shortcut->setText( dlg.shortcut().toString());
}
@ -772,48 +772,38 @@ QString EditShortcutDialog::shortcut() const
return widget->shortcut->text();
}
ShortcutDialog::ShortcutDialog( const KShortcut& cut, QWidget* parent )
ShortcutDialog::ShortcutDialog( const QKeySequence& cut, QWidget* parent )
: KDialog( parent )
, widget( new KShortcutWidget( this ))
, widget( new KKeySequenceWidget( this ))
{
widget->setShortcut( cut );
widget->setKeySequence( cut );
setMainWidget( widget );
}
void ShortcutDialog::accept()
{
for( int i = 0;
i < 2;
++i )
QKeySequence seq = shortcut();
if( !seq.isEmpty())
{
QKeySequence seq = i == 0 ? shortcut().primary() : shortcut().alternate();
if( seq.isEmpty())
break;
if( seq[0] == Qt::Key_Escape )
{
reject();
return;
}
if( seq[0] == Qt::Key_Space )
if( seq[0] == Qt::Key_Space
|| (seq[0] & Qt::KeyboardModifierMask) == 0 )
{ // clear
widget->setShortcut( KShortcut());
widget->clearKeySequence();
KDialog::accept();
return;
}
if( (seq[0] & Qt::KeyboardModifierMask) == 0 )
{ // no shortcuts without modifiers
KShortcut cut = shortcut();
cut.remove( seq );
widget->setShortcut( cut );
return;
}
}
KDialog::accept();
}
KShortcut ShortcutDialog::shortcut() const
QKeySequence ShortcutDialog::shortcut() const
{
return widget->shortcut();
return widget->keySequence();
}
} // namespace

8
kcmkwin/kwinrules/ruleswidget.h
View file

@ -22,7 +22,7 @@
#include <kdialog.h>
#include <kwindowsystem.h>
#include <kshortcutwidget.h>
#include <kkeysequencewidget.h>
#include "ruleswidgetbase.h"
#include "ui_editshortcut.h"
@ -139,11 +139,11 @@ class ShortcutDialog
{
Q_OBJECT
public:
ShortcutDialog( const KShortcut& cut, QWidget* parent = NULL );
ShortcutDialog( const QKeySequence& cut, QWidget* parent = NULL );
virtual void accept();
KShortcut shortcut() const;
QKeySequence shortcut() const;
private:
KShortcutWidget* widget;
KKeySequenceWidget* widget;
};
} // namespace