author | mickeyl <mickeyl> | 2005-06-09 14:30:24 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-09 14:30:24 (UTC) |
commit | 855e272549619c02efac516b2cd17828d7a3ad68 (patch) (side-by-side diff) | |
tree | e16d36f3a0a85ae847b7cf9699061c8990991a55 | |
parent | 9a4b3a90fdd4ac0288034657d4818e3d10ed0193 (diff) | |
download | opie-855e272549619c02efac516b2cd17828d7a3ad68.zip opie-855e272549619c02efac516b2cd17828d7a3ad68.tar.gz opie-855e272549619c02efac516b2cd17828d7a3ad68.tar.bz2 |
update dialog and start with code reading possible PCMCIA devices and classes
-rw-r--r-- | noncore/applets/pcmcia/configdialog.cpp | 21 | ||||
-rw-r--r-- | noncore/applets/pcmcia/configdialog.h | 2 | ||||
-rw-r--r-- | noncore/applets/pcmcia/configdialogbase.ui | 76 | ||||
-rw-r--r-- | noncore/applets/pcmcia/pcmcia.cpp | 12 |
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 @@ -31,43 +31,56 @@ /* OPIE */ #include <opie2/oconfig.h> #include <opie2/odebug.h> 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 ); cfg.setGroup( cardSection ); QString name = cfg.readEntry( "name" ); odebug << "comparing card '" << cardname << "' with known card '" << name << "'" << oendl; if ( cardname == name ) { insert = cfg.readEntry( "insert" ); break; } } 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 @@ -31,14 +31,14 @@ #define CONFIGDIALOG_H #include "configdialogbase.h" class ConfigDialog : public ConfigDialogBase { Q_OBJECT public: - + ConfigDialog( const QString& cardname, QWidget* parent ); ~ConfigDialog(); }; #endif 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 @@ -6,51 +6,62 @@ <name>name</name> <cstring>ConfigDialogBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>214</width> - <height>44</height> + <width>234</width> + <height>130</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Configure PCMCIA/CF Card</string> </property> <property> <name>layoutMargin</name> </property> <property> <name>layoutSpacing</name> </property> <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> <cstring>TextLabel3</cstring> </property> <property stdset="1"> <name>text</name> <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> <name>text</name> <string>suspend</string> </property> </item> <item> @@ -71,22 +82,69 @@ <string>prompt for</string> </property> </item> <property stdset="1"> <name>name</name> <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> </widget> </UI> 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 @@ -126,23 +126,23 @@ void PcmciaManager::mousePressEvent( QMouseEvent* ) while ( it.current() ) { QPopupMenu* submenu = new QPopupMenu( menu ); submenu->insertItem( "&Eject", EJECT+i*100 ); submenu->insertItem( "&Insert", INSERT+i*100 ); 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; } QPoint p = mapToGlobal( QPoint( 0, 0 ) ); QSize s = menu->sizeHint(); int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 ); @@ -165,17 +165,17 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) cfg.setGroup( "Global" ); int nCards = cfg.readNumEntry( "nCards", 0 ); OPcmciaSystem* sys = OPcmciaSystem::instance(); OPcmciaSystem::CardIterator it = sys->iterator(); bool newCard = true; OPcmciaSocket* theCard = 0; - + while ( it.current() && newCard ) { if ( it.current()->isEmpty() ) { odebug << "skipping empty card in socket " << it.current()->number() << oendl; ++it; continue; } @@ -229,17 +229,17 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) repaint( true ); } 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 ); show(); } else { hide(); @@ -253,20 +253,20 @@ int PcmciaManager::position() 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; default: odebug << "not yet implemented"; } } void PcmciaManager::configure( OPcmciaSocket* card ) |