summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-01 21:01:32 (UTC)
committer zecke <zecke>2004-04-01 21:01:32 (UTC)
commitd6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0 (patch) (side-by-side diff)
treee387a69279d4417b4436634691f5cde2e503253f
parent1196811eb5fd6f4894b36bbebf81a8eca494f786 (diff)
downloadopie-d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0.zip
opie-d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0.tar.gz
opie-d6c90e60dbc0a5bfd0bb2176a652ca7664a2a4b0.tar.bz2
Unbelievable this widget is done and can be used now
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/okeyconfigwidget.cpp73
-rw-r--r--libopie2/opieui/okeyconfigwidget.h12
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
@@ -3,16 +3,18 @@
#include <qgroupbox.h>
#include <qradiobutton.h>
#include <qpushbutton.h>
#include <qbuttongroup.h>
-
+#include <qmessagebox.h>
#include <qaccel.h>
#include <qlayout.h>
#include <qlabel.h>
+
+/* non gui */
#include <qtimer.h>
using namespace Opie::Ui;
@@ -156,23 +158,23 @@ OKeyPair::List OKeyPair::hardwareKeys() {
}
/**
* Equals operator. Check if two OKeyPairs have the same key and modifier
* @see operator!=
*/
-bool OKeyPair::operator==( const OKeyPair& pair) {
+bool OKeyPair::operator==( const OKeyPair& pair)const {
if ( m_key != pair.m_key ) return false;
if ( m_mod != pair.m_mod ) return false;
return true;
}
/**
* Not equal operator. calls the equal operator internally
*/
-bool OKeyPair::operator!=( const OKeyPair& pair) {
+bool OKeyPair::operator!=( const OKeyPair& pair)const {
return !(*this == pair);
}
/**
* The normal Constructor to create a OKeyConfigItem
@@ -368,13 +370,13 @@ bool OKeyConfigItem::isEmpty()const {
return true;
}
/**
* Check if the KeyPairs are the same
*/
-bool OKeyConfigItem::operator==( const OKeyConfigItem& conf ) {
+bool OKeyConfigItem::operator==( const OKeyConfigItem& conf )const {
/* if ( isEmpty() == conf.isEmpty() ) return true;
else if ( isEmpty() != conf.isEmpty() ) return false;
else if ( !isEmpty()!= conf.isEmpty() ) return false;
*/
if ( m_id != conf.m_id ) return false;
@@ -386,13 +388,13 @@ bool OKeyConfigItem::operator==( const OKeyConfigItem& conf ) {
return true;
}
-bool OKeyConfigItem::operator!=( const OKeyConfigItem& conf ) {
+bool OKeyConfigItem::operator!=( const OKeyConfigItem& conf )const {
return !( *this == conf );
}
/**
* \brief c'tor
* The Constructor for a OKeyConfigManager
@@ -480,17 +482,17 @@ void OKeyConfigManager::load() {
m_conf->setGroup( m_group );
/*
* Read each item
*/
int key, mod;
- for( OKeyConfigItem::List::Iterator it = m_keys.begin();
- it != m_keys.end(); ++it ) {
+ for( OKeyConfigItem::List::Iterator it = m_keys.begin(); it != m_keys.end(); ++it ) {
key = m_conf->readNumEntry( (*it).configKey()+"key", (*it).defaultKeyPair().keycode() );
mod = m_conf->readNumEntry( (*it).configKey()+"mod", (*it).defaultKeyPair().modifier() );
OKeyPair okey( key, mod );
+
if ( !m_blackKeys.contains( okey ) && key != -1 && mod != -1 )
(*it).setKeyPair( OKeyPair(key, mod) );
else
(*it).setKeyPair( OKeyPair::emptyKey() );
}
delete m_map; m_map = 0;
@@ -503,21 +505,21 @@ void OKeyConfigManager::load() {
void OKeyConfigManager::save() {
m_conf->setGroup( m_group );
/*
* Write each item
*/
- for( OKeyConfigItem::List::Iterator it = m_keys.begin();
- it != m_keys.end(); ++it ) {
+ for( OKeyConfigItem::List::Iterator it = m_keys.begin();it != m_keys.end(); ++it ) {
+ /* skip empty items */
if ( (*it).isEmpty() )
continue;
OKeyPair pair = (*it).keyPair();
OKeyPair deft = (*it).defaultKeyPair();
/*
* don't write if it is the default setting
- * FIXME allow to remove Keys
+ * FIXME allow to remove Keys from config
if ( (pair.keycode() == deft.keycode()) &&
(pair.modifier()== deft.modifier() ) )
return;
*/
m_conf->writeEntry((*it).configKey()+"key", pair.keycode() );
@@ -573,23 +575,21 @@ int OKeyConfigManager::handleKeyEventId( QKeyEvent* ev) {
/**
* Add Key Config to the List of items
*/
void OKeyConfigManager::addKeyConfig( const OKeyConfigItem& item ) {
m_keys.append( item );
- qWarning( "m_keys count is now %d", m_keys.count() );
delete m_map; m_map = 0;
}
/**
* Remove the Key from the Config. Internal lists will be destroyed
* and rebuild on demand later
*/
void OKeyConfigManager::removeKeyConfig( const OKeyConfigItem& item ) {
m_keys.remove( item );
- qWarning( "m_keys count is now %d", m_keys.count() );
delete m_map; m_map = 0;
}
/**
* Clears the complete list
*/
@@ -757,12 +757,15 @@ namespace Private {
if ( pair.modifier() & Qt::AltButton )
mod |= Qt::ALT;
return QAccel::keyToString( mod + pair.keycode() );
}
+ /*
+ * the virtual and hardware key events have both issues...
+ */
void fixupKeys( int& key, int &mod, QKeyEvent* e ) {
key = e->key();
mod = e->state();
/*
* virtual keyboard
* else change the button mod only
@@ -1005,13 +1008,12 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
m_def ->setChecked( false );
}
}
}
void OKeyConfigWidget::slotNoKey() {
- qWarning( "No Key" );
m_none->setChecked( true );
m_cus ->setChecked( false );
m_btn ->setEnabled( false );
m_def ->setChecked( false );
if ( !m_view->currentItem() || !m_view->currentItem()->parent() )
@@ -1065,21 +1067,55 @@ void OKeyConfigWidget::slotConfigure() {
updateItem( item, dlg.keyPair() );
}
}
+bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item,
+ const OKeyPair& newItem ) {
+ OKeyPair::List bList = item->manager()->blackList();
+ for ( OKeyPair::List::Iterator it = bList.begin(); it != bList.end(); ++it ) {
+ /* black list matched */
+ if ( *it == newItem ) {
+ QMessageBox::warning( 0, tr("Key is on BlackList" ),
+ tr("<qt>The Key you choose is on the black list "
+ "and may not be used with this manager. Please "
+ "use a different key.</qt>" ) );
+ return false;
+ }
+ }
+ /* no we need to check the other items which is dog slow */
+ QListViewItemIterator it( item->parent() );
+ while ( it.current() ) {
+ /* if not our parent and not us */
+ if (it.current()->parent() && it.current() != item) {
+ /* damn already given away*/
+ if ( newItem == static_cast<Opie::Ui::Private::OKeyListViewItem*>(it.current() )->item().keyPair() ) {
+ QMessageBox::warning( 0, tr("Key is already assigned" ),
+ tr("<qt>The Key you choose is already taken by "
+ "a different Item of your config. Please try"
+ "using a different key.</qt>" ) );
+ return false;
+ }
+ }
+ ++it;
+ }
+
+ return true;
+}
+
void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item,
const OKeyPair& newItem) {
/* sanity check
* check against the blacklist of the manager
* check if another item uses this key which is o(n) at least
*/
- if ( !newItem.isEmpty() ) {
+ if ( !newItem.isEmpty() && !sanityCheck(item, newItem ))
+ return;
+
- }
/*
* If immediate we need to remove and readd the key
*/
if ( m_mode == Imediate )
item->manager()->removeKeyConfig( item->item() );
@@ -1125,13 +1161,12 @@ Opie::Ui::OKeyPair OKeyChooserConfigDialog::keyPair()const{
void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
QDialog::keyPressEvent( ev );
if ( ev->isAutoRepeat() )
return;
- qWarning( "Key Press Event" );
int mod, key;
Opie::Ui::Private::fixupKeys( key,mod, ev );
/* either we used software keyboard
* or we've true support
*/
@@ -1150,19 +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
+ else
m_key = key;
if ( ( !mod || m_key ) && !m_timer->isActive() )
- m_timer->start( 50, true );
+ 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/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h
index 9e26719..f75ed99 100644
--- a/libopie2/opieui/okeyconfigwidget.h
+++ b/libopie2/opieui/okeyconfigwidget.h
@@ -46,14 +46,14 @@ namespace Private {
class OKeyPair {
public:
typedef QValueList<OKeyPair> List;
OKeyPair( int key = -1, int modifier = -1);
~OKeyPair();
- bool operator==( const OKeyPair& );
- bool operator!=( const OKeyPair& );
+ bool operator==( const OKeyPair& )const;
+ bool operator!=( const OKeyPair& )const;
bool isEmpty()const;
int keycode()const;
int modifier()const;
@@ -92,14 +92,14 @@ public:
int id = -1,
const OKeyPair& def = OKeyPair::emptyKey(),
QObject *caller = 0, const char* slot = 0);
OKeyConfigItem( const Opie::Core::ODeviceButton& );
~OKeyConfigItem();
- bool operator==( const OKeyConfigItem& );
- bool operator!=( const OKeyConfigItem& );
+ bool operator==( const OKeyConfigItem& )const;
+ bool operator!=( const OKeyConfigItem& )const;
QString text()const;
QPixmap pixmap()const;
int id()const;
@@ -250,14 +250,16 @@ private slots:
void slotNoKey();
void slotDefaultKey();
void slotCustomKey();
void slotConfigure();
private:
+ static bool sanityCheck( Opie::Ui::Private::OKeyListViewItem* man,
+ const OKeyPair& newItem );
void updateItem( Opie::Ui::Private::OKeyListViewItem* man,
- const OKeyPair& newItem);
+ const OKeyPair& newItem);
void initUi();
Opie::Ui::OListView *m_view;
Opie::Ui::Private::OKeyConfigWidgetPrivateList m_list;
QLabel *m_lbl;
QPushButton *m_btn;
QRadioButton *m_def, *m_cus, *m_none;