summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-06-09 14:30:24 (UTC)
committer mickeyl <mickeyl>2005-06-09 14:30:24 (UTC)
commit855e272549619c02efac516b2cd17828d7a3ad68 (patch) (side-by-side diff)
treee16d36f3a0a85ae847b7cf9699061c8990991a55
parent9a4b3a90fdd4ac0288034657d4818e3d10ed0193 (diff)
downloadopie-855e272549619c02efac516b2cd17828d7a3ad68.zip
opie-855e272549619c02efac516b2cd17828d7a3ad68.tar.gz
opie-855e272549619c02efac516b2cd17828d7a3ad68.tar.bz2
update dialog and start with code reading possible PCMCIA devices and classes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp15
-rw-r--r--noncore/applets/pcmcia/configdialog.h0
-rw-r--r--noncore/applets/pcmcia/configdialogbase.ui76
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp0
4 files changed, 81 insertions, 10 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
@@ -37,9 +37,12 @@ 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" );
@@ -67,4 +70,14 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent )
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;
+
}
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
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
@@ -12,6 +12,6 @@
<x>0</x>
<y>0</y>
- <width>214</width>
- <height>44</height>
+ <width>234</width>
+ <height>130</height>
</rect>
</property>
@@ -29,11 +29,11 @@
<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">
@@ -46,5 +46,16 @@
</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>
@@ -77,13 +88,60 @@
</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>
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