update dialog and start with code reading possible PCMCIA devices and classes

4 files changed, 91 insertions, 20 deletions

diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index c08926e..e7c97c1 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -23,51 +23,64 @@
     --        :-=`           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>
+#include <qdir.h>
+#include <qlabel.h>
 
 ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
              :ConfigDialogBase( parent, "pcmcia config dialog", true )
 {
-    setCaption( tr( "Configure %1" ).arg( cardname ) );
-    
+    //setCaption( tr( "Configure %1" ).arg( cardname ) );
+    textCardName->setText( 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 );
     }
+
+    // parse possible device and class names out of /etc/pcmcia/*.conf
+    QStringList deviceNames;
+    QStringList classNames;
+
+    QDir pcmciaconfdir( "/etc/pcmcia", "*.conf" );
+
+    for ( int i = 0; i < pcmciaconfdir.count(); ++i )
+        odebug << "found conf file '" << pcmciaconfdir[i] << "'" << oendl;
+
 }
 
 ConfigDialog::~ConfigDialog()
 {
 }
diff --git a/noncore/applets/pcmcia/configdialog.h b/noncore/applets/pcmcia/configdialog.h
index 12500c4..f79d7a6 100644
--- a/noncore/applets/pcmcia/configdialog.h
+++ b/noncore/applets/pcmcia/configdialog.h
@@ -23,22 +23,22 @@
     --        :-=`           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
index d8dd983..a9682c5 100644
--- a/noncore/applets/pcmcia/configdialogbase.ui
+++ b/noncore/applets/pcmcia/configdialogbase.ui
@@ -1,92 +1,150 @@
 <!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>
+            <width>234</width>
+            <height>130</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>
+            <number>7</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>6</number>
+            <number>4</number>
         </property>
-        <widget row="0"  column="2" >
+        <widget row="2"  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" >
+        <widget row="2"  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>
+        <widget row="2"  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" >
+        <widget row="3"  column="1"  rowspan="1"  colspan="2" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>cbBindTo</cstring>
+            </property>
+        </widget>
+        <widget row="1"  column="0"  rowspan="1"  colspan="3" >
+            <class>Line</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Line1</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel2</cstring>
+                <cstring>textBindTo</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Upon insertion,</string>
+                <string>Bind to:</string>
+            </property>
+        </widget>
+        <widget row="4"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>textClassName</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Classname:</string>
+            </property>
+        </widget>
+        <widget row="4"  column="1"  rowspan="1"  colspan="2" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>cbClassName</cstring>
+            </property>
+        </widget>
+        <widget row="0"  column="0"  rowspan="1"  colspan="3" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>textCardName</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>CardName</string>
             </property>
         </widget>
     </grid>
 </widget>
 </UI>
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 4fcc189..6c18e86 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -118,72 +118,72 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
     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",     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;
     }
 
     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 << "skipping empty card in socket " << it.current()->number() << oendl;
             ++it;
             continue;
         }
         else
         {
             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 );
@@ -221,60 +221,60 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
         {
             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 );
     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 )