author | benmeyer <benmeyer> | 2003-04-08 23:53:34 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2003-04-08 23:53:34 (UTC) |
commit | 17ba7a490ca74c491cfb11df52b44ef7826d1297 (patch) (unidiff) | |
tree | c5c7defdacd6b4f231baf97380ad69192c3dbde1 /noncore/settings/networksettings | |
parent | 89100a32b43b7eda68aaa19bc275a0fb7ce36e30 (diff) | |
download | opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.zip opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.tar.gz opie-17ba7a490ca74c491cfb11df52b44ef7826d1297.tar.bz2 |
kde updates
Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/info.ui | 22 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 14 |
2 files changed, 8 insertions, 28 deletions
diff --git a/noncore/settings/networksettings/wlan/info.ui b/noncore/settings/networksettings/wlan/info.ui index 7a5bf0b..50ee540 100644 --- a/noncore/settings/networksettings/wlan/info.ui +++ b/noncore/settings/networksettings/wlan/info.ui | |||
@@ -287,35 +287,13 @@ | |||
287 | <cstring>TextLabel1_2</cstring> | 287 | <cstring>TextLabel1_2</cstring> |
288 | </property> | 288 | </property> |
289 | <property stdset="1"> | 289 | <property stdset="1"> |
290 | <name>text</name> | 290 | <name>text</name> |
291 | <string>Signal</string> | 291 | <string>Signal</string> |
292 | </property> | 292 | </property> |
293 | </widget> | 293 | </widget> |
294 | </grid> | 294 | </grid> |
295 | </widget> | 295 | </widget> |
296 | </widget> | 296 | </widget> |
297 | </vbox> | 297 | </vbox> |
298 | </widget> | 298 | </widget> |
299 | <customwidgets> | ||
300 | <customwidget> | ||
301 | <class>QWidget</class> | ||
302 | <header location="local">qwidget.h</header> | ||
303 | <sizehint> | ||
304 | <width>100</width> | ||
305 | <height>100</height> | ||
306 | </sizehint> | ||
307 | <container>0</container> | ||
308 | <sizepolicy> | ||
309 | <hordata>7</hordata> | ||
310 | <verdata>7</verdata> | ||
311 | </sizepolicy> | ||
312 | <pixmap>image0</pixmap> | ||
313 | </customwidget> | ||
314 | </customwidgets> | ||
315 | <images> | ||
316 | <image> | ||
317 | <name>image0</name> | ||
318 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> | ||
319 | </image> | ||
320 | </images> | ||
321 | </UI> | 299 | </UI> |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 3797e22..57266bb 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -4,27 +4,30 @@ | |||
4 | #include <qfile.h> | 4 | #include <qfile.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qtextstream.h> | 6 | #include <qtextstream.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <qlineedit.h> | 8 | #include <qlineedit.h> |
9 | #include <qlabel.h> | 9 | #include <qlabel.h> |
10 | #include <qspinbox.h> | 10 | #include <qspinbox.h> |
11 | #include <qradiobutton.h> | 11 | #include <qradiobutton.h> |
12 | #include <qcheckbox.h> | 12 | #include <qcheckbox.h> |
13 | #include <qtabwidget.h> | 13 | #include <qtabwidget.h> |
14 | #include <qcombobox.h> | 14 | #include <qcombobox.h> |
15 | 15 | ||
16 | /* system() */ | 16 | #ifdef QTE_VERSION |
17 | //#include <stdlib.h> | 17 | #include <opie/oprocess.h> |
18 | #include <opie/oprocess.h> | 18 | #else |
19 | #define OProcess KProcess | ||
20 | #include <kprocess.h> | ||
21 | #endif | ||
19 | 22 | ||
20 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" | 23 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" |
21 | 24 | ||
22 | /** | 25 | /** |
23 | * Constructor, read in the wireless.opts file for parsing later. | 26 | * Constructor, read in the wireless.opts file for parsing later. |
24 | */ | 27 | */ |
25 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { | 28 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { |
26 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); | 29 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); |
27 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 30 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
28 | 31 | ||
29 | // Read in the config file. | 32 | // Read in the config file. |
30 | QString wlanFile = WIRELESS_OPTS; | 33 | QString wlanFile = WIRELESS_OPTS; |
@@ -217,26 +220,25 @@ void WLANImp::accept(){ | |||
217 | if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){ | 220 | if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){ |
218 | QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); | 221 | QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); |
219 | return; | 222 | return; |
220 | } | 223 | } |
221 | 224 | ||
222 | // Ok settings are good here, save | 225 | // Ok settings are good here, save |
223 | changeAndSaveSettingFile(); | 226 | changeAndSaveSettingFile(); |
224 | 227 | ||
225 | // Try to save the interfaces settings. | 228 | // Try to save the interfaces settings. |
226 | if(!interfaceSetup->saveChanges()) | 229 | if(!interfaceSetup->saveChanges()) |
227 | return; | 230 | return; |
228 | 231 | ||
229 | OProcess insert(QString("sh")); | 232 | OProcess insert; |
233 | insert << "sh"; | ||
230 | insert << "-c"; | 234 | insert << "-c"; |
231 | insert << "cardctl eject && cardctl insert"; | 235 | insert << "cardctl eject && cardctl insert"; |
232 | 236 | ||
233 | if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { | 237 | if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) { |
234 | qWarning("could not start cardctl"); | 238 | qWarning("could not start cardctl"); |
235 | } | 239 | } |
236 | 240 | ||
237 | // Close out the dialog | 241 | // Close out the dialog |
238 | QDialog::accept(); | 242 | QDialog::accept(); |
239 | } | 243 | } |
240 | 244 | ||
241 | // wlanimp.cpp | ||
242 | |||