summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/okeyconfigwidget.cpp20
-rw-r--r--libopie2/opieui/okeyconfigwidget.h2
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
@@ -540,3 +540,2 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) {
540 */ 540 */
541 qWarning( "handleKeyEvent...." );
542 if ( key == 0 ) { 541 if ( key == 0 ) {
@@ -609,2 +608,8 @@ void OKeyConfigManager::clearKeyConfig() {
609 608
609/**
610 *
611 */
612Opie::Ui::OKeyConfigItem::List OKeyConfigManager::keyConfigList()const{
613 return m_keys;
614}
610 615
@@ -755,2 +760,3 @@ namespace Private {
755 void OKeyListViewItem::setItem( const OKeyConfigItem& item ) { 760 void OKeyListViewItem::setItem( const OKeyConfigItem& item ) {
761 m_item = item;
756 setPixmap( 0, m_item.pixmap() ); 762 setPixmap( 0, m_item.pixmap() );
@@ -759,3 +765,2 @@ namespace Private {
759 setText ( 3, keyToString( m_item.defaultKeyPair() ) ); 765 setText ( 3, keyToString( m_item.defaultKeyPair() ) );
760 m_item = item;
761 } 766 }
@@ -855,3 +860,2 @@ void OKeyConfigWidget::initUi() {
855 QGroupBox *box = new QGroupBox( this ); 860 QGroupBox *box = new QGroupBox( this );
856 box ->setEnabled( false );
857 box ->setTitle( tr("Shortcut for Selected Action") ); 861 box ->setTitle( tr("Shortcut for Selected Action") );
@@ -931,3 +935,10 @@ void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) {
931void OKeyConfigWidget::load() { 935void OKeyConfigWidget::load() {
936 Opie::Ui::Private::OKeyConfigWidgetPrivateList::Iterator it;
937 for ( it = m_list.begin(); it != m_list.end(); ++it ) {
938 OListViewItem *item = new OListViewItem( m_view, (*it).name );
939 OKeyConfigItem::List list = (*it).manager->keyConfigList();
940 for (OKeyConfigItem::List::Iterator keyIt = list.begin(); keyIt != list.end();++keyIt )
941 (void )new Opie::Ui::Private::OKeyListViewItem(*keyIt, (*it).manager, item );
932 942
943 }
933} 944}
@@ -973,2 +984,3 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
973void OKeyConfigWidget::slotNoKey() { 984void OKeyConfigWidget::slotNoKey() {
985 qWarning( "No Key" );
974 m_none->setChecked( true ); 986 m_none->setChecked( true );
@@ -997,2 +1009,3 @@ void OKeyConfigWidget::slotNoKey() {
997void OKeyConfigWidget::slotDefaultKey() { 1009void OKeyConfigWidget::slotDefaultKey() {
1010 qWarning( "Slot Default Key" );
998 m_none->setChecked( true ); 1011 m_none->setChecked( true );
@@ -1020,2 +1033,3 @@ void OKeyConfigWidget::slotDefaultKey() {
1020void OKeyConfigWidget::slotCustomKey() { 1033void OKeyConfigWidget::slotCustomKey() {
1034 qWarning( "SlotCustom Key" );
1021 m_cus ->setChecked( true ); 1035 m_cus ->setChecked( 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
@@ -182,2 +182,4 @@ public:
182 bool eventFilter( QObject*, QEvent* ); 182 bool eventFilter( QObject*, QEvent* );
183
184 OKeyConfigItem::List keyConfigList()const;
183signals: 185signals: