summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp42
-rw-r--r--noncore/applets/pcmcia/configdialogbase.ui159
2 files changed, 166 insertions, 35 deletions
diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index e7c97c1..e161d18 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -36,15 +36,17 @@ using namespace Opie::Core;
/* QT */
#include <qcombobox.h>
#include <qdir.h>
+#include <qfile.h>
#include <qlabel.h>
+#include <qtextstream.h>
ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
:ConfigDialogBase( parent, "pcmcia config dialog", true )
{
//setCaption( tr( "Configure %1" ).arg( cardname ) );
- textCardName->setText( cardname );
+ txtCardName->setText( cardname );
OConfig cfg( "PCMCIA" );
cfg.setGroup( "Global" );
int nCards = cfg.readNumEntry( "nCards", 0 );
@@ -69,17 +71,47 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
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;
+ // parse possible bind entries out of /etc/pcmcia/*.conf
+ typedef QMap<QString,QString> StringMap;
+ StringMap bindEntries;
QDir pcmciaconfdir( "/etc/pcmcia", "*.conf" );
for ( int i = 0; i < pcmciaconfdir.count(); ++i )
- odebug << "found conf file '" << pcmciaconfdir[i] << "'" << oendl;
+ {
+ 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 device '" << it.key() << "' defined in '" << it.data().latin1() << "'" << oendl;
+ cbBindTo->insertItem( it.key() );
+ }
}
ConfigDialog::~ConfigDialog()
{
diff --git a/noncore/applets/pcmcia/configdialogbase.ui b/noncore/applets/pcmcia/configdialogbase.ui
index a9682c5..a0760d6 100644
--- a/noncore/applets/pcmcia/configdialogbase.ui
+++ b/noncore/applets/pcmcia/configdialogbase.ui
@@ -10,10 +10,10 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>234</width>
- <height>130</height>
+ <width>232</width>
+ <height>206</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
@@ -27,13 +27,13 @@
</property>
<grid>
<property stdset="1">
<name>margin</name>
- <number>7</number>
+ <number>5</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>4</number>
+ <number>2</number>
</property>
<widget row="2" column="2" >
<class>QLabel</class>
<property stdset="1">
@@ -92,18 +92,11 @@
<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>
+ <name>editable</name>
+ <bool>true</bool>
</property>
</widget>
<widget row="3" column="0" >
<class>QLabel</class>
@@ -115,36 +108,142 @@
<name>text</name>
<string>Bind to:</string>
</property>
</widget>
- <widget row="4" column="0" >
- <class>QLabel</class>
+ <widget row="0" column="0" rowspan="1" colspan="3" >
+ <class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>textClassName</cstring>
+ <cstring>GroupBox1</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Classname:</string>
+ <name>title</name>
+ <string>Details</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
</property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>6</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>4</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>labelCardName</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>CardName:</string>
+ </property>
+ </widget>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>labelFunction</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Function:</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>labelManufacturer</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Manufacturer:</string>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>txtManfid</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>TextLabel6</string>
+ </property>
+ </widget>
+ <widget row="2" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>txtFunction</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>TextLabel7</string>
+ </property>
+ </widget>
+ <widget row="0" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>txtCardName</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>TextLabel3</string>
+ </property>
+ </widget>
+ </grid>
</widget>
- <widget row="4" column="1" rowspan="1" colspan="2" >
- <class>QComboBox</class>
- <property stdset="1">
+ <spacer row="1" column="1" >
+ <property>
<name>name</name>
- <cstring>cbClassName</cstring>
+ <cstring>Spacer1</cstring>
</property>
- </widget>
- <widget row="0" column="0" rowspan="1" colspan="3" >
- <class>QLabel</class>
<property stdset="1">
- <name>name</name>
- <cstring>textCardName</cstring>
+ <name>orientation</name>
+ <enum>Vertical</enum>
</property>
<property stdset="1">
- <name>text</name>
- <string>CardName</string>
+ <name>sizeType</name>
+ <enum>Expanding</enum>
</property>
- </widget>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</grid>
</widget>
</UI>