summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp21
-rw-r--r--noncore/applets/pcmcia/configdialog.h2
-rw-r--r--noncore/applets/pcmcia/configdialogbase.ui76
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp12
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
@@ -36,17 +36,20 @@ 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 );
@@ -60,12 +63,22 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
}
}
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
@@ -36,7 +36,7 @@ class ConfigDialog : public ConfigDialogBase
{
Q_OBJECT
public:
-
+
ConfigDialog( const QString& cardname, QWidget* parent );
~ConfigDialog();
};
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
@@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>214</width>
- <height>44</height>
+ <width>234</width>
+ <height>130</height>
</rect>
</property>
<property stdset="1">
@@ -28,13 +28,13 @@
<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>
@@ -45,7 +45,18 @@
<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>
@@ -76,15 +87,62 @@
<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>
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
@@ -131,13 +131,13 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
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;
@@ -170,7 +170,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
bool newCard = true;
OPcmciaSocket* theCard = 0;
-
+
while ( it.current() && newCard )
{
if ( it.current()->isEmpty() )
@@ -234,7 +234,7 @@ 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 );
@@ -258,10 +258,10 @@ 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;