7 files changed, 198 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index a820c09..f47d948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,143 +1,144 @@
         2005-??-??Opie 1.2.1
         
         
         New Features
         ------------
         * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
         * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
         * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
         * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
         * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
         * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
         * Checkbook - added configuration option to use smaller font for checkbook transaction tab (hrw)
         * ZSafe - make UI conform to Opie standards (drw)
         * Today Addressbook plugin - fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
         * Opie-Console: read initial fixed font configuration from qpe.conf (mickeyl)
+        * Opie-PcmciaApplet: card monitoring applet lets you configure insert/resume actions and bind unsupported cards (mickeyl)
 
         Fixed Bugs
         ----------
         * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
                 - We actually suspend the complete Opie now in that case.
         * #1384 - Battery status updated improperly when charging (skyhusker)
         * #1476 - Wrong order of application entries in the O-menu (skyhusker)
         * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
                 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
         * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
         * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
         * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
         * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
         * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
         * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
                 * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker)
         * #1667 - Opie-IRC does not show messages from !channel (skyhusker)
                 * n.a.- always show volume and wireless applet popups inside visible screen (deller)
         * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
                 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
                 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
                 * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl)
                 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
         * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
         * n.a.  - Today Addressbook plugin fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
 
         Internal
         --------
         * Make BluezApplet use OTaskbarApplet (mickeyl)
         * libopiecore: rewrite OFileNotification to use the Linux 2.6 inotify interface (mickeyl)
         * libopiecore: add ODirNotification - recursive directory notifications (mickeyl)
         * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
         * libopieui: Remove OVersatileView and OVersatileViewItem (mickeyl)
         * libopienet: Miscellaneous API cleanups (mickeyl)
         * libopiecore: Add linux pcmcia system abstraction classes (mickeyl)
 
         2005-03-25Opie 1.2.0
 
         Fixed Bugs
         ----------
         * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
         * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
         * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
         * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
                 * n.a.- make qpeglobal.h include qglobal.h (zecke)
 
         2005-03-20Opie 1.2.0-rc1
 
 
         New Features
         ------------
         * Launcher: Support a static background pixmap (mickeyl)
         * LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
         * PackageManager supports the 'lists_dir' ipkg configuration option (drw)
         * Added hi-res inline images for large resolution devices (drw)
         * Improved launcher icons for consistency (ar)
         * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
 
         Fixed Bugs
         ----------
         * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
         * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
         * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
         * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
         * #1482 - Fix double '/' in paths (zecke)
         * #1536 - Autosave of custom locations in opie backup (ar)
         * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
         * #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
         * #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
         * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
         * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
         * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
         * #1558 - Fixed opie-login breaking opie startup (mickeyl)
         * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
         * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
         * #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
         * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
         * #1604 - Checkbook crashed on startup (drw)
         * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
         * #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
         * n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
         * n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
         * n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
         * n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
         * n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
         * n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
         * n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
         * n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
 
         Internal
         --------
         * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
         * Killed the need for weak symbols in QtE (zecke)
         * Added optional building libqpe without inline images (mickeyl)
         * OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
 
         2005-02-03Opie 1.1.9
 
         New Features
         ------------
         * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
         * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
         * Usability enhancements in OpieIRC (skyhusker)
 
         Fixed Bugs
         ----------
         * #1501 - Fixed bug in todo sql backend (eilers)
         * #1505 - Added more Swap sizes in memoryapplet (mickeyl)
         * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke)
         * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke)
         * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
         * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
         * n.a. - Fixed numerous buglets in OpieIRC (skyhusker)
 
         Internal
         --------
         * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
         * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl)
         * Made Opie compilable with Qt/Embedded 2.3.10 (ar)
         * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl)
         * Build tree cleanups (mickeyl)
 
         2004-11-26Opie 1.1.8
 
         New Features
         ------------
         * PackageManager supports installation of local ipkg files (drw)
         * PackageManager supports linking of applications to root (drw)
diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index 3b1b40c..010d691 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -1,179 +1,238 @@
 /*
                              This file is part of the Opie Project
              =.             (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 "configdialog.h"
 
 /* OPIE */
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 #include <opie2/opcmciasystem.h>
+#include <qpe/global.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qtextstream.h>
 
+/* STD */
+#include <errno.h>
+#include <string.h>
+
 ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
              :ConfigDialogBase( parent, "pcmcia config dialog", true )
 {
     gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) );
     txtCardName->setText( card->productIdentity() );
     txtManfid->setText( card->manufacturerIdentity() );
     txtFunction->setText( card->function() );
 
     QString insertAction = preferredAction( card, "insert" );
     QString resumeAction = preferredAction( card, "resume" );
 
     odebug << "pcmcia: preferred insertion action for card '" << card->productIdentity() << "' seems to be '" << insertAction << "'" << oendl;
     odebug << "pcmcia: preferred resume    action for card '" << card->productIdentity() << "' seems to be '" << resumeAction << "'" << oendl;
 
     if ( !insertAction.isEmpty() )
     {
-        for ( int i; i < cbInsertAction->count(); ++i )
+        for ( unsigned int i = 0; i < cbInsertAction->count(); ++i )
             if ( cbInsertAction->text( i ) == insertAction ) cbInsertAction->setCurrentItem( i );
     }
 
     if ( !resumeAction.isEmpty() )
     {
-        for ( int i; i < cbResumeAction->count(); ++i )
+        for ( unsigned int i = 0; i < cbResumeAction->count(); ++i )
             if ( cbResumeAction->text( i ) == resumeAction ) cbResumeAction->setCurrentItem( i );
     }
 
     if ( !card->isUnsupported() )
     {
         odebug << "pcmcia: card is recognized - hiding bindings" << oendl;
         textInfo->hide();
         textBindTo->hide();
         cbBindTo->hide();
         return;
     }
     else
     {
         odebug << "card is unsupported yet - showing possible bindings" << oendl;
         textInfo->show();
         textBindTo->show();
         cbBindTo->show();
     }
 
     // parse possible bind entries out of /etc/pcmcia/*.conf
     QDir pcmciaconfdir( "/etc/pcmcia", "*.conf" );
 
     for ( unsigned int i = 0; i < pcmciaconfdir.count(); ++i )
     {
         odebug << "processing conf file '" << pcmciaconfdir[i] << "'" << oendl;
         QString conffilename = QString( "%1/%2" ).arg( pcmciaconfdir.absPath() ).arg( pcmciaconfdir[i] );
         QFile conffile( conffilename );
         if ( conffile.open( IO_ReadOnly ) )
         {
             QTextStream ts( &conffile );
             while ( !ts.atEnd() )
             {
                 QString word;
                 ts >> word;
                 if ( word == "bind" )
                 {
                     word = ts.readLine();
                     bindEntries[ word.stripWhiteSpace() ] = conffilename;
                     continue;
                 }
                 ts.readLine();
             }
         }
         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();
-    QString action;
-
-    for ( int i = 0; i < nCards; ++i )
+    OConfig* cfg = cardConfig( card );
+    if ( cfg )
     {
-        QString cardSection = QString( "Card_%1" ).arg( i );
-        cfg.setGroup( cardSection );
-        QString name = cfg.readEntry( "name" );
-        odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
-        if ( cardName == name )
-        {
-            cfg.writeEntry( key, value );
-            break;
-        }
+        cfg->writeEntry( key, value );
     }
+    delete cfg; // deleting a 0 pointer is within spec.
 }
 
 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();
     QString value;
