| -rw-r--r-- | libopie2/opieui/okeyconfigwidget.cpp | 20 | ||||
| -rw-r--r-- | libopie2/opieui/okeyconfigwidget.h | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp index 2ea0bd5..273f15b 100644 --- a/libopie2/opieui/okeyconfigwidget.cpp +++ b/libopie2/opieui/okeyconfigwidget.cpp @@ -477,197 +477,202 @@ void OKeyConfigManager::load() { */ int key, mod; 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; } /** * We will save the current configuration * to the OConfig. We will change the group. */ void OKeyConfigManager::save() { m_conf->setGroup( m_group ); /* * Write each item */ for( OKeyConfigItem::List::Iterator it = m_keys.begin(); it != m_keys.end(); ++it ) { if ( (*it).isEmpty() ) continue; OKeyPair pair = (*it).keyPair(); OKeyPair deft = (*it).defaultKeyPair(); /* don't write if it is the default setting */ if ( (pair.keycode() == deft.keycode()) && (pair.modifier()== deft.modifier() ) ) return; m_conf->writeEntry((*it).configKey()+"key", pair.keycode() ); m_conf->writeEntry((*it).configKey()+"mod", pair.modifier() ); } } /** * This is function uses a QMap internally but you can have the same keycode * with different modifier key. The behaviour is undefined if you add a OKeyConfigItem * with same keycode and modifier key. The GUI takes care that a user can't * cofigure two keys. * * Make sure you call e->ignore if you don't want to handle this event */ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) { /* * Fix Up issues with Qt/E, my keybard, and virtual input * methods * First my Keyboard delivers 256,512,1024 for shift/ctrl/alt instead of the button state * Also key() on virtual inputmethods are zero and only ascii. We need to fix upper and lower * case ascii */ int key = e->key(); int mod = e->state(); /* * virtual keyboard * else change the button mod only */ - qWarning( "handleKeyEvent...." ); if ( key == 0 ) { key = e->ascii(); if ( key > 96 && key < 123) key -= 32; }else{ int new_mod = 0; if ( mod & 256 ) new_mod |= Qt::ShiftButton; else if ( mod & 512 ) new_mod |= Qt::AltButton; else if ( mod & 1024 ) new_mod |= Qt::ControlButton; mod = new_mod == 0? mod : new_mod; } OKeyConfigItem::List _keyList = keyList( key ); if ( _keyList.isEmpty() ) return OKeyConfigItem(); OKeyConfigItem item; for ( OKeyConfigItem::List::Iterator it = _keyList.begin(); it != _keyList.end(); ++it ) { if ( (*it).keyPair().modifier() == mod ) { item = *it; break; } } return item; } /** * Return the associated id of the item or -1 if no item * matched the key * * @see handleKeyEvent */ int OKeyConfigManager::handleKeyEventId( QKeyEvent* ev) { return handleKeyEvent( ev ).id(); } /** * Add Key Config to the List of items */ void OKeyConfigManager::addKeyConfig( const OKeyConfigItem& item ) { m_keys.append( item ); 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 ); delete m_map; m_map = 0; } /** * Clears the complete list */ void OKeyConfigManager::clearKeyConfig() { m_keys.clear(); delete m_map; m_map = 0; } +/** + * + */ +Opie::Ui::OKeyConfigItem::List OKeyConfigManager::keyConfigList()const{ + return m_keys; +} /** * Add this OKeyPair to the blackList. * Internal lists will be destroyed */ void OKeyConfigManager::addToBlackList( const OKeyPair& key) { m_blackKeys.append( key ); delete m_map; m_map = 0; } /** * Remove this OKeyPair from the black List * Internal lists will be destroyed */ void OKeyConfigManager::removeFromBlackList( const OKeyPair& key ) { m_blackKeys.remove( key ); delete m_map; m_map = 0; } /** * Clear the blackList */ void OKeyConfigManager::clearBlackList() { m_blackKeys.clear(); delete m_map; m_map = 0; } /** * Return a copy of the blackList */ OKeyPair::List OKeyConfigManager::blackList()const { return m_blackKeys; } /** * Ask the Manager to handle KeyEvents for you. * All handled keys will emit a QSignal and return true * that it handled the keyevent */ void OKeyConfigManager::handleWidget( QWidget* wid ) { wid->installEventFilter( this ); } /** * @internal */ bool OKeyConfigManager::eventFilter( QObject* obj, QEvent* ev) { if ( !obj->isWidgetType() ) return false; if ( ev->type() != QEvent::KeyPress && ev->type() != QEvent::KeyRelease ) return false; QKeyEvent *key = static_cast<QKeyEvent*>( ev ); OKeyConfigItem item = handleKeyEvent( key ); if ( item.isEmpty() ) return false; QWidget *wid = static_cast<QWidget*>( obj ); @@ -692,339 +697,348 @@ OKeyConfigItem::List OKeyConfigManager::keyList( int keycode) { * Create the map if not existing anymore */ if ( !m_map ) { m_map = new OKeyMapConfigPrivate; /* for every key */ for ( OKeyConfigItem::List::Iterator it = m_keys.begin(); it!= m_keys.end(); ++it ) { bool add = true; /* see if this key is blocked */ OKeyPair pair = (*it).keyPair(); for ( OKeyPair::List::Iterator pairIt = m_blackKeys.begin(); pairIt != m_blackKeys.end(); ++pairIt ) { if ( (*pairIt).keycode() == pair.keycode() && (*pairIt).modifier() == pair.modifier() ) { add = false; break; } } /* check if we added it */ if ( add ) (*m_map)[pair.keycode()].append( *it ); } } return (*m_map)[keycode]; } ///////////////////////// //////// Widget Starts Here namespace Opie { namespace Ui { namespace Private { static QString keyToString( const OKeyPair& ); class OKeyListViewItem : public Opie::Ui::OListViewItem { public: OKeyListViewItem( const OKeyConfigItem& item, OKeyConfigManager*, Opie::Ui::OListViewItem* parent); ~OKeyListViewItem(); void setDefault(); OKeyConfigItem& item(); void setItem( const OKeyConfigItem& item ); OKeyConfigManager *manager(); private: OKeyConfigItem m_item; OKeyConfigManager* m_manager; }; OKeyListViewItem::OKeyListViewItem( const OKeyConfigItem& item, OKeyConfigManager* man, OListViewItem* parent) : Opie::Ui::OListViewItem( parent ), m_manager( man ) { setItem( item ); } OKeyListViewItem::~OKeyListViewItem() {} OKeyConfigItem &OKeyListViewItem::item(){ return m_item; } OKeyConfigManager* OKeyListViewItem::manager() { return m_manager; } void OKeyListViewItem::setItem( const OKeyConfigItem& item ) { + m_item = item; setPixmap( 0, m_item.pixmap() ); setText ( 1, m_item.text() ); setText ( 2, keyToString( m_item.keyPair() ) ); setText ( 3, keyToString( m_item.defaultKeyPair() ) ); - m_item = item; } QString keyToString( const OKeyPair& pair ) { int mod = 0; if ( pair.modifier() & Qt::ShiftButton ) mod |= Qt::SHIFT; if ( pair.modifier() & Qt::ControlButton ) mod |= Qt::CTRL; if ( pair.modifier() & Qt::AltButton ) mod |= Qt::ALT; return QAccel::keyToString( mod + pair.keycode() ); } struct OKeyConfigWidgetPrivate{ OKeyConfigWidgetPrivate(const QString& = QString::null, OKeyConfigManager* = 0); bool operator==( const OKeyConfigWidgetPrivate& ); QString name; OKeyConfigManager *manager; }; OKeyConfigWidgetPrivate::OKeyConfigWidgetPrivate( const QString& _name, OKeyConfigManager* man ) : name( _name ), manager( man ){} bool OKeyConfigWidgetPrivate::operator==( const OKeyConfigWidgetPrivate& item) { if ( manager != item.manager) return false; if ( name != item.name ) return false; return true; } } } } //////////////////////// /** * * This is a c'tor. You still need to pass the OKeyConfigManager * and then issue a load. * The default mode is Immediate * */ OKeyConfigWidget::OKeyConfigWidget( QWidget* parent, const char *name, WFlags fl ) : QWidget( parent, name, fl ) { initUi(); } /** * c'tor */ OKeyConfigWidget::~OKeyConfigWidget() { } /** * @internal */ void OKeyConfigWidget::initUi() { QBoxLayout *layout = new QVBoxLayout( this ); QGridLayout *gridLay = new QGridLayout( 2, 2 ); layout->addLayout( gridLay, 10 ); gridLay->setRowStretch( 1, 10 ); // let only the ListView strecth /* * LISTVIEW with the Keys */ m_view = new Opie::Ui::OListView( this ); m_view->setFocus(); m_view->setAllColumnsShowFocus( true ); m_view->addColumn( tr("Pixmap") ); m_view->addColumn( tr("Name","Name of the Action in the ListView Header" ) ); m_view->addColumn( tr("Key" ) ); m_view->addColumn( tr("Default Key" ) ); connect(m_view, SIGNAL(currentChanged(QListViewItem*)), this, SLOT(slotListViewItem(QListViewItem*)) ); gridLay->addMultiCellWidget( m_view, 1, 1, 0, 1 ); /* * GROUP with button info */ QGroupBox *box = new QGroupBox( this ); - box ->setEnabled( false ); box ->setTitle( tr("Shortcut for Selected Action") ); box ->setFrameStyle( QFrame::Box | QFrame::Sunken ); layout->addWidget( box, 1 ); gridLay = new QGridLayout( box, 3, 4 ); gridLay->addRowSpacing( 0, fontMetrics().lineSpacing() ); gridLay->setMargin( 4 ); QButtonGroup *gr = new QButtonGroup( box ); gr->hide(); gr->setExclusive( true ); QRadioButton *rad = new QRadioButton( tr( "&None" ), box ); connect( rad, SIGNAL(clicked()), this, SLOT(slotNoKey()) ); gr->insert( rad, 10 ); gridLay->addWidget( rad, 1, 0 ); m_none = rad; rad = new QRadioButton( tr("&Default" ), box ); connect( rad, SIGNAL(clicked()), this, SLOT(slotDefaultKey()) ); gr->insert( rad, 11 ); gridLay->addWidget( rad, 1, 1 ); m_def = rad; rad = new QRadioButton( tr("C&ustom"), box ); connect( rad, SIGNAL(clicked()), this, SLOT(slotCustomKey()) ); gr->insert( rad, 12 ); gridLay->addWidget( rad, 1, 2 ); m_cus = rad; m_btn = new QPushButton( tr("Configure Key"), box ); gridLay->addWidget( m_btn, 1, 4 ); m_lbl= new QLabel( tr( "Default: " ), box ); gridLay->addWidget( m_lbl, 2, 0 ); m_box = gr; } /** * Set the ChangeMode. * You need to call this function prior to load * If you call this function past load the behaviour is undefined * But caling load again is safe */ void OKeyConfigWidget::setChangeMode( enum ChangeMode mode) { m_mode = mode; } /** * return the current mode */ OKeyConfigWidget::ChangeMode OKeyConfigWidget::changeMode()const { return m_mode; } /** * insert these items before calling load */ void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) { Opie::Ui::Private::OKeyConfigWidgetPrivate root( str, man ); m_list.append(root); } /** * loads the items and allows editing them */ void OKeyConfigWidget::load() { + Opie::Ui::Private::OKeyConfigWidgetPrivateList::Iterator it; + for ( it = m_list.begin(); it != m_list.end(); ++it ) { + OListViewItem *item = new OListViewItem( m_view, (*it).name ); + OKeyConfigItem::List list = (*it).manager->keyConfigList(); + for (OKeyConfigItem::List::Iterator keyIt = list.begin(); keyIt != list.end();++keyIt ) + (void )new Opie::Ui::Private::OKeyListViewItem(*keyIt, (*it).manager, item ); + } } /** * Saves if in Queue Mode. It'll update the supplied * OKeyConfigManager objects. * If in Queue mode it'll just return */ void OKeyConfigWidget::save() { } /** * @internal */ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) { if ( !_item || !_item->parent() ) { m_box->setEnabled( false ); m_none->setChecked( true ); m_btn ->setEnabled( false ); m_def ->setChecked( false ); m_cus ->setChecked( false ); }else{ m_box->setEnabled( true ); Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>( _item ); OKeyConfigItem keyItem= item->item(); if ( keyItem.keyPair().isEmpty() ) { m_none->setChecked( true ); m_btn ->setEnabled( false ); m_def ->setChecked( false ); m_cus ->setChecked( false ); }else { m_none->setChecked( false ); m_cus ->setChecked( true ); m_btn ->setEnabled( true ); 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() ) return; /* * If immediate we need to remove and readd the key */ Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem()); if ( m_mode == Imediate ) item->manager()->removeKeyConfig( item->item() ); item->item().setKeyPair( OKeyPair::emptyKey() ); if ( m_mode == Imediate ) item->manager()->addKeyConfig( item->item() ); } void OKeyConfigWidget::slotDefaultKey() { + qWarning( "Slot Default 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() ) return; Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem()); /* * If immediate we need to remove and readd the key */ if ( m_mode == Imediate ) item->manager()->removeKeyConfig( item->item() ); item->item().setKeyPair( item->item().defaultKeyPair() ); if ( m_mode == Imediate ) item->manager()->addKeyConfig( item->item() ); } void OKeyConfigWidget::slotCustomKey() { + qWarning( "SlotCustom Key" ); m_cus ->setChecked( true ); m_btn ->setEnabled( true ); m_def ->setChecked( false ); m_none->setChecked( false ); if ( !m_view->currentItem() || m_view->currentItem()->parent() ) return; } diff --git a/libopie2/opieui/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h index b3309af..a7a5f48 100644 --- a/libopie2/opieui/okeyconfigwidget.h +++ b/libopie2/opieui/okeyconfigwidget.h @@ -119,128 +119,130 @@ protected: QCString slot()const; void setId( int id ); void setConfigKey( const QCString& ); private: QString m_text; QCString m_config; QPixmap m_pix; int m_id; OKeyPair m_key; OKeyPair m_def; QObject *m_obj; QCString m_str; class Private; Private *d; }; /** * \brief A manager to load and save Key Actions and get notified * This is the Manager for KeyActions. * You can say from which config and group to read data, to grab the * keyboard to handle hardware keys, you can supply a blacklist of * keys which should not be used by allowed to be used. * You can even pass this manager to a Widget to do the configuration for you. * You need to add OKeyConfigItem for your keys and then issue a load() to * read the Key information. * You can either handle the QKeyEvent yourself and ask this class if it is * handled by your action and let give you the action. Or you can install * the event filter and get a signal. * You need to load ans save yourself! * * @since 1.1.2 */ class OKeyConfigManager : public QObject { Q_OBJECT typedef QMap<int, OKeyConfigItem::List> OKeyMapConfigPrivate; public: OKeyConfigManager(Opie::Core::OConfig *conf = 0, const QString& group = QString::null, const OKeyPair::List &block = OKeyPair::List(), bool grabkeyboard = false, QObject * par = 0, const char* name = 0 ); ~OKeyConfigManager(); void load(); void save(); OKeyConfigItem handleKeyEvent( QKeyEvent* ); int handleKeyEventId( QKeyEvent* ); void addKeyConfig( const OKeyConfigItem& ); void removeKeyConfig( const OKeyConfigItem& ); void clearKeyConfig(); void addToBlackList( const OKeyPair& ); void removeFromBlackList( const OKeyPair& ); void clearBlackList(); OKeyPair::List blackList()const; void handleWidget( QWidget* ); bool eventFilter( QObject*, QEvent* ); + + OKeyConfigItem::List keyConfigList()const; signals: /** * The Signals are triggered on KeyPress and KeyRelease! * You can check the isDown of the QKeyEvent * @see QKeyEvent */ void actionActivated( QWidget*, QKeyEvent*, const Opie::Ui::OKeyConfigItem& ); /** * This Signal correspondents to the OKeyConfigItem slot * and object * * @see OKeyConfigItem::slot * @see OKeyConfigItem::object */ void actionActivated( QWidget* par, QKeyEvent* key); private: OKeyConfigItem::List keyList( int ); OKeyConfigItem::List m_keys; QValueList<QWidget*> m_widgets; Opie::Core::OConfig *m_conf; QString m_group; OKeyPair::List m_blackKeys; bool m_grab : 1; OKeyMapConfigPrivate *m_map; class Private; Private *d; }; /** * With this Widget you can let the Keyboard Shortcuts * be configured by the user. * There are two ways you can use this widget. Either in a tab were * all changes are immediately getting into effect or in a queue * were you ask for saving. Save won't write the data but only set * it to the OKeyConfigManager * * @since 1.2 */ class OKeyConfigWidget : public QWidget { Q_OBJECT public: /** * Immediate Apply the change directly to the underlying OKeyConfigManager * Queue Save all items and then apply when you save() */ enum ChangeMode { Imediate, Queue }; OKeyConfigWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~OKeyConfigWidget(); void setChangeMode( enum ChangeMode ); ChangeMode changeMode()const; void insert( const QString& name, OKeyConfigManager* ); void load(); void save(); private slots: void slotListViewItem( QListViewItem* ); void slotNoKey(); |