author | zecke <zecke> | 2004-04-02 06:43:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-04-02 06:43:42 (UTC) |
commit | a31c8ad914e72b874062dcb31e72476aca735bb0 (patch) (side-by-side diff) | |
tree | 2db1bfd49893369c4ab71bec0e546527c01d6bcd | |
parent | fbe21a008888cef12eb863151b4aaee1e75f0f22 (diff) | |
download | opie-a31c8ad914e72b874062dcb31e72476aca735bb0.zip opie-a31c8ad914e72b874062dcb31e72476aca735bb0.tar.gz opie-a31c8ad914e72b874062dcb31e72476aca735bb0.tar.bz2 |
Add OKeyConfigWidget to the .pro file
and also allow single character shortcuts
-rw-r--r-- | libopie2/opieui/okeyconfigwidget.cpp | 7 | ||||
-rw-r--r-- | libopie2/opieui/opieui.pro | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp index 8967d77..ef6d713 100644 --- a/libopie2/opieui/okeyconfigwidget.cpp +++ b/libopie2/opieui/okeyconfigwidget.cpp @@ -1185,18 +1185,19 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) { case Qt::Key_Alt: mod = Qt::AltButton; break; default: break; } - if (mod ) + if (mod ) { m_mod |= mod; - else + key = 0; + }else m_key = key; - if ( ( !mod || m_key ) && !m_timer->isActive() ) + if ( ( !mod || m_key || key ) && !m_timer->isActive() ) m_timer->start( 150, true ); m_keyPair = OKeyPair( m_key, m_mod ); } m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) ); diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index 0749f7d..e97e82c 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro @@ -2,12 +2,13 @@ TEMPLATE = lib CONFIG += qt warn_on DESTDIR = $(OPIEDIR)/lib HEADERS = oclickablelabel.h \ odialog.h \ ofontselector.h \ oimageeffect.h \ + okeyconfigwidget.h \ olistview.h \ opixmapeffect.h \ opopupmenu.h \ opixmapprovider.h \ oselector.h \ oseparator.h \ @@ -22,12 +23,13 @@ HEADERS = oclickablelabel.h \ owait.h SOURCES = oclickablelabel.cpp \ odialog.cpp \ ofontselector.cpp \ oimageeffect.cpp \ + okeyconfigwidget.cpp \ olistview.cpp \ opixmapeffect.cpp \ opopupmenu.cpp \ opixmapprovider.cpp \ oselector.cpp \ oseparator.cpp \ |