summaryrefslogtreecommitdiff
Side-by-side diff
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 ) {
*/
- qWarning( "handleKeyEvent...." );
if ( key == 0 ) {
@@ -609,2 +608,8 @@ void OKeyConfigManager::clearKeyConfig() {
+/**
+ *
+ */
+Opie::Ui::OKeyConfigItem::List OKeyConfigManager::keyConfigList()const{
+ return m_keys;
+}
@@ -755,2 +760,3 @@ namespace Private {
void OKeyListViewItem::setItem( const OKeyConfigItem& item ) {
+ m_item = item;
setPixmap( 0, m_item.pixmap() );
@@ -759,3 +765,2 @@ namespace Private {
setText ( 3, keyToString( m_item.defaultKeyPair() ) );
- m_item = item;
}
@@ -855,3 +860,2 @@ void OKeyConfigWidget::initUi() {
QGroupBox *box = new QGroupBox( this );
- box ->setEnabled( false );
box ->setTitle( tr("Shortcut for Selected Action") );
@@ -931,3 +935,10 @@ 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 );
+ }
}
@@ -973,2 +984,3 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
void OKeyConfigWidget::slotNoKey() {
+ qWarning( "No Key" );
m_none->setChecked( true );
@@ -997,2 +1009,3 @@ void OKeyConfigWidget::slotNoKey() {
void OKeyConfigWidget::slotDefaultKey() {
+ qWarning( "Slot Default Key" );
m_none->setChecked( true );
@@ -1020,2 +1033,3 @@ void OKeyConfigWidget::slotDefaultKey() {
void OKeyConfigWidget::slotCustomKey() {
+ qWarning( "SlotCustom Key" );
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:
bool eventFilter( QObject*, QEvent* );
+
+ OKeyConfigItem::List keyConfigList()const;
signals: