3 files changed, 60 insertions, 53 deletions

diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index f5812ba..f94edde 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -111,67 +111,69 @@ ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
         }
         else
         {
             owarn << "couldn't open '" << conffile.name() << "' for reading" << oendl;
             continue;
         }
     }
 
     for ( StringMap::Iterator it = bindEntries.begin(); it != bindEntries.end(); ++it )
     {
         odebug << "found binding '" << it.key() << "' defined in '" << it.data().latin1() << "'" << oendl;
         cbBindTo->insertItem( it.key() );
     }
 }
 
 ConfigDialog::~ConfigDialog()
 {
 }
 
 void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& value )
 {
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
+    QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
     QString action;
 
     for ( int i = 0; i < nCards; ++i )
     {
         QString cardSection = QString( "Card_%1" ).arg( i );
         cfg.setGroup( cardSection );
         QString name = cfg.readEntry( "name" );
-        odebug << "comparing card '" << card->name() << "' with known card '" << name << "'" << oendl;
-        if ( card->name() == name )
+        odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+        if ( cardName == name )
         {
             cfg.writeEntry( key, value );
             break;
         }
     }
 }
 
 QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& defaultValue )
 {
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
+    QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
     QString value;
 
     for ( int i = 0; i < nCards; ++i )
     {
         QString cardSection = QString( "Card_%1" ).arg( i );
         cfg.setGroup( cardSection );
         QString name = cfg.readEntry( "name" );
-        odebug << "comparing card '" << card->name() << "' with known card '" << name << "'" << oendl;
-        if ( card->name() == name )
+        odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+        if ( cardName == name )
         {
             value = cfg.readEntry( key, defaultValue );
             break;
         }
     }
     return value;
 }
 
 
 QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
 {
     return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
 }
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index e435f61..af23f58 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -45,128 +45,131 @@ using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qcombobox.h>
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
-PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
+PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent ), popupMenu( 0 )
 {
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
              SIGNAL( received(const QCString&,const QByteArray&) ), this,
              SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
     setFocusPolicy( NoFocus );
     setFixedWidth ( AppLnk::smallIconSize() );
     setFixedHeight ( AppLnk::smallIconSize() );
     pm = Opie::Core::OResource::loadPixmap( "pcmcia/pcmcia", Opie::Core::OResource::SmallIcon );
     configuring = false;
 
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
                 this, SLOT(handleSystemChannel(const QCString&,const QByteArray&)) );
 }
 
 
 PcmciaManager::~PcmciaManager()
 {
 }
 
 void PcmciaManager::handleSystemChannel( const QCString&msg, const QByteArray& )
 {
     if ( msg == "returnFromSuspend()" )
     {
         if ( !OPcmciaSystem::instance()->cardCount() ) return;
         OPcmciaSystem* sys = OPcmciaSystem::instance();
         OPcmciaSystem::CardIterator it = sys->iterator();
-        OPcmciaSocket* theCard = 0;
 
         while ( it.current() )
         {
-            if ( it.current()->isEmpty() )
+            if ( !it.current()->isEmpty() )
             {
-                executeResumeAction( theCard );
+                executeAction( it.current(), "resume" );
             }
         ++it;
         }
     }
 }
 
 void PcmciaManager::popUp( QString message, QString icon )
 {
-    if ( !popupMenu ) {
+    if ( !popupMenu)
+    {
         popupMenu = new QPopupMenu( this );
+        popupMenu->setFocusPolicy( QWidget::NoFocus );
     }
-
     popupMenu->clear();
+
     if ( icon.isEmpty() ) {
         popupMenu->insertItem( message, 0 );
     } else {
         popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
                                message, 0 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = popupMenu->sizeHint();
     popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                               p.y() - s.height() ), 0 );
 
     QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
 }
 
 
 void PcmciaManager::popupTimeout()
 {
     popupMenu->hide();
 }
 
 enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE };
+static const char* actionText[] = { "eject", "insert", "suspend", "resum", "resett", "configur" };
 
 void PcmciaManager::mousePressEvent( QMouseEvent* )
 {
     QPopupMenu* menu = new QPopupMenu( this );
     QStringList cmd;
     bool execute = true;
 
     OPcmciaSystem* sys = OPcmciaSystem::instance();
+    sys->synchronize();
     OPcmciaSystem::CardIterator it = sys->iterator();
     if ( !sys->count() ) return;
 
     int i = 0;
     while ( it.current() )
     {
         QPopupMenu* submenu = new QPopupMenu( menu );
         submenu->insertItem( "&Eject",     EJECT+i*100 );
         submenu->insertItem( "&Insert",    INSERT+i*100 );
         submenu->insertItem( "&Suspend",   SUSPEND+i*100 );
         submenu->insertItem( "&Resume",    RESUME+i*100 );
         submenu->insertItem( "Rese&t",     RESET+i*100 );
         submenu->insertItem( "&Configure", CONFIGURE+i*100 );
 
         submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() );
         submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
         submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
         submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
         submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
 
         connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
         menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
         ++it;
     }
