author | zecke <zecke> | 2004-04-01 21:01:32 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-04-01 21:01:32 (UTC) |
commit | d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0 (patch) (unidiff) | |
tree | e387a69279d4417b4436634691f5cde2e503253f | |
parent | 1196811eb5fd6f4894b36bbebf81a8eca494f786 (diff) | |
download | opie-d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0.zip opie-d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0.tar.gz opie-d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0.tar.bz2 |
Unbelievable this widget is done and can be used now
-rw-r--r-- | libopie2/opieui/okeyconfigwidget.cpp | 73 | ||||
-rw-r--r-- | libopie2/opieui/okeyconfigwidget.h | 12 |
2 files changed, 61 insertions, 24 deletions
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp index 3e08416..8967d77 100644 --- a/libopie2/opieui/okeyconfigwidget.cpp +++ b/libopie2/opieui/okeyconfigwidget.cpp | |||
@@ -7,8 +7,10 @@ | |||
7 | #include <qpushbutton.h> | 7 | #include <qpushbutton.h> |
8 | #include <qbuttongroup.h> | 8 | #include <qbuttongroup.h> |
9 | 9 | #include <qmessagebox.h> | |
10 | #include <qaccel.h> | 10 | #include <qaccel.h> |
11 | #include <qlayout.h> | 11 | #include <qlayout.h> |
12 | #include <qlabel.h> | 12 | #include <qlabel.h> |
13 | |||
14 | /* non gui */ | ||
13 | #include <qtimer.h> | 15 | #include <qtimer.h> |
14 | 16 | ||
@@ -160,5 +162,5 @@ OKeyPair::List OKeyPair::hardwareKeys() { | |||
160 | * @see operator!= | 162 | * @see operator!= |
161 | */ | 163 | */ |
162 | bool OKeyPair::operator==( const OKeyPair& pair) { | 164 | bool OKeyPair::operator==( const OKeyPair& pair)const { |
163 | if ( m_key != pair.m_key ) return false; | 165 | if ( m_key != pair.m_key ) return false; |
164 | if ( m_mod != pair.m_mod ) return false; | 166 | if ( m_mod != pair.m_mod ) return false; |
@@ -170,5 +172,5 @@ bool OKeyPair::operator==( const OKeyPair& pair) { | |||
170 | * Not equal operator. calls the equal operator internally | 172 | * Not equal operator. calls the equal operator internally |
171 | */ | 173 | */ |
172 | bool OKeyPair::operator!=( const OKeyPair& pair) { | 174 | bool OKeyPair::operator!=( const OKeyPair& pair)const { |
173 | return !(*this == pair); | 175 | return !(*this == pair); |
174 | } | 176 | } |
@@ -372,5 +374,5 @@ bool OKeyConfigItem::isEmpty()const { | |||
372 | * Check if the KeyPairs are the same | 374 | * Check if the KeyPairs are the same |
373 | */ | 375 | */ |
374 | bool OKeyConfigItem::operator==( const OKeyConfigItem& conf ) { | 376 | bool OKeyConfigItem::operator==( const OKeyConfigItem& conf )const { |
375 | /* if ( isEmpty() == conf.isEmpty() ) return true; | 377 | /* if ( isEmpty() == conf.isEmpty() ) return true; |
376 | else if ( isEmpty() != conf.isEmpty() ) return false; | 378 | else if ( isEmpty() != conf.isEmpty() ) return false; |
@@ -390,5 +392,5 @@ bool OKeyConfigItem::operator==( const OKeyConfigItem& conf ) { | |||
390 | } | 392 | } |
391 | 393 | ||
392 | bool OKeyConfigItem::operator!=( const OKeyConfigItem& conf ) { | 394 | bool OKeyConfigItem::operator!=( const OKeyConfigItem& conf )const { |
393 | return !( *this == conf ); | 395 | return !( *this == conf ); |
394 | } | 396 | } |
@@ -484,9 +486,9 @@ void OKeyConfigManager::load() { | |||
484 | */ | 486 | */ |
485 | int key, mod; | 487 | int key, mod; |
486 | for( OKeyConfigItem::List::Iterator it = m_keys.begin(); | 488 | for( OKeyConfigItem::List::Iterator it = m_keys.begin(); it != m_keys.end(); ++it ) { |
487 | it != m_keys.end(); ++it ) { | ||
488 | key = m_conf->readNumEntry( (*it).configKey()+"key", (*it).defaultKeyPair().keycode() ); | 489 | key = m_conf->readNumEntry( (*it).configKey()+"key", (*it).defaultKeyPair().keycode() ); |
489 | mod = m_conf->readNumEntry( (*it).configKey()+"mod", (*it).defaultKeyPair().modifier() ); | 490 | mod = m_conf->readNumEntry( (*it).configKey()+"mod", (*it).defaultKeyPair().modifier() ); |
490 | OKeyPair okey( key, mod ); | 491 | OKeyPair okey( key, mod ); |
492 | |||
491 | if ( !m_blackKeys.contains( okey ) && key != -1 && mod != -1 ) | 493 | if ( !m_blackKeys.contains( okey ) && key != -1 && mod != -1 ) |
492 | (*it).setKeyPair( OKeyPair(key, mod) ); | 494 | (*it).setKeyPair( OKeyPair(key, mod) ); |
@@ -507,6 +509,6 @@ void OKeyConfigManager::save() { | |||
507 | * Write each item | 509 | * Write each item |
508 | */ | 510 | */ |
509 | for( OKeyConfigItem::List::Iterator it = m_keys.begin(); | 511 | for( OKeyConfigItem::List::Iterator it = m_keys.begin();it != m_keys.end(); ++it ) { |
510 | it != m_keys.end(); ++it ) { | 512 | /* skip empty items */ |
511 | if ( (*it).isEmpty() ) | 513 | if ( (*it).isEmpty() ) |
512 | continue; | 514 | continue; |
@@ -515,5 +517,5 @@ void OKeyConfigManager::save() { | |||
515 | /* | 517 | /* |
516 | * don't write if it is the default setting | 518 | * don't write if it is the default setting |
517 | * FIXME allow to remove Keys | 519 | * FIXME allow to remove Keys from config |
518 | if ( (pair.keycode() == deft.keycode()) && | 520 | if ( (pair.keycode() == deft.keycode()) && |
519 | (pair.modifier()== deft.modifier() ) ) | 521 | (pair.modifier()== deft.modifier() ) ) |
@@ -577,5 +579,4 @@ int OKeyConfigManager::handleKeyEventId( QKeyEvent* ev) { | |||
577 | void OKeyConfigManager::addKeyConfig( const OKeyConfigItem& item ) { | 579 | void OKeyConfigManager::addKeyConfig( const OKeyConfigItem& item ) { |
578 | m_keys.append( item ); | 580 | m_keys.append( item ); |
579 | qWarning( "m_keys count is now %d", m_keys.count() ); | ||
580 | delete m_map; m_map = 0; | 581 | delete m_map; m_map = 0; |
581 | } | 582 | } |
@@ -587,5 +588,4 @@ void OKeyConfigManager::addKeyConfig( const OKeyConfigItem& item ) { | |||
587 | void OKeyConfigManager::removeKeyConfig( const OKeyConfigItem& item ) { | 588 | void OKeyConfigManager::removeKeyConfig( const OKeyConfigItem& item ) { |
588 | m_keys.remove( item ); | 589 | m_keys.remove( item ); |
589 | qWarning( "m_keys count is now %d", m_keys.count() ); | ||
590 | delete m_map; m_map = 0; | 590 | delete m_map; m_map = 0; |
591 | } | 591 | } |
@@ -761,4 +761,7 @@ namespace Private { | |||
761 | } | 761 | } |
762 | 762 | ||
763 | /* | ||
764 | * the virtual and hardware key events have both issues... | ||
765 | */ | ||
763 | void fixupKeys( int& key, int &mod, QKeyEvent* e ) { | 766 | void fixupKeys( int& key, int &mod, QKeyEvent* e ) { |
764 | key = e->key(); | 767 | key = e->key(); |
@@ -1009,5 +1012,4 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) { | |||
1009 | 1012 | ||
1010 | void OKeyConfigWidget::slotNoKey() { | 1013 | void OKeyConfigWidget::slotNoKey() { |
1011 | qWarning( "No Key" ); | ||
1012 | m_none->setChecked( true ); | 1014 | m_none->setChecked( true ); |
1013 | m_cus ->setChecked( false ); | 1015 | m_cus ->setChecked( false ); |
@@ -1069,4 +1071,37 @@ void OKeyConfigWidget::slotConfigure() { | |||
1069 | } | 1071 | } |
1070 | 1072 | ||
1073 | bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item, | ||
1074 | const OKeyPair& newItem ) { | ||
1075 | OKeyPair::List bList = item->manager()->blackList(); | ||
1076 | for ( OKeyPair::List::Iterator it = bList.begin(); it != bList.end(); ++it ) { | ||
1077 | /* black list matched */ | ||
1078 | if ( *it == newItem ) { | ||
1079 | QMessageBox::warning( 0, tr("Key is on BlackList" ), | ||
1080 | tr("<qt>The Key you choose is on the black list " | ||
1081 | "and may not be used with this manager. Please " | ||
1082 | "use a different key.</qt>" ) ); | ||
1083 | return false; | ||
1084 | } | ||
1085 | } | ||
1086 | /* no we need to check the other items which is dog slow */ | ||
1087 | QListViewItemIterator it( item->parent() ); | ||
1088 | while ( it.current() ) { | ||
1089 | /* if not our parent and not us */ | ||
1090 | if (it.current()->parent() && it.current() != item) { | ||
1091 | /* damn already given away*/ | ||
1092 | if ( newItem == static_cast<Opie::Ui::Private::OKeyListViewItem*>(it.current() )->item().keyPair() ) { | ||
1093 | QMessageBox::warning( 0, tr("Key is already assigned" ), | ||
1094 | tr("<qt>The Key you choose is already taken by " | ||
1095 | "a different Item of your config. Please try" | ||
1096 | "using a different key.</qt>" ) ); | ||
1097 | return false; | ||
1098 | } | ||
1099 | } | ||
1100 | ++it; | ||
1101 | } | ||
1102 | |||
1103 | return true; | ||
1104 | } | ||
1105 | |||
1071 | void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item, | 1106 | void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item, |
1072 | const OKeyPair& newItem) { | 1107 | const OKeyPair& newItem) { |
@@ -1075,7 +1110,8 @@ void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item, | |||
1075 | * check if another item uses this key which is o(n) at least | 1110 | * check if another item uses this key which is o(n) at least |
1076 | */ | 1111 | */ |
1077 | if ( !newItem.isEmpty() ) { | 1112 | if ( !newItem.isEmpty() && !sanityCheck(item, newItem )) |
1113 | return; | ||
1114 | |||
1078 | 1115 | ||
1079 | } | ||
1080 | 1116 | ||
1081 | /* | 1117 | /* |
@@ -1129,5 +1165,4 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) { | |||
1129 | return; | 1165 | return; |
1130 | 1166 | ||
1131 | qWarning( "Key Press Event" ); | ||
1132 | int mod, key; | 1167 | int mod, key; |
1133 | Opie::Ui::Private::fixupKeys( key,mod, ev ); | 1168 | Opie::Ui::Private::fixupKeys( key,mod, ev ); |
@@ -1154,11 +1189,11 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) { | |||
1154 | break; | 1189 | break; |
1155 | } | 1190 | } |
1156 | if (mod ) { | 1191 | if (mod ) |
1157 | m_mod |= mod; | 1192 | m_mod |= mod; |
1158 | }else | 1193 | else |
1159 | m_key = key; | 1194 | m_key = key; |
1160 | 1195 | ||
1161 | if ( ( !mod || m_key ) && !m_timer->isActive() ) | 1196 | if ( ( !mod || m_key ) && !m_timer->isActive() ) |
1162 | m_timer->start( 50, true ); | 1197 | m_timer->start( 150, true ); |
1163 | 1198 | ||
1164 | m_keyPair = OKeyPair( m_key, m_mod ); | 1199 | m_keyPair = OKeyPair( m_key, m_mod ); |
diff --git a/libopie2/opieui/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h index 9e26719..f75ed99 100644 --- a/libopie2/opieui/okeyconfigwidget.h +++ b/libopie2/opieui/okeyconfigwidget.h | |||
@@ -50,6 +50,6 @@ public: | |||
50 | ~OKeyPair(); | 50 | ~OKeyPair(); |
51 | 51 | ||
52 | bool operator==( const OKeyPair& ); | 52 | bool operator==( const OKeyPair& )const; |
53 | bool operator!=( const OKeyPair& ); | 53 | bool operator!=( const OKeyPair& )const; |
54 | 54 | ||
55 | bool isEmpty()const; | 55 | bool isEmpty()const; |
@@ -96,6 +96,6 @@ public: | |||
96 | ~OKeyConfigItem(); | 96 | ~OKeyConfigItem(); |
97 | 97 | ||
98 | bool operator==( const OKeyConfigItem& ); | 98 | bool operator==( const OKeyConfigItem& )const; |
99 | bool operator!=( const OKeyConfigItem& ); | 99 | bool operator!=( const OKeyConfigItem& )const; |
100 | 100 | ||
101 | QString text()const; | 101 | QString text()const; |
@@ -254,6 +254,8 @@ private slots: | |||
254 | 254 | ||
255 | private: | 255 | private: |
256 | static bool sanityCheck( Opie::Ui::Private::OKeyListViewItem* man, | ||
257 | const OKeyPair& newItem ); | ||
256 | void updateItem( Opie::Ui::Private::OKeyListViewItem* man, | 258 | void updateItem( Opie::Ui::Private::OKeyListViewItem* man, |
257 | const OKeyPair& newItem); | 259 | const OKeyPair& newItem); |
258 | void initUi(); | 260 | void initUi(); |
259 | Opie::Ui::OListView *m_view; | 261 | Opie::Ui::OListView *m_view; |