-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 @@ -539,5 +539,4 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) { * else change the button mod only */ - qWarning( "handleKeyEvent...." ); if ( key == 0 ) { key = e->ascii(); @@ -608,4 +607,10 @@ void OKeyConfigManager::clearKeyConfig() { } +/** + * + */ +Opie::Ui::OKeyConfigItem::List OKeyConfigManager::keyConfigList()const{ + return m_keys; +} /** @@ -754,9 +759,9 @@ namespace Private { } 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; } @@ -854,5 +859,4 @@ void OKeyConfigWidget::initUi() { QGroupBox *box = new QGroupBox( this ); - box ->setEnabled( false ); box ->setTitle( tr("Shortcut for Selected Action") ); box ->setFrameStyle( QFrame::Box | QFrame::Sunken ); @@ -930,6 +934,13 @@ void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) { */ 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 ); } +} /** @@ -972,4 +983,5 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) { void OKeyConfigWidget::slotNoKey() { + qWarning( "No Key" ); m_none->setChecked( true ); m_cus ->setChecked( false ); @@ -996,4 +1008,5 @@ void OKeyConfigWidget::slotNoKey() { void OKeyConfigWidget::slotDefaultKey() { + qWarning( "Slot Default Key" ); m_none->setChecked( true ); m_cus ->setChecked( false ); @@ -1019,4 +1032,5 @@ void OKeyConfigWidget::slotDefaultKey() { void OKeyConfigWidget::slotCustomKey() { + qWarning( "SlotCustom Key" ); m_cus ->setChecked( true ); m_btn ->setEnabled( true ); 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 @@ -181,4 +181,6 @@ public: bool eventFilter( QObject*, QEvent* ); + + OKeyConfigItem::List keyConfigList()const; signals: /** |