+    OConfig* cfg = cardConfig( card );
+    if ( cfg )
+    {
+        value = cfg->readEntry( key, defaultValue );
+    }
+    delete cfg; // deleting a 0 pointer is within spec.
+    return value;
+}
+
+
+QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
+{
+    return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
+}
+
+
+OConfig* ConfigDialog::cardConfig( const OPcmciaSocket* card )
+{
+    OConfig* cardcfg = 0;
+    OConfig* cfg = new OConfig( "PCMCIA" );
+    cfg->setGroup( "Global" );
+    int nCards = cfg->readNumEntry( "nCards", 0 );
+    QString cardName = card->productIdentity();
 
     for ( int i = 0; i < nCards; ++i )
     {
         QString cardSection = QString( "Card_%1" ).arg( i );
-        cfg.setGroup( cardSection );
-        QString name = cfg.readEntry( "name" );
+        cfg->setGroup( cardSection );
+        QString name = cfg->readEntry( "name" );
         odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
         if ( cardName == name )
         {
-            value = cfg.readEntry( key, defaultValue );
+            cardcfg = cfg;
             break;
         }
     }
-    return value;
+    return cardcfg;
 }
 
 
-QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
+void ConfigDialog::writeConfiguration( const OPcmciaSocket* card )
 {
-    return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
+    odebug << "pcmcia: ConfigDialog::writeConfiguration()" << oendl;
+    OConfig* cfg = cardConfig( card );
+    if ( !cfg )
+    {
+        cfg = new OConfig( "PCMCIA" );
+        cfg->setGroup( "Global" );
+        int nCards = cfg->readNumEntry( "nCards", 0 );
+        cfg->setGroup( QString( "Card_%1" ).arg( nCards ) );
+        cfg->writeEntry( "name", card->productIdentity() );
+        cfg->setGroup( "Global" );
+        cfg->writeEntry( "nCards", nCards+1 );
+        cfg->setGroup( QString( "Card_%1" ).arg( nCards ) );
+    }
+
+    cfg->writeEntry( "insertAction", cbInsertAction->currentText() );
+    cfg->writeEntry( "resumeAction", cbResumeAction->currentText() );
+    cfg->write();
+
+    if ( cbBindTo->isVisible() && cbBindTo->currentText() != "<None>" )
+    {
+        QString driver = cbBindTo->currentText();
+        QString conf = bindEntries[driver];
+
+        // write binding
+
+        QFile confFile( conf );
+        if ( confFile.open( IO_ReadWrite | IO_Append ) )
+        {
+            QString entryCard = QString( "card \"%1\"" ).arg( card->productIdentity() );
+            QString entryVersion( "    version " );
+            for ( QStringList::Iterator it = card->productIdentityVector().begin(); it != card->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..." );
+            OPcmciaSystem::instance()->restart();
+        }
+        else
+        {
+            owarn << "pcmcia: couldn't write binding to '" << conf << "' ( " << strerror( errno ) << " )." << oendl;
+        }
+    }
 }
+
diff --git a/noncore/applets/pcmcia/configdialog.h b/noncore/applets/pcmcia/configdialog.h
index 169dadb..eb081a1 100644
--- a/noncore/applets/pcmcia/configdialog.h
+++ b/noncore/applets/pcmcia/configdialog.h
@@ -1,51 +1,53 @@
 /*
                              This file is part of the Opie Project
              =.             (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.
 
 */
 
 #ifndef CONFIGDIALOG_H
 #define CONFIGDIALOG_H
 
 #include "configdialogbase.h"
 
-namespace Opie { namespace Core { class OPcmciaSocket; }; };
+namespace Opie { namespace Core { class OPcmciaSocket; class OConfig; }; };
 
 typedef QMap<QString,QString> StringMap;
 
 class ConfigDialog : public ConfigDialogBase
 {
   Q_OBJECT
   public:
     ConfigDialog( const Opie::Core::OPcmciaSocket* card, QWidget* parent );
     ~ConfigDialog();
     static QString preferredAction( const Opie::Core::OPcmciaSocket* card, const QString& type );
     static QString readConfigEntry( const Opie::Core::OPcmciaSocket* card, const QString& key, const QString& defaultValue );
     static void writeConfigEntry( const Opie::Core::OPcmciaSocket* card, const QString& key, const QString& value );
+    static Opie::Core::OConfig* cardConfig( const Opie::Core::OPcmciaSocket* card );
+    void writeConfiguration( const Opie::Core::OPcmciaSocket* card );
     StringMap bindEntries;
 };
 
 #endif
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,394 +1,368 @@
 /*
                              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>
 
 /* 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 ), 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", 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();
 
         while ( it.current() )
         {
             if ( !it.current()->isEmpty() )
             {
                 executeAction( it.current(), "resume" );
             }
         ++it;
         }
     }
 }
 
 void PcmciaManager::popUp( QString message, QString icon )
 {
     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" };
+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();
         bool isEmpty = it.current()->isEmpty();
 
         submenu->setItemEnabled( EJECT+i*100, !isEmpty );
         submenu->setItemEnabled( INSERT+i*100, isEmpty );
         submenu->setItemEnabled( SUSPEND+i*100, !isEmpty && !isSuspended );
         submenu->setItemEnabled( RESUME+i*100, !isEmpty && isSuspended );
         submenu->setItemEnabled( RESET+i*100, !isEmpty && !isSuspended );
         submenu->setItemEnabled( CONFIGURE+i*100, !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;
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = menu->sizeHint();
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 );
     qDebug( "pcmcia: menu result = %d", opt );
     delete menu;
 }
 
 
 void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
 {
     odebug << "PcmciaManager::cardMessage( '" << msg << "' )" << oendl;
     if ( msg != "stabChanged()" ) return;
 
     /* check if a previously unknown card has been inserted */
     OPcmciaSystem::instance()->synchronize();
 
     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();
             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;
                     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 )
 
diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h
index de7d6bf..0fe936c 100644
--- a/noncore/applets/pcmcia/pcmcia.h
+++ b/noncore/applets/pcmcia/pcmcia.h
@@ -1,72 +1,72 @@
 /*
                              This file is part of the Opie Project
              =.             (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.
 
 */
 
 #ifndef PCMCIA_H
 #define PCMCIA_H
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 
 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 configure( Opie::Core::OPcmciaSocket* );
     void execCommand( const QStringList &command );
     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
 
diff --git a/noncore/applets/pcmcia/pcmcia.pro b/noncore/applets/pcmcia/pcmcia.pro
index 4a893b5..b9af380 100644
--- a/noncore/applets/pcmcia/pcmcia.pro
+++ b/noncore/applets/pcmcia/pcmcia.pro
@@ -1,18 +1,20 @@
 TEMPLATE    = lib
 CONFIG      += qt plugin warn_on 
 
-INTERFACES  = configdialogbase.ui
+INTERFACES  = configdialogbase.ui \
+              promptactiondialog.ui
 HEADERS     = pcmcia.h \
               configdialog.h
 SOURCES     = pcmcia.cpp \
               configdialog.cpp
 TARGET      = pcmciaapplet
 
 DESTDIR     = $(OPIEDIR)/plugins/applets
+
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 
 LIBS        += -lqpe -lopiecore2
-VERSION     = 0.2.0
+VERSION     = 0.9.0
 
 include( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/pcmcia/promptactiondialog.ui b/noncore/applets/pcmcia/promptactiondialog.ui
new file mode 100644
index 0000000..c351b48
--- a/dev/null
+++ b/noncore/applets/pcmcia/promptactiondialog.ui
@@ -0,0 +1,58 @@
+<!DOCTYPE UI><UI>
+<class>PromptActionDialog</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>PromptActionDialog</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>273</width>
+            <height>55</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Choose Action for Card</string>
+    </property>
+    <grid>
+        <property stdset="1">
+            <name>margin</name>
+            <number>11</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
+        <widget row="0"  column="0" >
+            <class>QComboBox</class>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>activate</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>suspend</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>eject</string>
+                </property>
+            </item>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>cbAction</cstring>
+            </property>
+        </widget>
+    </grid>
+</widget>
+</UI>