5 files changed, 48 insertions, 14 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index c71514c..8b0b0a8 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -59,8 +59,9 @@ struct buttoninfo {
 ButtonSettings::ButtonSettings ( ) 
         : QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp )
 {
         const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
+        (void) ButtonUtils::inst ( ); // initialise
 
         setCaption ( tr( "Button Settings" ));
 
         QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
@@ -132,8 +133,9 @@ ButtonSettings::ButtonSettings ( )
 
         toplay-> addStretch ( 10 );
 
         m_last_button = 0;
+        m_lock = false;
         
         m_timer = new QTimer ( this );
         connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( )));
 
@@ -207,8 +209,12 @@ void ButtonSettings::keyTimeout ( )
 void ButtonSettings::edit ( buttoninfo *bi, bool hold )
 {
                 qDebug ( "remap %s for %s", hold ? "hold" : "press", bi-> m_button-> userText ( ). latin1 ( )); 
         
+        if ( m_lock )
+                return;
+        m_lock = true;
+        
         RemapDlg *d = new RemapDlg ( bi-> m_button, hold, this );
 
                 d-> showMaximized ( );
         if ( d-> exec ( ) == QDialog::Accepted ) {
@@ -226,8 +232,10 @@ void ButtonSettings::edit ( buttoninfo *bi, bool hold )
                 updateLabels ( );
         }
                 
         delete d;
+        
+        m_lock = false;
 }
 
 void ButtonSettings::accept ( )
 {
diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h
index f571825..d41a209 100644
--- a/core/settings/button/buttonsettings.h
+++ b/core/settings/button/buttonsettings.h
@@ -66,8 +66,9 @@ private:
         QTimer *m_timer;
         buttoninfo *m_last_button;
 
         QList <buttoninfo> m_infos;
+        bool m_lock;
 };
 
 #endif
 
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp
index bb70047..91d2af3 100644
--- a/core/settings/button/buttonutils.cpp
+++ b/core/settings/button/buttonutils.cpp
@@ -100,20 +100,28 @@ void ButtonUtils::insertActions ( QListViewItem *here )
 
 
 void ButtonUtils::insertAppLnks ( QListViewItem *here )
 {
-        QStringList types = m_apps-> types ( );
+        QStringList types = m_apps-> types ( );   
+        QListViewItem *typeitem [types. count ( )];
    
+           int i = 0;
         for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {
                 QListViewItem *item = new QListViewItem ( here, m_apps-> typeName ( *it ));
                 item-> setPixmap ( 0, m_apps-> typePixmap ( *it ));
-                
-                for ( QListIterator <AppLnk> appit ( m_apps-> children ( )); *appit; ++appit ) {
-                        AppLnk *l = *appit;
-                        
+        
+                        typeitem [i++] = item;
+                }
+        
+        for ( QListIterator <AppLnk> appit ( m_apps-> children ( )); *appit; ++appit ) {
+                AppLnk *l = *appit;
+        
+                int i = 0;
+                        for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) {       
                         if ( l-> type ( ) == *it ) {
-                                QListViewItem *sub = new QListViewItem ( item, l-> name ( ), QString ( "QPE/Application/" ) + l-> exec ( ), "raise()" );
+                                QListViewItem *sub = new QListViewItem ( typeitem [i], l-> name ( ), QString ( "QPE/Application/" ) + l-> exec ( ), "raise()" );
                                 sub-> setPixmap ( 0, l-> pixmap ( ));
                         }
-                        }       
+                        i++;
+                        }
         }                                  
 }
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 511d0e7..a251bd4 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -1,7 +1,8 @@
 #include <qlistview.h>
 #include <qlabel.h>
 #include <qcombobox.h>
+#include <qtimer.h>
 
 #include "remapdlg.h"
 #include "buttonutils.h"
 
@@ -45,8 +46,13 @@ private:
 RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name )
         : RemapDlgBase ( parent, name, true, WStyle_ContextHelp )
 {
         setCaption ( tr( "%1 %2", "(hold|press) buttoname" ). arg( hold ? tr( "Held" ) : tr( "Pressed" )). arg ( b-> userText ( )));
+
+        m_current = 0;
+        
+        static const char * const def_channels [] = { "QPE/Application/", "QPE/Launcher", "QPE/System", "QPE/TaskBar", "QPE/", 0 };
+        w_channel-> insertStrList ((const char **) def_channels );
         
         m_msg = hold ? b-> heldAction ( ) : b-> pressedAction ( );
         m_msg_preset = hold ? b-> factoryPresetHeldAction ( ) : b-> factoryPresetPressedAction ( );
         
@@ -58,25 +64,32 @@ RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, c
                 QListViewItem *it = new NoSortItem ( w_list, 3, tr( "Actions" ));
         ButtonUtils::inst ( )-> insertActions ( it );
         it-> setOpen ( true );
         
-                it = new NoSortItem ( w_list, 4, tr( "Show" ));
-        ButtonUtils::inst ( )-> insertAppLnks ( it );
+                m_map_show = new NoSortItem ( w_list, 4, tr( "Show" ));
         
         m_current = m_map_custom;
         w_list-> setCurrentItem ( m_current );
         
-        static const char * const def_channels [] = {
-                "QPE/Application/", "QPE/Launcher", "QPE/System", "QPE/TaskBar", "QPE/", 0
-        };
-        
-        w_channel-> insertStrList ((const char **) def_channels );
+        QTimer::singleShot ( 0, this, SLOT( delayedInit ( )));
 }
 
 RemapDlg::~RemapDlg ( )
 {
 }
 
+void RemapDlg::delayedInit ( )
+{
+        bool b = w_list-> viewport ( )-> isUpdatesEnabled ( );
+        w_list-> viewport ( )-> setUpdatesEnabled ( false );
+        
+        ButtonUtils::inst ( )-> insertAppLnks ( m_map_show );
+        
+        w_list-> viewport ( )-> setUpdatesEnabled ( b );
+        
+        m_map_show-> repaint ( );
+}
+
 void RemapDlg::itemChanged ( QListViewItem *it )
 {
         bool enabled = false;
         OQCopMessage m;
diff --git a/core/settings/button/remapdlg.h b/core/settings/button/remapdlg.h
index 8c9cc02..046a22f 100644
--- a/core/settings/button/remapdlg.h
+++ b/core/settings/button/remapdlg.h
@@ -19,8 +19,11 @@ public:
 
 public slots:
         virtual void itemChanged ( QListViewItem * );
         virtual void textChanged ( const QString & );
+        
+private slots:
+        void delayedInit ( );
 
 private:
         Opie::OQCopMessage m_msg;
         Opie::OQCopMessage m_msg_preset;
@@ -29,7 +32,8 @@ private:
         
         QListViewItem *m_map_none;
         QListViewItem *m_map_preset;
         QListViewItem *m_map_custom;
+        QListViewItem *m_map_show;
 };
 
 #endif