author | benmeyer <benmeyer> | 2003-04-09 00:04:29 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2003-04-09 00:04:29 (UTC) |
commit | bbefacdb0099ebb8c80f40c56237c6adc18c9328 (patch) (unidiff) | |
tree | 97dec1a29632d1ca6cc1c1118b2e8593f3925f9b /noncore/settings/networksettings | |
parent | 17ba7a490ca74c491cfb11df52b44ef7826d1297 (diff) | |
download | opie-bbefacdb0099ebb8c80f40c56237c6adc18c9328.zip opie-bbefacdb0099ebb8c80f40c56237c6adc18c9328.tar.gz opie-bbefacdb0099ebb8c80f40c56237c6adc18c9328.tar.bz2 |
kde update
Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
5 files changed, 9 insertions, 83 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceadvanced.ui b/noncore/settings/networksettings/interfaces/interfaceadvanced.ui index 9d9f98e..2e106cb 100644 --- a/noncore/settings/networksettings/interfaces/interfaceadvanced.ui +++ b/noncore/settings/networksettings/interfaces/interfaceadvanced.ui | |||
@@ -316,29 +316,7 @@ | |||
316 | <name>text</name> | 316 | <name>text</name> |
317 | <string>00:00:00:00:00:00</string> | 317 | <string>00:00:00:00:00:00</string> |
318 | </property> | 318 | </property> |
319 | </widget> | 319 | </widget> |
320 | </grid> | 320 | </grid> |
321 | </widget> | 321 | </widget> |
322 | <customwidgets> | ||
323 | <customwidget> | ||
324 | <class>QWidget</class> | ||
325 | <header location="local">qwidget.h</header> | ||
326 | <sizehint> | ||
327 | <width>100</width> | ||
328 | <height>100</height> | ||
329 | </sizehint> | ||
330 | <container>0</container> | ||
331 | <sizepolicy> | ||
332 | <hordata>7</hordata> | ||
333 | <verdata>7</verdata> | ||
334 | </sizepolicy> | ||
335 | <pixmap>image0</pixmap> | ||
336 | </customwidget> | ||
337 | </customwidgets> | ||
338 | <images> | ||
339 | <image> | ||
340 | <name>image0</name> | ||
341 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> | ||
342 | </image> | ||
343 | </images> | ||
344 | </UI> | 322 | </UI> |
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformation.ui b/noncore/settings/networksettings/interfaces/interfaceinformation.ui index e49e09f..763ad90 100644 --- a/noncore/settings/networksettings/interfaces/interfaceinformation.ui +++ b/noncore/settings/networksettings/interfaces/interfaceinformation.ui | |||
@@ -308,34 +308,12 @@ | |||
308 | <name>orientation</name> | 308 | <name>orientation</name> |
309 | <enum>Horizontal</enum> | 309 | <enum>Horizontal</enum> |
310 | </property> | 310 | </property> |
311 | </widget> | 311 | </widget> |
312 | </grid> | 312 | </grid> |
313 | </widget> | 313 | </widget> |
314 | <customwidgets> | ||
315 | <customwidget> | ||
316 | <class>QWidget</class> | ||
317 | <header location="local">qwidget.h</header> | ||
318 | <sizehint> | ||
319 | <width>100</width> | ||
320 | <height>100</height> | ||
321 | </sizehint> | ||
322 | <container>0</container> | ||
323 | <sizepolicy> | ||
324 | <hordata>7</hordata> | ||
325 | <verdata>7</verdata> | ||
326 | </sizepolicy> | ||
327 | <pixmap>image0</pixmap> | ||
328 | </customwidget> | ||
329 | </customwidgets> | ||
330 | <images> | ||
331 | <image> | ||
332 | <name>image0</name> | ||
333 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> | ||
334 | </image> | ||
335 | </images> | ||
336 | <tabstops> | 314 | <tabstops> |
337 | <tabstop>startButton</tabstop> | 315 | <tabstop>startButton</tabstop> |
338 | <tabstop>stopButton</tabstop> | 316 | <tabstop>stopButton</tabstop> |
339 | <tabstop>refreshButton</tabstop> | 317 | <tabstop>refreshButton</tabstop> |
340 | <tabstop>restartButton</tabstop> | 318 | <tabstop>restartButton</tabstop> |
341 | <tabstop>advancedButton</tabstop> | 319 | <tabstop>advancedButton</tabstop> |
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp index 1fa5d38..271bb78 100644 --- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp | |||
@@ -3,12 +3,17 @@ | |||
3 | 3 | ||
4 | #include <qpushbutton.h> | 4 | #include <qpushbutton.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | #include <qgroupbox.h> | 6 | #include <qgroupbox.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | 8 | ||
9 | #ifdef QTE_VERSION | ||
10 | #else | ||
11 | #define showMaximized show | ||
12 | #endif | ||
13 | |||
9 | /** | 14 | /** |
10 | * Constructor for the InterfaceInformationImp class. This class pretty much | 15 | * Constructor for the InterfaceInformationImp class. This class pretty much |
11 | * just display's information about the interface that is passed to it. | 16 | * just display's information about the interface that is passed to it. |
12 | */ | 17 | */ |
13 | InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i){ | 18 | InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i){ |
14 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 19 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
@@ -45,25 +50,23 @@ void InterfaceInformationImp::updateInterface(Interface *){ | |||
45 | 50 | ||
46 | /** | 51 | /** |
47 | * Create the advanced widget. Fill it with the current interface's information. | 52 | * Create the advanced widget. Fill it with the current interface's information. |
48 | * Display it. | 53 | * Display it. |
49 | */ | 54 | */ |
50 | void InterfaceInformationImp::advanced(){ | 55 | void InterfaceInformationImp::advanced(){ |
51 | InterfaceAdvanced *a = new InterfaceAdvanced(0, "InterfaceAdvanced"); | 56 | InterfaceAdvanced *a = new InterfaceAdvanced(this, "InterfaceAdvanced", Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog); |
52 | a->interfaceName->setText(interface->getInterfaceName()); | 57 | a->interfaceName->setText(interface->getInterfaceName()); |
53 | a->macAddressLabel->setText(interface->getMacAddress()); | 58 | a->macAddressLabel->setText(interface->getMacAddress()); |
54 | a->ipAddressLabel->setText(interface->getIp()); | 59 | a->ipAddressLabel->setText(interface->getIp()); |
55 | a->subnetMaskLabel->setText(interface->getSubnetMask()); | 60 | a->subnetMaskLabel->setText(interface->getSubnetMask()); |
56 | a->broadcastLabel->setText(interface->getBroadcast()); | 61 | a->broadcastLabel->setText(interface->getBroadcast()); |
57 | a->dhcpServerLabel->setText(interface->getDhcpServerIp()); | 62 | a->dhcpServerLabel->setText(interface->getDhcpServerIp()); |
58 | a->leaseObtainedLabel->setText(interface->getLeaseObtained()); | 63 | a->leaseObtainedLabel->setText(interface->getLeaseObtained()); |
59 | a->leaseExpiresLabel->setText(interface->getLeaseExpires()); | 64 | a->leaseExpiresLabel->setText(interface->getLeaseExpires()); |
60 | a->dhcpInformation->setEnabled(interface->isDhcp()); | 65 | a->dhcpInformation->setEnabled(interface->isDhcp()); |
61 | |||
62 | a->showMaximized(); | 66 | a->showMaximized(); |
63 | a->show(); | ||
64 | } | 67 | } |
65 | 68 | ||
66 | /** | 69 | /** |
67 | * Messages from the interface if start/stop went as planned. | 70 | * Messages from the interface if start/stop went as planned. |
68 | * Purly for user feedback. | 71 | * Purly for user feedback. |
69 | * @param message the message to display. | 72 | * @param message the message to display. |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetup.ui b/noncore/settings/networksettings/interfaces/interfacesetup.ui index aff9d6c..efcab8b 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetup.ui +++ b/noncore/settings/networksettings/interfaces/interfacesetup.ui | |||
@@ -33,13 +33,13 @@ | |||
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>name</name> | 34 | <name>name</name> |
35 | <cstring>autoStart</cstring> | 35 | <cstring>autoStart</cstring> |
36 | </property> | 36 | </property> |
37 | <property stdset="1"> | 37 | <property stdset="1"> |
38 | <name>text</name> | 38 | <name>text</name> |
39 | <string>Bring up on bootup</string> | 39 | <string>Automatically bring up</string> |
40 | </property> | 40 | </property> |
41 | </widget> | 41 | </widget> |
42 | <widget> | 42 | <widget> |
43 | <class>QCheckBox</class> | 43 | <class>QCheckBox</class> |
44 | <property stdset="1"> | 44 | <property stdset="1"> |
45 | <name>name</name> | 45 | <name>name</name> |
@@ -197,34 +197,12 @@ | |||
197 | <height>20</height> | 197 | <height>20</height> |
198 | </size> | 198 | </size> |
199 | </property> | 199 | </property> |
200 | </spacer> | 200 | </spacer> |
201 | </vbox> | 201 | </vbox> |
202 | </widget> | 202 | </widget> |
203 | <customwidgets> | ||
204 | <customwidget> | ||
205 | <class>QWidget</class> | ||
206 | <header location="local">qwidget.h</header> | ||
207 | <sizehint> | ||
208 | <width>100</width> | ||
209 | <height>100</height> | ||
210 | </sizehint> | ||
211 | <container>0</container> | ||
212 | <sizepolicy> | ||
213 | <hordata>7</hordata> | ||
214 | <verdata>7</verdata> | ||
215 | </sizepolicy> | ||
216 | <pixmap>image0</pixmap> | ||
217 | </customwidget> | ||
218 | </customwidgets> | ||
219 | <images> | ||
220 | <image> | ||
221 | <name>image0</name> | ||
222 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> | ||
223 | </image> | ||
224 | </images> | ||
225 | <connections> | 203 | <connections> |
226 | <connection> | 204 | <connection> |
227 | <sender>dhcpCheckBox</sender> | 205 | <sender>dhcpCheckBox</sender> |
228 | <signal>toggled(bool)</signal> | 206 | <signal>toggled(bool)</signal> |
229 | <receiver>staticGroupBox</receiver> | 207 | <receiver>staticGroupBox</receiver> |
230 | <slot>setDisabled(bool)</slot> | 208 | <slot>setDisabled(bool)</slot> |
diff --git a/noncore/settings/networksettings/ppp/.cvsignore b/noncore/settings/networksettings/ppp/.cvsignore index 1ba7ac7..74490f0 100644 --- a/noncore/settings/networksettings/ppp/.cvsignore +++ b/noncore/settings/networksettings/ppp/.cvsignore | |||
@@ -4,20 +4,9 @@ | |||
4 | .deps | 4 | .deps |
5 | .libs | 5 | .libs |
6 | .moc.cpp | 6 | .moc.cpp |
7 | .moc.o | 7 | .moc.o |
8 | .o | 8 | .o |
9 | Makefile* | 9 | Makefile* |
10 | addconnection.cpp | ||
11 | addconnection.h | ||
12 | interfaceadvanced.cpp | ||
13 | interfaceadvanced.h | ||
14 | interfaceinformation.cpp | ||
15 | interfaceinformation.h | ||
16 | interfacesetup.cpp | ||
17 | interfacesetup.h | ||
18 | mainwindow.cpp | ||
19 | mainwindow.h | ||
20 | moc_*.cpp | 10 | moc_*.cpp |
21 | networksetup | 11 | ppp.h |
22 | systemadvanced.cpp | 12 | ppp.cpp |
23 | systemadvanced.h | ||