From bbefacdb0099ebb8c80f40c56237c6adc18c9328 Mon Sep 17 00:00:00 2001 From: benmeyer Date: Wed, 09 Apr 2003 00:04:29 +0000 Subject: kde update --- 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 @@ -319,26 +319,4 @@ - - - QWidget -
qwidget.h
- - 100 - 100 - - 0 - - 7 - 7 - - image0 -
-
- - - image0 - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - 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 @@ -311,28 +311,6 @@ - - - QWidget -
qwidget.h
- - 100 - 100 - - 0 - - 7 - 7 - - image0 -
-
- - - image0 - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - startButton stopButton 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 @@ -6,6 +6,11 @@ #include #include +#ifdef QTE_VERSION +#else + #define showMaximized show +#endif + /** * Constructor for the InterfaceInformationImp class. This class pretty much * just display's information about the interface that is passed to it. @@ -48,7 +53,7 @@ void InterfaceInformationImp::updateInterface(Interface *){ * Display it. */ void InterfaceInformationImp::advanced(){ - InterfaceAdvanced *a = new InterfaceAdvanced(0, "InterfaceAdvanced"); + InterfaceAdvanced *a = new InterfaceAdvanced(this, "InterfaceAdvanced", Qt::WShowModal | Qt::WDestructiveClose | Qt::WType_Dialog); a->interfaceName->setText(interface->getInterfaceName()); a->macAddressLabel->setText(interface->getMacAddress()); a->ipAddressLabel->setText(interface->getIp()); @@ -58,9 +63,7 @@ void InterfaceInformationImp::advanced(){ a->leaseObtainedLabel->setText(interface->getLeaseObtained()); a->leaseExpiresLabel->setText(interface->getLeaseExpires()); a->dhcpInformation->setEnabled(interface->isDhcp()); - a->showMaximized(); - a->show(); } /** 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 @@ -36,7 +36,7 @@ text - Bring up on bootup + Automatically bring up @@ -200,28 +200,6 @@ - - - QWidget -
qwidget.h
- - 100 - 100 - - 0 - - 7 - 7 - - image0 -
-
- - - image0 - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - dhcpCheckBox 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 @@ -7,17 +7,6 @@ .moc.o .o Makefile* -addconnection.cpp -addconnection.h -interfaceadvanced.cpp -interfaceadvanced.h -interfaceinformation.cpp -interfaceinformation.h -interfacesetup.cpp -interfacesetup.h -mainwindow.cpp -mainwindow.h moc_*.cpp -networksetup -systemadvanced.cpp -systemadvanced.h +ppp.h +ppp.cpp -- cgit v0.9.0.2