summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-13 20:46:02 (UTC)
committer mickeyl <mickeyl>2005-06-13 20:46:02 (UTC)
commit9e210f138184f9cc93e28dd894243fc7bfea1b0f (patch) (side-by-side diff)
treebff01f476d0b2370d7bfb8b6275677d6ee4d6580
parent8e7defdc3c1129f9e0935761ead46d9428306f7f (diff)
downloadopie-9e210f138184f9cc93e28dd894243fc7bfea1b0f.zip
opie-9e210f138184f9cc93e28dd894243fc7bfea1b0f.tar.gz
opie-9e210f138184f9cc93e28dd894243fc7bfea1b0f.tar.bz2
parse possible bindings out of /etc/pcmcia/* and list them in combobox
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp42
-rw-r--r--noncore/applets/pcmcia/configdialogbase.ui141
2 files changed, 157 insertions, 26 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
@@ -39,3 +39,5 @@ using namespace Opie::Core;
#include <qdir.h>
+#include <qfile.h>
#include <qlabel.h>
+#include <qtextstream.h>
@@ -45,3 +47,3 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
//setCaption( tr( "Configure %1" ).arg( cardname ) );
- textCardName->setText( cardname );
+ txtCardName->setText( cardname );
@@ -72,5 +74,5 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
- // 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;
@@ -79,4 +81,34 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
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() );
+ }
}
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
@@ -13,4 +13,4 @@
<y>0</y>
- <width>234</width>
- <height>130</height>
+ <width>232</width>
+ <height>206</height>
</rect>
@@ -30,3 +30,3 @@
<name>margin</name>
- <number>7</number>
+ <number>5</number>
</property>
@@ -34,3 +34,3 @@
<name>spacing</name>
- <number>4</number>
+ <number>2</number>
</property>
@@ -95,15 +95,44 @@
</property>
+ <property stdset="1">
+ <name>editable</name>
+ <bool>true</bool>
+ </property>
</widget>
- <widget row="1" column="0" rowspan="1" colspan="3" >
- <class>Line</class>
+ <widget row="3" column="0" >
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Line1</cstring>
+ <cstring>textBindTo</cstring>
</property>
<property stdset="1">
- <name>orientation</name>
- <enum>Horizontal</enum>
+ <name>text</name>
+ <string>Bind to:</string>
</property>
</widget>
- <widget row="3" column="0" >
+ <widget row="0" column="0" rowspan="1" colspan="3" >
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox1</cstring>
+ </property>
+ <property stdset="1">
+ <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>
@@ -111,3 +140,3 @@
<name>name</name>
- <cstring>textBindTo</cstring>
+ <cstring>labelCardName</cstring>
</property>
@@ -115,6 +144,6 @@
<name>text</name>
- <string>Bind to:</string>
+ <string>CardName:</string>
</property>
</widget>
- <widget row="4" column="0" >
+ <widget row="2" column="0" >
<class>QLabel</class>
@@ -122,3 +151,3 @@
<name>name</name>
- <cstring>textClassName</cstring>
+ <cstring>labelFunction</cstring>
</property>
@@ -126,13 +155,35 @@
<name>text</name>
- <string>Classname:</string>
+ <string>Function:</string>
</property>
</widget>
- <widget row="4" column="1" rowspan="1" colspan="2" >
- <class>QComboBox</class>
+ <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>cbClassName</cstring>
+ <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="0" column="0" rowspan="1" colspan="3" >
+ <widget row="2" column="1" >
<class>QLabel</class>
@@ -140,3 +191,10 @@
<name>name</name>
- <cstring>textCardName</cstring>
+ <cstring>txtFunction</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
</property>
@@ -144,5 +202,46 @@
<name>text</name>
- <string>CardName</string>
+ <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>
+ <spacer row="1" column="1" >
+ <property>
+ <name>name</name>
+ <cstring>Spacer1</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</grid>