summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/okeyconfigwidget.cpp7
-rw-r--r--libopie2/opieui/opieui.pro2
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 ) {
1185 case Qt::Key_Alt: 1185 case Qt::Key_Alt:
1186 mod = Qt::AltButton; 1186 mod = Qt::AltButton;
1187 break; 1187 break;
1188 default: 1188 default:
1189 break; 1189 break;
1190 } 1190 }
1191 if (mod ) 1191 if (mod ) {
1192 m_mod |= mod; 1192 m_mod |= mod;
1193 else 1193 key = 0;
1194 }else
1194 m_key = key; 1195 m_key = key;
1195 1196
1196 if ( ( !mod || m_key ) && !m_timer->isActive() ) 1197 if ( ( !mod || m_key || key ) && !m_timer->isActive() )
1197 m_timer->start( 150, true ); 1198 m_timer->start( 150, true );
1198 1199
1199 m_keyPair = OKeyPair( m_key, m_mod ); 1200 m_keyPair = OKeyPair( m_key, m_mod );
1200 } 1201 }
1201 1202
1202 m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) ); 1203 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
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3DESTDIR = $(OPIEDIR)/lib 3DESTDIR = $(OPIEDIR)/lib
4HEADERS = oclickablelabel.h \ 4HEADERS = oclickablelabel.h \
5 odialog.h \ 5 odialog.h \
6 ofontselector.h \ 6 ofontselector.h \
7 oimageeffect.h \ 7 oimageeffect.h \
8 okeyconfigwidget.h \
8 olistview.h \ 9 olistview.h \
9 opixmapeffect.h \ 10 opixmapeffect.h \
10 opopupmenu.h \ 11 opopupmenu.h \
11 opixmapprovider.h \ 12 opixmapprovider.h \
12 oselector.h \ 13 oselector.h \
13 oseparator.h \ 14 oseparator.h \
@@ -22,12 +23,13 @@ HEADERS = oclickablelabel.h \
22 owait.h 23 owait.h
23 24
24SOURCES = oclickablelabel.cpp \ 25SOURCES = oclickablelabel.cpp \
25 odialog.cpp \ 26 odialog.cpp \
26 ofontselector.cpp \ 27 ofontselector.cpp \
27 oimageeffect.cpp \ 28 oimageeffect.cpp \
29 okeyconfigwidget.cpp \
28 olistview.cpp \ 30 olistview.cpp \
29 opixmapeffect.cpp \ 31 opixmapeffect.cpp \
30 opopupmenu.cpp \ 32 opopupmenu.cpp \
31 opixmapprovider.cpp \ 33 opixmapprovider.cpp \
32 oselector.cpp \ 34 oselector.cpp \
33 oseparator.cpp \ 35 oseparator.cpp \