add first card configuration bits and config dialog skeleton

6 files changed, 270 insertions, 47 deletions

diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
new file mode 100644
index 0000000..c08926e
--- a/dev/null
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -0,0 +1,73 @@
+/*
+                             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>
+using namespace Opie::Core;
+
+/* QT */
+#include <qcombobox.h>
+
+ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
+             :ConfigDialogBase( parent, "pcmcia config dialog", true )
+{
+    setCaption( tr( "Configure %1" ).arg( cardname ) );
+    
+    OConfig cfg( "PCMCIA" );
+    cfg.setGroup( "Global" );
+    int nCards = cfg.readNumEntry( "nCards", 0 );
+    QString insert;
+    
+    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 '" << cardname << "' with known card '" << name << "'" << oendl;
+        if ( cardname == name )
+        {
+            insert = cfg.readEntry( "insert" );
+            break;
+        }
+    }
+    odebug << "preferred action for card '" << cardname << "' seems to be '" << insert << "'" << oendl;
+    
+    if ( !insert.isEmpty() )
+    {
+        for ( int i; i < cbAction->count(); ++i )
+            if ( cbAction->text( i ) == insert ) cbAction->setCurrentItem( i );
+    }
+}
+
+ConfigDialog::~ConfigDialog()
+{
+}
diff --git a/noncore/applets/pcmcia/configdialog.h b/noncore/applets/pcmcia/configdialog.h
new file mode 100644
index 0000000..12500c4
--- a/dev/null
+++ b/noncore/applets/pcmcia/configdialog.h
@@ -0,0 +1,44 @@
+/*
+                             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"
+
+class ConfigDialog : public ConfigDialogBase
+{
+  Q_OBJECT
+  public:
+  
+    ConfigDialog( const QString& cardname, QWidget* parent );
+    ~ConfigDialog();
+};
+
+#endif
diff --git a/noncore/applets/pcmcia/configdialogbase.ui b/noncore/applets/pcmcia/configdialogbase.ui
new file mode 100644
index 0000000..d8dd983
--- a/dev/null
+++ b/noncore/applets/pcmcia/configdialogbase.ui
@@ -0,0 +1,92 @@
+<!DOCTYPE UI><UI>
+<class>ConfigDialogBase</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>ConfigDialogBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>214</width>
+            <height>44</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Configure PCMCIA/CF Card</string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </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="2" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TextLabel3</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>card</string>
+            </property>
+        </widget>
+        <widget row="0"  column="1" >
+            <class>QComboBox</class>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>suspend</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>activate</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>eject</string>
+                </property>
+            </item>
+            <item>
+                <property>
+                    <name>text</name>
+                    <string>prompt for</string>
+                </property>
+            </item>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>cbAction</cstring>
+            </property>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TextLabel2</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Upon insertion,</string>
+            </property>
+        </widget>
+    </grid>
+</widget>
+</UI>
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index a1deb6b..4fcc189 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -15,32 +15,33 @@
     : ..    .:,     . . .    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"
 
 /* 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/resource.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qcopchannel_qws.h>
@@ -96,182 +97,185 @@ void PcmciaManager::popUp( QString message, QString icon )
     }
 
     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, CONFIGURE };
 
 void PcmciaManager::mousePressEvent( QMouseEvent* )
 {
     QPopupMenu* menu = new QPopupMenu( this );
     QStringList cmd;
     bool execute = true;
 
     OPcmciaSystem* sys = OPcmciaSystem::instance();
     OPcmciaSystem::CardIterator it = sys->iterator();
     if ( !sys->count() ) return;
 
     int i = 0;
     while ( it.current() )
     {
-
         QPopupMenu* submenu = new QPopupMenu( menu );
-        submenu->insertItem( "Eject" );
-        submenu->insertItem( "Insert" );
-        submenu->insertItem( "Suspend" );
-        submenu->insertItem( "Resume" );
-        submenu->insertItem( "Configure" );
-
+        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( "&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() );
+        
+        connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
         menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
         ++it;
     }
 
-
-
-    /* insert items depending on number of cards etc.
-
-    if ( cardInSd ) {
-        menu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( "cardmon/ide", Opie::Core::OResource::SmallIcon ) ),
-                          tr( "Eject SD/MMC card" ), 0 );
-    }
-
-
-
-    if ( cardInPcmcia0 ) {
-        menu->
-        insertItem( QIconSet
-                    ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ),
-                    tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
-    }
-
-    if ( cardInPcmcia1 ) {
-        menu->
-        insertItem( QIconSet
-                    ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ),
-                    tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
-    }
-        */
-
     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;
