author | benmeyer <benmeyer> | 2002-10-17 18:35:56 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-17 18:35:56 (UTC) |
commit | 0af393f729c3c6fb31b6794d31daf1dba9ed6eb6 (patch) (unidiff) | |
tree | 83bf6904aa174ff026170ac6380bb857a6807468 /noncore/settings | |
parent | 7a8d68c1dff37a5a50d1dfa84513ed1f7b7e2008 (diff) | |
download | opie-0af393f729c3c6fb31b6794d31daf1dba9ed6eb6.zip opie-0af393f729c3c6fb31b6794d31daf1dba9ed6eb6.tar.gz opie-0af393f729c3c6fb31b6794d31daf1dba9ed6eb6.tar.bz2 |
Profile changes
-rw-r--r-- | noncore/settings/networksettings/interface.h | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/module.h | 9 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 40 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.h | 4 |
5 files changed, 38 insertions, 23 deletions
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h index 7943fd6..dc9c6d3 100644 --- a/noncore/settings/networksettings/interface.h +++ b/noncore/settings/networksettings/interface.h | |||
@@ -47,13 +47,12 @@ public slots: | |||
47 | void restart(); | 47 | void restart(); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | // Interface information | 50 | // Interface information |
51 | bool status; | 51 | bool status; |
52 | bool attached; | 52 | bool attached; |
53 | QString interfaceName; | ||
54 | QString hardwareName; | 53 | QString hardwareName; |
55 | Module *moduleOwner; | 54 | Module *moduleOwner; |
56 | 55 | ||
57 | // Network information | 56 | // Network information |
58 | QString macAddress; | 57 | QString macAddress; |
59 | QString ip; | 58 | QString ip; |
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h index 0c81928..a30f492 100644 --- a/noncore/settings/networksettings/module.h +++ b/noncore/settings/networksettings/module.h | |||
@@ -13,13 +13,20 @@ class Module : QObject{ | |||
13 | 13 | ||
14 | signals: | 14 | signals: |
15 | void updateInterface(Interface *i); | 15 | void updateInterface(Interface *i); |
16 | 16 | ||
17 | public: | 17 | public: |
18 | Module(){}; | 18 | Module(){}; |
19 | 19 | ||
20 | /** | ||
21 | * The current profile has been changed and the module should do any | ||
22 | * neccesary changes also. | ||
23 | * @param newProfile what the profile should be changed to. | ||
24 | */ | ||
25 | virtual void setProfile(QString newProfile) = 0; | ||
26 | |||
20 | /** | 27 | /** |
21 | * get the icon name for this device. | 28 | * get the icon name for this device. |
22 | * @param Interface* can be used in determining the icon. | 29 | * @param Interface* can be used in determining the icon. |
23 | * @return QString the icon name (minus .png, .gif etc) | 30 | * @return QString the icon name (minus .png, .gif etc) |
24 | */ | 31 | */ |
25 | virtual QString getPixmapName(Interface* i) = 0; | 32 | virtual QString getPixmapName(Interface* i) = 0; |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 806643d..74eef5f 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -23,41 +23,41 @@ WLANImp::WLANImp( Config &cfg, QWidget* parent, const char* name):WLAN(parent, n | |||
23 | void WLANImp::readConfig() | 23 | void WLANImp::readConfig() |
24 | { | 24 | { |
25 | qWarning( "WLANImp::readConfig() called." ); | 25 | qWarning( "WLANImp::readConfig() called." ); |
26 | config.setGroup( "Properties" ); | 26 | config.setGroup( "Properties" ); |
27 | QString ssid = config.readEntry( "SSID", "any" ); | 27 | QString ssid = config.readEntry( "SSID", "any" ); |
28 | if( ssid == "any" || ssid == "ANY" ){ | 28 | if( ssid == "any" || ssid == "ANY" ){ |
29 | essNon->setChecked( TRUE ); | 29 | essNon->setChecked( true ); |
30 | } else { | 30 | } else { |
31 | essSpecific->setChecked( TRUE ); | 31 | essSpecific->setChecked( true ); |
32 | essSpecificLineEdit->setText( ssid ); | 32 | essSpecificLineEdit->setText( ssid ); |
33 | } | 33 | } |
34 | QString mode = config.readEntry( "Mode", "Managed" ); | 34 | QString mode = config.readEntry( "Mode", "Managed" ); |
35 | if( mode == "adhoc" ) { | 35 | if( mode == "adhoc" ) { |
36 | network802->setChecked( TRUE ); | 36 | network802->setChecked( true ); |
37 | } else { | 37 | } else { |
38 | networkInfrastructure->setChecked( TRUE ); | 38 | networkInfrastructure->setChecked( true ); |
39 | } | 39 | } |
40 | networkChannel->setValue( config.readNumEntry( "CHANNEL", 1 ) ); | 40 | networkChannel->setValue( config.readNumEntry( "CHANNEL", 1 ) ); |
41 | // config.readEntry( "RATE", "auto" ); | 41 | // config.readEntry( "RATE", "auto" ); |
42 | config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( TRUE ) : wepEnabled->setChecked( FALSE ); | 42 | config.readEntry( "dot11PrivacyInvoked" ) == "true" ? wepEnabled->setChecked( true ) : wepEnabled->setChecked( false ); |
43 | config.readEntry( "AuthType", "opensystem" ); | 43 | config.readEntry( "AuthType", "opensystem" ); |
44 | config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( TRUE ) : key128->setChecked( TRUE ); | 44 | config.readEntry( "PRIV_KEY128", "false" ) == "false" ? key40->setChecked( true ) : key128->setChecked( true ); |
45 | int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 ); | 45 | int defaultkey = config.readNumEntry( "dot11WEPDefaultKeyID", 0 ); |
46 | switch( defaultkey ){ | 46 | switch( defaultkey ){ |
47 | case 0: | 47 | case 0: |
48 | keyRadio0->setChecked( TRUE ); | 48 | keyRadio0->setChecked( true ); |
49 | break; | 49 | break; |
50 | case 1: | 50 | case 1: |
51 | keyRadio1->setChecked( TRUE ); | 51 | keyRadio1->setChecked( true ); |
52 | break; | 52 | break; |
53 | case 2: | 53 | case 2: |
54 | keyRadio2->setChecked( TRUE ); | 54 | keyRadio2->setChecked( true ); |
55 | break; | 55 | break; |
56 | case 3: | 56 | case 3: |
57 | keyRadio3->setChecked( TRUE ); | 57 | keyRadio3->setChecked( true ); |
58 | break; | 58 | break; |
59 | } | 59 | } |
60 | keyLineEdit0->setText(config.readEntry( "dot11WEPDefaultKey0" )); | 60 | keyLineEdit0->setText(config.readEntry( "dot11WEPDefaultKey0" )); |
61 | keyLineEdit1->setText(config.readEntry( "dot11WEPDefaultKey1" )); | 61 | keyLineEdit1->setText(config.readEntry( "dot11WEPDefaultKey1" )); |
62 | keyLineEdit2->setText(config.readEntry( "dot11WEPDefaultKey2" )); | 62 | keyLineEdit2->setText(config.readEntry( "dot11WEPDefaultKey2" )); |
63 | keyLineEdit3->setText(config.readEntry( "dot11WEPDefaultKey3" )); | 63 | keyLineEdit3->setText(config.readEntry( "dot11WEPDefaultKey3" )); |
@@ -94,13 +94,13 @@ bool WLANImp::writeConfig() | |||
94 | } | 94 | } |
95 | config.writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); | 95 | config.writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); |
96 | config.writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); | 96 | config.writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); |
97 | config.writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); | 97 | config.writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); |
98 | config.writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); | 98 | config.writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); |
99 | return writeWirelessOpts( config ); | 99 | return writeWirelessOpts( config ); |
100 | // return TRUE; | 100 | // return true; |
101 | } | 101 | } |
102 | 102 | ||
103 | /** | 103 | /** |
104 | */ | 104 | */ |
105 | void WLANImp::accept() | 105 | void WLANImp::accept() |
106 | { | 106 | { |
@@ -117,44 +117,44 @@ void WLANImp::done ( int r ) | |||
117 | bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) | 117 | bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) |
118 | { | 118 | { |
119 | qWarning( "WLANImp::writeWirelessOpts entered." ); | 119 | qWarning( "WLANImp::writeWirelessOpts entered." ); |
120 | QString prev = "/etc/pcmcia/wireless.opts"; | 120 | QString prev = "/etc/pcmcia/wireless.opts"; |
121 | QFile prevFile(prev); | 121 | QFile prevFile(prev); |
122 | if ( !prevFile.open( IO_ReadOnly ) ) | 122 | if ( !prevFile.open( IO_ReadOnly ) ) |
123 | return FALSE; | 123 | return false; |
124 | 124 | ||
125 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; | 125 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; |
126 | QFile tmpFile(tmp); | 126 | QFile tmpFile(tmp); |
127 | if ( !tmpFile.open( IO_WriteOnly ) ) | 127 | if ( !tmpFile.open( IO_WriteOnly ) ) |
128 | return FALSE; | 128 | return false; |
129 | 129 | ||
130 | bool retval = TRUE; | 130 | bool retval = true; |
131 | 131 | ||
132 | QTextStream in( &prevFile ); | 132 | QTextStream in( &prevFile ); |
133 | QTextStream out( &tmpFile ); | 133 | QTextStream out( &tmpFile ); |
134 | 134 | ||
135 | config.setGroup("Properties"); | 135 | config.setGroup("Properties"); |
136 | 136 | ||
137 | QString line; | 137 | QString line; |
138 | bool found=FALSE; | 138 | bool found=false; |
139 | bool done=FALSE; | 139 | bool done=false; |
140 | while ( !in.atEnd() ) { | 140 | while ( !in.atEnd() ) { |
141 | QString line = in.readLine(); | 141 | QString line = in.readLine(); |
142 | QString wline = line.simplifyWhiteSpace(); | 142 | QString wline = line.simplifyWhiteSpace(); |
143 | if ( !done ) { | 143 | if ( !done ) { |
144 | if ( found ) { | 144 | if ( found ) { |
145 | // skip existing entry for this scheme, and write our own. | 145 | // skip existing entry for this scheme, and write our own. |
146 | if ( wline == ";;" ) { | 146 | if ( wline == ";;" ) { |
147 | found = FALSE; | 147 | found = false; |
148 | continue; | 148 | continue; |
149 | } else { | 149 | } else { |
150 | continue; | 150 | continue; |
151 | } | 151 | } |
152 | } else { | 152 | } else { |
153 | if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) { | 153 | if ( wline.left(scheme.length()+7) == scheme + ",*,*,*)" ) { |
154 | found=TRUE; | 154 | found=true; |
155 | continue; // skip this line | 155 | continue; // skip this line |
156 | } else if ( wline == "esac" || wline == "*,*,*,*)" ) { | 156 | } else if ( wline == "esac" || wline == "*,*,*,*)" ) { |
157 | // end - add new entry | 157 | // end - add new entry |
158 | // Not all fields have a GUI, but all are supported | 158 | // Not all fields have a GUI, but all are supported |
159 | // in the letwork configuration files. | 159 | // in the letwork configuration files. |
160 | static const char* txtfields[] = { | 160 | static const char* txtfields[] = { |
@@ -198,13 +198,13 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) | |||
198 | const char** f = txtfields; | 198 | const char** f = txtfields; |
199 | while (*f) { | 199 | while (*f) { |
200 | out << " " << *f << "=" << config.readEntry(*f,"") << "\n"; | 200 | out << " " << *f << "=" << config.readEntry(*f,"") << "\n"; |
201 | ++f; | 201 | ++f; |
202 | } | 202 | } |
203 | out << " ;;\n"; | 203 | out << " ;;\n"; |
204 | done = TRUE; | 204 | done = true; |
205 | } | 205 | } |
206 | } | 206 | } |
207 | } | 207 | } |
208 | out << line << "\n"; | 208 | out << line << "\n"; |
209 | } | 209 | } |
210 | 210 | ||
@@ -218,13 +218,13 @@ bool WLANImp::writeWirelessOpts( Config &config, QString scheme ) | |||
218 | initpath = "/etc/init.d"; | 218 | initpath = "/etc/init.d"; |
219 | } | 219 | } |
220 | if( initpath ) | 220 | if( initpath ) |
221 | system(QString("%1/pcmcia stop").arg(initpath)); | 221 | system(QString("%1/pcmcia stop").arg(initpath)); |
222 | 222 | ||
223 | if( system( "mv " + tmp + " " + prev ) ) | 223 | if( system( "mv " + tmp + " " + prev ) ) |
224 | retval = FALSE; | 224 | retval = false; |
225 | //#ifdef USE_SCHEMES | 225 | //#ifdef USE_SCHEMES |
226 | // if ( retval ) | 226 | // if ( retval ) |
227 | //SchemeChanger::changeScheme(scheme); | 227 | //SchemeChanger::changeScheme(scheme); |
228 | //#endif | 228 | //#endif |
229 | 229 | ||
230 | //system("cardctl resume"); | 230 | //system("cardctl resume"); |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index f0394b4..9d34d75 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -7,12 +7,19 @@ | |||
7 | */ | 7 | */ |
8 | WLANModule::WLANModule() : Module() { | 8 | WLANModule::WLANModule() : Module() { |
9 | // get output from iwconfig | 9 | // get output from iwconfig |
10 | } | 10 | } |
11 | 11 | ||
12 | /** | 12 | /** |
13 | * Change the current profile | ||
14 | */ | ||
15 | void WLANModule::setProfile(QString newProfile){ | ||
16 | profile = newProfile; | ||
17 | } | ||
18 | |||
19 | /** | ||
13 | * get the icon name for this device. | 20 | * get the icon name for this device. |
14 | * @param Interface* can be used in determining the icon. | 21 | * @param Interface* can be used in determining the icon. |
15 | * @return QString the icon name (minus .png, .gif etc) | 22 | * @return QString the icon name (minus .png, .gif etc) |
16 | */ | 23 | */ |
17 | QString WLANModule::getPixmapName(Interface* ){ | 24 | QString WLANModule::getPixmapName(Interface* ){ |
18 | return "wlan"; | 25 | return "wlan"; |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h index 7ebe129..833d4b1 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.h +++ b/noncore/settings/networksettings/wlan/wlanmodule.h | |||
@@ -8,24 +8,26 @@ class WLANModule : Module{ | |||
8 | signals: | 8 | signals: |
9 | void updateInterface(Interface *i); | 9 | void updateInterface(Interface *i); |
10 | 10 | ||
11 | public: | 11 | public: |
12 | WLANModule(); | 12 | WLANModule(); |
13 | 13 | ||
14 | virtual void setProfile(QString newProfile); | ||
14 | virtual bool isOwner(Interface *); | 15 | virtual bool isOwner(Interface *); |
15 | virtual QWidget *configure(QTabWidget **tabWidget); | 16 | virtual QWidget *configure(QTabWidget **tabWidget); |
16 | virtual QWidget *information(QTabWidget **tabWidget); | 17 | virtual QWidget *information(QTabWidget **tabWidget); |
17 | virtual QList<Interface> getInterfaces(); | 18 | virtual QList<Interface> getInterfaces(); |
18 | virtual void possibleNewInterfaces(QMap<QString, QString> &list){}; | 19 | virtual void possibleNewInterfaces(QMap<QString, QString> &list){}; |
19 | virtual Interface *addNewInterface(QString name); | 20 | virtual Interface *addNewInterface(QString name); |
20 | virtual bool remove(Interface* i); | 21 | virtual bool remove(Interface* i); |
21 | virtual QString getPixmapName(Interface* i); | 22 | virtual QString getPixmapName(Interface* i); |
22 | 23 | ||
23 | private: | 24 | private: |
24 | QList<Interface> list; | 25 | QList<Interface> list; |
25 | 26 | QString profile; | |
27 | |||
26 | }; | 28 | }; |
27 | 29 | ||
28 | extern "C" | 30 | extern "C" |
29 | { | 31 | { |
30 | void* create_plugin() { | 32 | void* create_plugin() { |
31 | return new WLANModule(); | 33 | return new WLANModule(); |