1 files changed, 44 insertions, 70 deletions

diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index c6386cb..187adc6 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -1,55 +1,56 @@
 /*
                              This file is part of the Opie Project
-             =.             (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+             =.              (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "pcmcia.h"
 #include "configdialog.h"
+#include "promptactiondialog.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #include <opie2/oconfig.h>
 #include <opie2/oprocess.h>
 #include <opie2/opcmciasystem.h>
 #include <opie2/oresource.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 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>
@@ -117,50 +118,50 @@ void PcmciaManager::popUp( QString message, QString icon )
     }
     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" };
+enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE, ACTIVATE };
+static const char* actionText[] = { "eject", "insert", "suspend", "resum", "resett", "configur", "activat" };
 
 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 );
 
         bool isSuspended = it.current()->isSuspended();
@@ -225,170 +226,143 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
                 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;
                     executeAction( theCard, "insert" );
                     break;
                 }
             }
             if ( !newCard ) ++it; else break;
         }
     }
     if ( newCard )
     {
         odebug << "pcmcia: unconfigured card detected" << oendl;
         QString newCardName = theCard->productIdentity();
         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( conf );
-                if ( confFile.open( IO_ReadWrite | IO_Append ) )
-                {
-                    QString entryCard = QString( "card \"%1\"" ).arg( newCardName );
-                    QString entryVersion( "    version " );
-                    for ( QStringList::Iterator it = theCard->productIdentityVector().begin(); it != theCard->productIdentityVector().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 << "' ( " << strerror( errno ) << " )." << oendl;
-                }
-            }
-            else
-            {
-                odebug << "pcmcia: card has not been configured this time. leaving as unknown card" << oendl;
-            }
+            configure( theCard );
         }
         else
         {
             odebug << "pcmcia: user doesn't want to configure " << newCardName << " now." << oendl;
         }
     }
     else // it's an already configured card
     {
         odebug << "pcmcia: doing nothing... why do we come here?" << oendl;
     }
 }
 
 void PcmciaManager::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
     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;
-            configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
+            configure( OPcmciaSystem::instance()->socket( socket ) );
             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;
+        case ACTIVATE: success = true;
+                       break;
+        default:       odebug << "pcmcia: not yet implemented" << oendl;
     }
 
     if ( success )
     {
+        odebug << tr( "Successfully %1ed card in socket #%2" ).arg( actionText[action] ).arg( socket ) << oendl;
         popUp( tr( "Successfully %1ed card in socket #%2" ).arg( actionText[action] ).arg( socket ) );
     }
     else
     {
+        odebug << tr( "Error while %1ing card in socket #%2" ).arg( actionText[action] ).arg( socket ) << oendl;
         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 )
+void PcmciaManager::configure( OPcmciaSocket* card )
 {
     configuring = true;
     ConfigDialog dialog( card, qApp->desktop() );
-    int configresult = QPEApplication::execDialog( &dialog, false );
+    int result = QPEApplication::execDialog( &dialog, false );
     configuring = false;
-    odebug << "pcmcia: configresult = " << configresult << oendl;
-    if ( configresult )
+    odebug << "pcmcia: configresult = " << result << oendl;
+    if ( result )
     {
-        insertAction = dialog.cbInsertAction->currentText();
-        resumeAction = dialog.cbResumeAction->currentText();
-        driver = dialog.cbBindTo->currentText();
-        conf = dialog.bindEntries[driver];
+        dialog.writeConfiguration( card );
     }
-    return configresult;
 }
 
 void PcmciaManager::executeAction( Opie::Core::OPcmciaSocket* card, const QString& type )
 {
     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" )
+
+    if ( theAction == "prompt for" )
     {
-        odebug << "pcmcia: sorry, not 'prompt for' is not yet implemented!" << oendl;
-        return;
+        PromptActionDialog dialog( qApp->desktop(), "promptfor", true );
+        dialog.setCaption( QString( "Choose action for card #%1" ).arg( card->number() ) );
+        int result = QPEApplication::execDialog( &dialog, true );
+        odebug << "pcmcia: configresult = " << result << oendl;
+        if ( result )
+        {
+            theAction = dialog.cbAction->currentText();
+        }
+        else
+        {
+            odebug << "pcmcia: prompted to do nothing" << oendl;
+            return;
+        }
     }
+    if ( theAction == "activate" ) intAction += ACTIVATE;
+    else if ( theAction == "eject" ) intAction += EJECT;
+    else if ( theAction == "suspend" ) intAction += SUSPEND;
     else
     {
         owarn << "pcmcia: action '" << theAction << "' not known. Huh?" << oendl;
         return;
     }
     userCardAction( intAction );
 }
 
 EXPORT_OPIE_APPLET_v1( PcmciaManager )