@@ -189,196 +192,199 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
 
     if ( !OPcmciaSystem::instance()->cardCount() ) return;
 
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
 
     OPcmciaSystem* sys = OPcmciaSystem::instance();
     OPcmciaSystem::CardIterator it = sys->iterator();
 
     bool newCard = true;
     OPcmciaSocket* theCard = 0;
 
     while ( it.current() && newCard )
     {
         if ( it.current()->isEmpty() )
         {
             odebug << "pcmcia: skipping empty card in socket " << it.current()->number() << oendl;
             ++it;
             continue;
         }
         else
         {
             theCard = it.current();
-            QString cardName = theCard->productIdentity().join( " " );
+            QString cardName = theCard->productIdentity().join( " " ).stripWhiteSpace();
             for ( int i = 0; i < nCards; ++i )
             {
                 QString cardSection = QString( "Card_%1" ).arg( i );
                 cfg.setGroup( cardSection );
                 QString name = cfg.readEntry( "name" );
                 odebug << "pcmcia: comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
                 if ( cardName == name )
                 {
                     newCard = false;
                     odebug << "pcmcia: we have seen this card before" << oendl;
-                    executeInsertAction( theCard );
+                    executeAction( theCard, "insert" );
                     break;
                 }
             }
             if ( !newCard ) ++it; else break;
         }
     }
     if ( newCard )
     {
         odebug << "pcmcia: unconfigured card detected" << oendl;
         QString newCardName = theCard->productIdentity().join( " " ).stripWhiteSpace();
         int result = QMessageBox::information( qApp->desktop(),
                                            tr( "PCMCIA/CF Subsystem" ),
                                            tr( "<qt>You have inserted the card<br/><b>%1</b><br/>This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ),
                                            tr( "Yes" ), tr( "No" ), 0, 0, 1 );
         odebug << "pcmcia: result = " << result << oendl;
         if ( result == 0 )
         {
             QString insertAction; QString resumeAction; QString driver; QString conf;
             bool configured = configure( theCard, insertAction, resumeAction, driver, conf );
 
             if ( configured )
             {
                 odebug << "pcmcia: card has been configured. writing out to database" << oendl;
                 cfg.setGroup( QString( "Card_%1" ).arg( nCards ) );
                 cfg.writeEntry( "name", newCardName );
                 cfg.writeEntry( "insertAction", insertAction );
                 cfg.writeEntry( "resumeAction", resumeAction );
                 cfg.setGroup( "Global" );
                 cfg.writeEntry( "nCards", nCards+1 );
                 cfg.write();
 
-                QFile confFile( QString( "/etc/pcmcia/%1" ).arg( conf ) );
+                QFile confFile( conf );
                 if ( confFile.open( IO_ReadWrite | IO_Append ) )
                 {
                     QString entryCard = QString( "card \"%1\"" ).arg( newCardName );
                     QString entryVersion( "    version " );
                     for ( QStringList::Iterator it = theCard->productIdentity().begin(); it != theCard->productIdentity().end(); ++it )
                     {
                         entryVersion += QString( "\"%1\", " ).arg( *it );
                     }
                     QString entryBind = QString( "    bind %1" ).arg( driver );
                     QString entry = QString( "\n%1\n%2\n%3\n" ).arg( entryCard ).arg( entryVersion ).arg( entryBind );
                     odebug << "pcmcia: writing entry...:" << entry << oendl;
 
                     confFile.writeBlock( (const char*) entry, entry.length() );
                     Global::statusMessage( "restarting pcmcia services..." );
                     ::system( "/etc/init.d/pcmcia restart" );
                 }
                 else
                 {
-                    owarn << "pcmcia: couldn't write binding to '" << conf << "'." << oendl;
+                    owarn << "pcmcia: couldn't write binding to '" << conf << "' ( " << strerror( errno ) << " )." << oendl;
                 }
             }
             else
             {
                 odebug << "pcmcia: card has not been configured this time. leaving as unknown card" << oendl;
             }
         }
         else
         {
             odebug << "pcmcia: user doesn't want to configure " << newCardName << " now." << oendl;
         }
     }
     else // it's an already configured card
     {
-        QString insertAction = ConfigDialog::preferredAction( theCard, "insert" );
-        odebug << "pcmcia: card has been previously configured" << oendl;
-        odebug << "pcmcia: TODO: need to perform action'" << insertAction << "' now... sorry, not yet implemented..." << oendl;
+        odebug << "pcmcia: doing nothing... why do we come here?" << oendl;
     }
-    repaint( true );
 }
 
-
 void PcmciaManager::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
