Diffstat (limited to 'noncore/applets/pcmcia/configdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/pcmcia/configdialog.cpp | 21 |
1 files changed, 17 insertions, 4 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 | |||
@@ -36,17 +36,20 @@ using namespace Opie::Core; | |||
36 | 36 | ||
37 | /* QT */ | 37 | /* QT */ |
38 | #include <qcombobox.h> | 38 | #include <qcombobox.h> |
39 | #include <qdir.h> | ||
40 | #include <qlabel.h> | ||
39 | 41 | ||
40 | ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent ) | 42 | ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent ) |
41 | :ConfigDialogBase( parent, "pcmcia config dialog", true ) | 43 | :ConfigDialogBase( parent, "pcmcia config dialog", true ) |
42 | { | 44 | { |
43 | setCaption( tr( "Configure %1" ).arg( cardname ) ); | 45 | //setCaption( tr( "Configure %1" ).arg( cardname ) ); |
44 | 46 | textCardName->setText( cardname ); | |
47 | |||
45 | OConfig cfg( "PCMCIA" ); | 48 | OConfig cfg( "PCMCIA" ); |
46 | cfg.setGroup( "Global" ); | 49 | cfg.setGroup( "Global" ); |
47 | int nCards = cfg.readNumEntry( "nCards", 0 ); | 50 | int nCards = cfg.readNumEntry( "nCards", 0 ); |
48 | QString insert; | 51 | QString insert; |
49 | 52 | ||
50 | for ( int i = 0; i < nCards; ++i ) | 53 | for ( int i = 0; i < nCards; ++i ) |
51 | { | 54 | { |
52 | QString cardSection = QString( "Card_%1" ).arg( i ); | 55 | QString cardSection = QString( "Card_%1" ).arg( i ); |
@@ -60,12 +63,22 @@ ConfigDialog::ConfigDialog( const QString& cardname, QWidget* parent ) | |||
60 | } | 63 | } |
61 | } | 64 | } |
62 | odebug << "preferred action for card '" << cardname << "' seems to be '" << insert << "'" << oendl; | 65 | odebug << "preferred action for card '" << cardname << "' seems to be '" << insert << "'" << oendl; |
63 | 66 | ||
64 | if ( !insert.isEmpty() ) | 67 | if ( !insert.isEmpty() ) |
65 | { | 68 | { |
66 | for ( int i; i < cbAction->count(); ++i ) | 69 | for ( int i; i < cbAction->count(); ++i ) |
67 | if ( cbAction->text( i ) == insert ) cbAction->setCurrentItem( i ); | 70 | if ( cbAction->text( i ) == insert ) cbAction->setCurrentItem( i ); |
68 | } | 71 | } |
72 | |||
73 | // parse possible device and class names out of /etc/pcmcia/*.conf | ||
74 | QStringList deviceNames; | ||
75 | QStringList classNames; | ||
76 | |||
77 | QDir pcmciaconfdir( "/etc/pcmcia", "*.conf" ); | ||
78 | |||
79 | for ( int i = 0; i < pcmciaconfdir.count(); ++i ) | ||
80 | odebug << "found conf file '" << pcmciaconfdir[i] << "'" << oendl; | ||
81 | |||
69 | } | 82 | } |
70 | 83 | ||
71 | ConfigDialog::~ConfigDialog() | 84 | ConfigDialog::~ConfigDialog() |