more work on configuring unsupported cards

1 files changed, 8 insertions, 4 deletions

diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 6c18e86..fac7065 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -76,2 +76,3 @@ PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
     pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
+    configuring = false;
 }
@@ -112,3 +113,3 @@ void PcmciaManager::popupTimeout()
 
-enum { EJECT, INSERT, SUSPEND, RESUME, CONFIGURE };
+enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE };
 
@@ -132,2 +133,3 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->insertItem( "&Resume",    RESUME+i*100 );
+        submenu->insertItem( "Rese&t",     RESET+i*100 );
         submenu->insertItem( "&Configure", CONFIGURE+i*100 );
@@ -138,3 +140,3 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
-        submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() );
+        submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
 
@@ -273,4 +275,6 @@ void PcmciaManager::configure( OPcmciaSocket* card )
 {
-    ConfigDialog dialog( card->identity(), qApp->desktop() );
-    int configresult = dialog.exec();
+    configuring = true;
+    ConfigDialog dialog( card, qApp->desktop() );
+    int configresult = QPEApplication::execDialog( &dialog, false );
+    configuring = false;
     odebug << "pcmcia: configresult = " << configresult << oendl;