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
@@ -38,2 +38,4 @@ using namespace Opie::Core;
 #include <qcombobox.h>
+#include <qdir.h>
+#include <qlabel.h>
 
@@ -42,4 +44,5 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
 {
-    setCaption( tr( "Configure %1" ).arg( cardname ) );
-    
+    //setCaption( tr( "Configure %1" ).arg( cardname ) );
+    textCardName->setText( cardname );
+
     OConfig cfg( "PCMCIA" );
@@ -48,3 +51,3 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
     QString insert;
-    
+
     for ( int i = 0; i < nCards; ++i )
@@ -62,3 +65,3 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
     odebug << "preferred action for card '" << cardname << "' seems to be '" << insert << "'" << oendl;
-    
+
     if ( !insert.isEmpty() )
@@ -68,2 +71,12 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
     }
+
+    // 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;
+
 }
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
@@ -38,3 +38,3 @@ class ConfigDialog : public ConfigDialogBase
   public:
-  
+
     ConfigDialog( const QString& cardname, QWidget* parent );
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
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>214</width>
-            <height>44</height>
+            <width>234</width>
+            <height>130</height>
         </rect>
@@ -30,3 +30,3 @@
             <name>margin</name>
-            <number>11</number>
+            <number>7</number>
         </property>
@@ -34,5 +34,5 @@
             <name>spacing</name>
-            <number>6</number>
+            <number>4</number>
         </property>
-        <widget row="0"  column="2" >
+        <widget row="2"  column="2" >
             <class>QLabel</class>
@@ -47,3 +47,14 @@
         </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>
@@ -78,3 +89,21 @@
         </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>
@@ -82,3 +111,3 @@
                 <name>name</name>
-                <cstring>TextLabel2</cstring>
+                <cstring>textBindTo</cstring>
             </property>
@@ -86,3 +115,32 @@
                 <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>
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
@@ -133,3 +133,3 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->insertItem( "&Configure", CONFIGURE+i*100 );
-        
+
         submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() );
@@ -139,3 +139,3 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() );
-        
+
         connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
@@ -172,3 +172,3 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
     OPcmciaSocket* theCard = 0;
-    
+
     while ( it.current() && newCard )
@@ -236,3 +236,3 @@ void PcmciaManager::paintEvent( QPaintEvent * )
     odebug << "sockets = " << OPcmciaSystem::instance()->count() << ", cards = " << OPcmciaSystem::instance()->cardCount() << oendl;
-    
+
     if ( OPcmciaSystem::instance()->cardCount() )
@@ -260,6 +260,6 @@ void PcmciaManager::userCardAction( int action )
     odebug << "user action requested. action = " << action << oendl;
-    
+
     int socket = action / 100;
     int what = action % 100;
-    
+
     switch ( what )