-    QString cardName;
+    OPcmciaSocket* theCard = 0;
     
     while ( it.current() && newCard )
     {
         if ( it.current()->isEmpty() )
         {
             odebug << "skipping empty card in socket " << it.current()->number() << oendl;
             ++it;
             continue;
         }
         else
         {
-            cardName = it.current()->identity();
+            OPcmciaSocket* theCard = it.current();
+            QString cardName = theCard->identity();
             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 '" << cardName << "' with known card '" << name << "'" << oendl;
                 if ( cardName == name )
                 {
                     newCard = false;
                     break;
                 }
             }
             if ( !newCard ) ++it; else break;
         }
     }
     if ( newCard )
     {
         odebug << "pcmcia: new card detected" << oendl;
         cfg.setGroup( QString( "Card_%1" ).arg( nCards ) );
-        cfg.writeEntry( "name", cardName );
+        cfg.writeEntry( "name", theCard->identity() );
+        cfg.writeEntry( "insert", "suspend" );
         cfg.setGroup( "Global" );
         cfg.writeEntry( "nCards", nCards+1 );
         cfg.write();
 
         int result = QMessageBox::information( qApp->desktop(),
                                            tr( "PCMCIA/CF Subsystem" ),
-                                           tr( "You have inserted a new card:\n%1\nDo you want to configure?" ).arg( cardName ),
+                                           tr( "You have inserted a new card:\n%1\nDo you want to configure?" ).arg( theCard->identity() ),
                                            tr( "Yes" ), tr( "No" ), 0, 0, 1 );
         odebug << "result = " << result << oendl;
         if ( result == 0 )
         {
-            QMessageBox::information( qApp->desktop(),
-                                      tr( "PCMCIA/CF Subsystem" ),
-                                      tr( "Sorry, not yet implemented...\n~lart mickeyl :D" ),
-                                      tr( "No Problem" ), 0, 0, 0 );
+            configure( theCard );
         }
         else
         {
-            odebug << "pcmcia: user doesn't want to configure " << cardName << " now." << oendl;
+            odebug << "pcmcia: user doesn't want to configure " << theCard->identity() << " now." << oendl;
         }
     }
     else
     {
         odebug << "pcmcia: card has been previously inserted" << oendl;
     }
     repaint( true );
 }
 
 
 void PcmciaManager::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
-    qDebug( "count = %d", (OPcmciaSystem::instance()->count() ) );
-    if ( OPcmciaSystem::instance()->count() )
+    odebug << "sockets = " << OPcmciaSystem::instance()->count() << ", cards = " << OPcmciaSystem::instance()->cardCount() << oendl;
+    
+    if ( OPcmciaSystem::instance()->cardCount() )
     {
         p.drawPixmap( 0, 0, pm );
         show();
     }
     else
     {
         hide();
     }
 }
 
 int PcmciaManager::position()
 {
     return 7;
 }
 
 void PcmciaManager::execCommand( const QStringList &strList )
 {
 }
 
+void PcmciaManager::userCardAction( int action )
+{
+    odebug << "user action requested. action = " << action << oendl;
+    
+    int socket = action / 100;
+    int what = action % 100;
+    
+    switch ( what )
+    {
+        case CONFIGURE: configure( OPcmciaSystem::instance()->socket( socket ) ); break;
+        default: odebug << "not yet implemented";
+    }
+}
+
+void PcmciaManager::configure( OPcmciaSocket* card )
+{
+    ConfigDialog dialog( card->identity(), qApp->desktop() );
+    int configresult = dialog.exec();
+    odebug << "pcmcia: configresult = " << configresult << oendl;
+}
+
+
 EXPORT_OPIE_APPLET_v1( PcmciaManager )
 
diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h
index 5c20433..ed86579 100644
--- a/noncore/applets/pcmcia/pcmcia.h
+++ b/noncore/applets/pcmcia/pcmcia.h
@@ -21,45 +21,49 @@
  -.   .:....=;==+<;          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 cardMessage( const QCString& msg, const QByteArray& );
+    void userCardAction( int action );
     void popupTimeout();
 
   protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
 
   private:
+    void configure( Opie::Core::OPcmciaSocket* );
     void execCommand( const QStringList &command );
     void popUp(QString message, QString icon = QString::null );
 
   private:
     int m_commandOrig;
     QPixmap pm;
     QPopupMenu *popupMenu;
 
 };
 
 #endif
 
diff --git a/noncore/applets/pcmcia/pcmcia.pro b/noncore/applets/pcmcia/pcmcia.pro
index c4f7b62..4a893b5 100644
--- a/noncore/applets/pcmcia/pcmcia.pro
+++ b/noncore/applets/pcmcia/pcmcia.pro
@@ -1,12 +1,18 @@
 TEMPLATE    = lib
 CONFIG      += qt plugin warn_on 
-HEADERS     = pcmcia.h
-SOURCES     = pcmcia.cpp
+
+INTERFACES  = configdialogbase.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.1.0
+VERSION     = 0.2.0
 
 include( $(OPIEDIR)/include.pro )