author | mickeyl <mickeyl> | 2005-06-19 22:02:38 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-19 22:02:38 (UTC) |
commit | 34ecdb361924656b758da2073ef6ac0c1bffd210 (patch) (side-by-side diff) | |
tree | dbc91b753acae2f9f6a62e922e6707cfef55e171 | |
parent | 83fec70860e56af97d66e9505b913602505423d7 (diff) | |
download | opie-34ecdb361924656b758da2073ef6ac0c1bffd210.zip opie-34ecdb361924656b758da2073ef6ac0c1bffd210.tar.gz opie-34ecdb361924656b758da2073ef6ac0c1bffd210.tar.bz2 |
- s/new card/unconfigured card/
- add note about unrecognized cards in configuration dialog
- add ConfigDialog::preferredAction()
-rw-r--r-- | noncore/applets/pcmcia/configdialog.cpp | 52 | ||||
-rw-r--r-- | noncore/applets/pcmcia/configdialog.h | 2 | ||||
-rw-r--r-- | noncore/applets/pcmcia/configdialogbase.ui | 217 | ||||
-rw-r--r-- | noncore/applets/pcmcia/pcmcia.cpp | 40 | ||||
-rw-r--r-- | noncore/applets/pcmcia/pcmcia.h | 2 |
5 files changed, 186 insertions, 127 deletions
diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp index 9fcf58c..f961069 100644 --- a/noncore/applets/pcmcia/configdialog.cpp +++ b/noncore/applets/pcmcia/configdialog.cpp @@ -17,120 +17,130 @@ _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "configdialog.h" /* OPIE */ #include <opie2/oconfig.h> #include <opie2/odebug.h> #include <opie2/opcmciasystem.h> using namespace Opie::Core; /* QT */ #include <qcombobox.h> #include <qdir.h> #include <qfile.h> #include <qgroupbox.h> #include <qlabel.h> #include <qtextstream.h> ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent ) :ConfigDialogBase( parent, "pcmcia config dialog", true ) { - gbDetails->setTitle( QString( "Details for '%1'" ).arg( card->identity() ) ); + gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) ); txtCardName->setText( card->productIdentity().join( " " ) ); txtManfid->setText( card->manufacturerIdentity() ); txtFunction->setText( card->function() ); - OConfig cfg( "PCMCIA" ); - cfg.setGroup( "Global" ); - int nCards = cfg.readNumEntry( "nCards", 0 ); - QString insert; + QString action = preferredAction( card ); - 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 '" << card->name() << "' with known card '" << name << "'" << oendl; - if ( card->name() == name ) - { - insert = cfg.readEntry( "insert" ); - break; - } - } - odebug << "preferred action for card '" << card->name() << "' seems to be '" << insert << "'" << oendl; + odebug << "preferred action for card '" << card->name() << "' seems to be '" << action << "'" << oendl; - if ( !insert.isEmpty() ) + if ( !action.isEmpty() ) { for ( int i; i < cbAction->count(); ++i ) - if ( cbAction->text( i ) == insert ) cbAction->setCurrentItem( i ); + if ( cbAction->text( i ) == action ) cbAction->setCurrentItem( i ); } if ( !card->isUnsupported() ) { odebug << "card is recognized - hiding bindings" << oendl; + textInfo->hide(); textBindTo->hide(); cbBindTo->hide(); return; } else { odebug << "card is unsupported yet - showing possible bindings" << oendl; + textInfo->show(); textBindTo->show(); cbBindTo->show(); } // 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 ) + for ( unsigned int i = 0; i < pcmciaconfdir.count(); ++i ) { 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 binding '" << it.key() << "' defined in '" << it.data().latin1() << "'" << oendl; cbBindTo->insertItem( it.key() ); } } ConfigDialog::~ConfigDialog() { } + +QString ConfigDialog::preferredAction( const OPcmciaSocket* card ) +{ + OConfig cfg( "PCMCIA" ); + cfg.setGroup( "Global" ); + int nCards = cfg.readNumEntry( "nCards", 0 ); + QString action; + + 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 '" << card->name() << "' with known card '" << name << "'" << oendl; + if ( card->name() == name ) + { + action = cfg.readEntry( "action" ); + break; + } + } + + return action; +} diff --git a/noncore/applets/pcmcia/configdialog.h b/noncore/applets/pcmcia/configdialog.h index 3c7fe85..321180d 100644 --- a/noncore/applets/pcmcia/configdialog.h +++ b/noncore/applets/pcmcia/configdialog.h @@ -9,38 +9,38 @@ .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef CONFIGDIALOG_H #define CONFIGDIALOG_H #include "configdialogbase.h" namespace Opie { namespace Core { class OPcmciaSocket; }; }; class ConfigDialog : public ConfigDialogBase { Q_OBJECT public: - ConfigDialog( const Opie::Core::OPcmciaSocket* card, QWidget* parent ); ~ConfigDialog(); + static QString preferredAction( const Opie::Core::OPcmciaSocket* card ); }; #endif diff --git a/noncore/applets/pcmcia/configdialogbase.ui b/noncore/applets/pcmcia/configdialogbase.ui index 7ec3a75..829b71a 100644 --- a/noncore/applets/pcmcia/configdialogbase.ui +++ b/noncore/applets/pcmcia/configdialogbase.ui @@ -1,154 +1,68 @@ <!DOCTYPE UI><UI> <class>ConfigDialogBase</class> <widget> <class>QDialog</class> <property stdset="1"> <name>name</name> <cstring>ConfigDialogBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>197</width> - <height>154</height> + <width>215</width> + <height>329</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>5</number> </property> <property stdset="1"> <name>spacing</name> <number>2</number> </property> - <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="2" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel2</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>On insertion,</string> - </property> - </widget> - <widget row="2" column="1" > - <class>QComboBox</class> - <item> - <property> - <name>text</name> - <string>suspend</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>activate</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>eject</string> - </property> - </item> - <item> - <property> - <name>text</name> - <string>prompt for</string> - </property> - </item> - <property stdset="1"> - <name>name</name> - <cstring>cbAction</cstring> - </property> - </widget> - <widget row="3" column="1" rowspan="1" colspan="2" > - <class>QComboBox</class> - <property stdset="1"> - <name>name</name> - <cstring>cbBindTo</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>editable</name> - <bool>true</bool> - </property> - <property stdset="1"> - <name>autoResize</name> - <bool>false</bool> - </property> - </widget> - <widget row="3" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>textBindTo</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Bind to:</string> - </property> - </widget> <widget row="0" column="0" rowspan="1" colspan="3" > <class>QGroupBox</class> <property stdset="1"> <name>name</name> <cstring>gbDetails</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> <property stdset="1"> <name>name</name> <cstring>labelCardName</cstring> </property> <property stdset="1"> @@ -205,56 +119,179 @@ <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> - <spacer row="1" column="1" > + <widget row="1" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>On insertion,</string> + </property> + </widget> + <widget row="1" column="1" > + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string>suspend</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>activate</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>eject</string> + </property> + </item> + <item> + <property> + <name>text</name> + <string>prompt for</string> + </property> + </item> + <property stdset="1"> + <name>name</name> + <cstring>cbAction</cstring> + </property> + </widget> + <widget row="1" 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="4" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>textBindTo</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Bind to:</string> + </property> + </widget> + <widget row="4" column="1" rowspan="1" colspan="2" > + <class>QComboBox</class> + <item> + <property> + <name>text</name> + <string><None></string> + </property> + </item> + <property stdset="1"> + <name>name</name> + <cstring>cbBindTo</cstring> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>0</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> + <name>editable</name> + <bool>true</bool> + </property> + <property stdset="1"> + <name>currentItem</name> + <number>0</number> + </property> + <property stdset="1"> + <name>autoResize</name> + <bool>false</bool> + </property> + </widget> + <widget row="3" column="0" rowspan="1" colspan="3" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>textInfo</cstring> + </property> + <property stdset="1"> + <name>frameShape</name> + <enum>Box</enum> + </property> + <property stdset="1"> + <name>frameShadow</name> + <enum>Raised</enum> + </property> + <property stdset="1"> + <name>lineWidth</name> + <number>2</number> + </property> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>text</name> + <string><qt>CAUTION: This card is not yet recognized by your system. Without a valid binding, your card may not function correctly. Please choose a driver to bind the card to below:</qt></string> + </property> + </widget> + <spacer row="2" column="1" > <property> <name>name</name> - <cstring>Spacer1</cstring> + <cstring>Spacer2</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> </widget> </UI> diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp index 99c1bc9..1a2b619 100644 --- a/noncore/applets/pcmcia/pcmcia.cpp +++ b/noncore/applets/pcmcia/pcmcia.cpp @@ -174,125 +174,137 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) 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; } else { theCard = it.current(); QString cardName = theCard->productIdentity().join( " " ); 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 ) { newCard = false; break; } } if ( !newCard ) ++it; else break; } } if ( newCard ) { - odebug << "pcmcia: new card detected" << oendl; - cfg.setGroup( QString( "Card_%1" ).arg( nCards ) ); - cfg.writeEntry( "name", theCard->productIdentity().join( " " ) ); - cfg.writeEntry( "insert", "suspend" ); - cfg.setGroup( "Global" ); - cfg.writeEntry( "nCards", nCards+1 ); - cfg.write(); - + odebug << "pcmcia: unconfigured card detected" << oendl; + QString newCardName = theCard->productIdentity().join( " " ).stripWhiteSpace(); int result = QMessageBox::information( qApp->desktop(), tr( "PCMCIA/CF Subsystem" ), - tr( "You have inserted a new card:\n%1\nDo you want to configure?" ).arg( theCard->productIdentity().join( " " ) ), + tr( "<qt>You have inserted the card '%1'. This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ); odebug << "result = " << result << oendl; if ( result == 0 ) { - configure( theCard ); + bool configured = configure( theCard ); + + if ( configured ) + { + odebug << "card has been configured. writing out to dabase" << oendl; + cfg.setGroup( QString( "Card_%1" ).arg( nCards ) ); + cfg.writeEntry( "name", newCardName ); + cfg.writeEntry( "insert", "suspend" ); + cfg.setGroup( "Global" ); + cfg.writeEntry( "nCards", nCards+1 ); + cfg.write(); + } + else + { + odebug << "card has not been configured this time. leaving as unknown card" << oendl; + } } else { - odebug << "pcmcia: user doesn't want to configure " << theCard->productIdentity().join( " " ) << " now." << oendl; + odebug << "pcmcia: user doesn't want to configure " << newCardName << " now." << oendl; } } - else + else // it's an already configured card { - odebug << "pcmcia: card has been previously inserted" << oendl; + QString action = ConfigDialog::preferredAction( theCard ); + odebug << "pcmcia: card has been previously configured" << oendl; + odebug << "pcmcia: need to perform action'" << action << "' now... sorry, not yet implemented..." << oendl; } 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(); } } int PcmciaManager::position() { return 7; } void PcmciaManager::execCommand( const QStringList &strList ) { } void PcmciaManager::userCardAction( int action ) { odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl; int socket = action / 100; int what = action % 100; bool success = false; switch ( what ) { case CONFIGURE: configure( OPcmciaSystem::instance()->socket( socket ) ); success = true; break; case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break; case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert(); break; case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend(); break; case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume(); break; case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break; default: odebug << "not yet implemented" << oendl; } if ( !success ) { owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl; } } -void PcmciaManager::configure( OPcmciaSocket* card ) +bool PcmciaManager::configure( OPcmciaSocket* card ) { configuring = true; ConfigDialog dialog( card, qApp->desktop() ); int configresult = QPEApplication::execDialog( &dialog, false ); configuring = false; odebug << "pcmcia: configresult = " << configresult << oendl; + return configresult; } EXPORT_OPIE_APPLET_v1( PcmciaManager ) diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h index a453c1b..eb9c513 100644 --- a/noncore/applets/pcmcia/pcmcia.h +++ b/noncore/applets/pcmcia/pcmcia.h @@ -25,46 +25,46 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef PCMCIA_H #define PCMCIA_H #include <qwidget.h> #include <qpixmap.h> #include <qpopupmenu.h> namespace Opie { namespace Core { class OPcmciaSocket; } }; class PcmciaManager : public QWidget { Q_OBJECT public: PcmciaManager( QWidget *parent = 0 ); ~PcmciaManager(); static int position(); private slots: void cardMessage( const QCString& msg, const QByteArray& ); void userCardAction( int action ); void popupTimeout(); protected: void paintEvent( QPaintEvent* ); void mousePressEvent( QMouseEvent * ); private: - void configure( Opie::Core::OPcmciaSocket* ); + bool configure( Opie::Core::OPcmciaSocket* ); void execCommand( const QStringList &command ); void popUp(QString message, QString icon = QString::null ); private: bool configuring; int commandOrig; QPixmap pm; QPopupMenu *popupMenu; }; #endif |