-    odebug << "sockets = " << OPcmciaSystem::instance()->count() << ", cards = " << OPcmciaSystem::instance()->cardCount() << oendl;
-
-    if ( OPcmciaSystem::instance()->cardCount() )
-    {
-        p.drawPixmap( 0, 0, pm );
-        show();
-    }
-    else
-    {
-        hide();
-    }
+    p.drawPixmap( 0, 0, pm );
 }
 
 int PcmciaManager::position()
 {
     return 7;
 }
 
 void PcmciaManager::execCommand( const QStringList &strList )
 {
 }
 
 void PcmciaManager::userCardAction( int action )
 {
     odebug << "pcmcia: user action on socket " << action / 100 << " requested. action = " << action << oendl;
 
     int socket = action / 100;
     int what = action % 100;
     bool success = false;
 
     switch ( what )
     {
         case CONFIGURE:
         {
             QString insertAction; QString resumeAction; QString driver; QString conf;
-            bool result = configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
-            success = true;
-            break;
+            configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
+            return;
         }
-        case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break;
-        case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert(); break;
-        case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend(); break;
-        case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume(); break;
-        case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break;
-        default: odebug << "pcmcia: not yet implemented" << oendl;
+        case EJECT:   success = OPcmciaSystem::instance()->socket( socket )->eject();
+                      break;
+        case INSERT:  success = OPcmciaSystem::instance()->socket( socket )->insert();
+                      break;
+        case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend();
+                      break;
+        case RESUME:  success = OPcmciaSystem::instance()->socket( socket )->resume();
+                      break;
+        case RESET:   success = OPcmciaSystem::instance()->socket( socket )->reset();
+                      break;
+        default:      odebug << "pcmcia: not yet implemented" << oendl;
     }
 
-    if ( !success )
+    if ( success )
     {
-        owarn << "pcmcia: couldn't perform user action (" << strerror( errno ) << ")" << oendl;
+        popUp( tr( "Successfully %1ed card in socket #%2" ).arg( actionText[action] ).arg( socket ) );
+    }
+    else
+    {
+        popUp( tr( "Error while %1ing card in socket #%2" ).arg( actionText[action] ).arg( socket ) );
     }
-
 }
 
 bool PcmciaManager::configure( OPcmciaSocket* card, QString& insertAction, QString& resumeAction, QString& driver, QString& conf )
 {
     configuring = true;
     ConfigDialog dialog( card, qApp->desktop() );
     int configresult = QPEApplication::execDialog( &dialog, false );
     configuring = false;
     odebug << "pcmcia: configresult = " << configresult << oendl;
     if ( configresult )
     {
         insertAction = dialog.cbInsertAction->currentText();
         resumeAction = dialog.cbResumeAction->currentText();
         driver = dialog.cbBindTo->currentText();
         conf = dialog.bindEntries[driver];
     }
     return configresult;
 }
 
-void PcmciaManager::executeInsertAction( Opie::Core::OPcmciaSocket* card )
-{
-    odebug << "pcmcia: execute insert action" << oendl;
-}
-
-void PcmciaManager::executeResumeAction( Opie::Core::OPcmciaSocket* card )
+void PcmciaManager::executeAction( Opie::Core::OPcmciaSocket* card, const QString& type )
 {
-    odebug << "pcmcia: execute resume action" << oendl;
+    odebug << "pcmcia: performing " << type << " action ..." << oendl;
+    QString theAction = ConfigDialog::preferredAction( card, type );
+    int intAction = card->number() * 100;
+    if ( theAction == "activate" ) ;
+    else if ( theAction == "eject" ) intAction += EJECT;
+    else if ( theAction == "suspend" ) intAction += SUSPEND;
+    else if ( theAction == "prompt for" )
+    {
+        odebug << "pcmcia: sorry, not 'prompt for' is not yet implemented!" << oendl;
+        return;
+    }
+    else
+    {
+        owarn << "pcmcia: action '" << theAction << "' not known. Huh?" << oendl;
+        return;
+    }
+    userCardAction( intAction );
 }
 
-
 EXPORT_OPIE_APPLET_v1( PcmciaManager )
 
diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h
index 6567cd7..de7d6bf 100644
--- a/noncore/applets/pcmcia/pcmcia.h
+++ b/noncore/applets/pcmcia/pcmcia.h
@@ -36,38 +36,37 @@
 
 namespace Opie { namespace Core { class OPcmciaSocket; } };
 
 class PcmciaManager : public QWidget
 {
     Q_OBJECT
   public:
     PcmciaManager( QWidget *parent = 0 );
     ~PcmciaManager();
     static int position();
 
   private slots:
     void handleSystemChannel( const QCString&, const QByteArray& );
     void cardMessage( const QCString&, const QByteArray& );
     void userCardAction( int action );
     void popupTimeout();
 
   protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
 
   private:
     bool configure( Opie::Core::OPcmciaSocket*, QString&, QString&, QString&, QString& );
     void execCommand( const QStringList &command );
-    void executeInsertAction( Opie::Core::OPcmciaSocket* );
-    void executeResumeAction( Opie::Core::OPcmciaSocket* );
-    void popUp(QString message, QString icon = QString::null );
+    void executeAction( Opie::Core::OPcmciaSocket*, const QString& );
+    void popUp( QString message, QString icon = QString::null );
 
   private:
     bool configuring;
     int commandOrig;
     QPixmap pm;
     QPopupMenu *popupMenu;
 
 };
 
 #endif