[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: kdereview/knetworkconf/knetworkconf
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-05-06 10:50:19
Message-ID: 427B4BEB.1010601 () kde ! org
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hmm
what about 'svn mv kdereview review' ?
(all others were renamed I think)

Cheers,
Mik

Jonathan Riddell a écrit :
> SVN commit 409980 by jriddell:
> 
> Locate icons in standard way
> 
> 
> M  +17 -15    trunk/kdereview/knetworkconf/knetworkconf/knetworkconf.cpp  
> 
> 
> --- trunk/kdereview/knetworkconf/knetworkconf/knetworkconf.cpp #409979:409980
> @@ -15,6 +15,8 @@
> *                                                                         *
> ***************************************************************************/
> 
> +#include <kiconloader.h>
> +
> #include "knetworkconf.h"
> 
> KNetworkConf::KNetworkConf(QWidget *parent, const char *name) : \
> KNetworkConfDlg(parent, name), DCOPObject("KNetworkConfIface") @@ -105,7 +107,7 @@
> item->setPixmap(0,activeWirelessDeviceImg);
> 
> item->setText(3,i18n("Enabled"));
> -          item->setPixmap(3,locate("icon","default.kde/16x16/actions/ok.png"));
> +          item->setPixmap(3,SmallIcon("ok"));
> }
> else
> {
> @@ -115,7 +117,7 @@
> item->setPixmap(0,inactiveWirelessDeviceImg);
> 
> item->setText(3,i18n("Disabled"));
> -          item->setPixmap(3,locate("icon","default.kde/16x16/actions/stop.png"));
> +          item->setPixmap(3,SmallIcon("stop"));
> if (device->getBootProto().lower() == "dhcp")
> item->setText(1,"");
> }
> @@ -268,12 +270,12 @@
> addDlg.exec(); //show window
> 
> if (addDlg.modified())
> -    {      
> +    {
> if(addDlg.rbBootProtoManual->isChecked())
> -      { 
> +      {
> item->setText(2,i18n("Manual"));
> -	dev->setBootProto("none");        
> -      }      
> +	dev->setBootProto("none");
> +      }
> //If the selected boot protocol is dhcp or bootp (Auto), then we don't need the
> //past IP address, netmask, network and broadcast, as a new one will be assigned by
> //the dhcp server.
> @@ -286,13 +288,13 @@
> dev->setNetmask("");
> dev->setNetwork("");
> dev->setBroadcast("");
> -        }            
> +        }
> item->setText(2,addDlg.kcbAutoBootProto->currentText());
> -        dev->setBootProto(addDlg.kcbAutoBootProto->currentText());  
> +        dev->setBootProto(addDlg.kcbAutoBootProto->currentText());
> }
> item->setText(1,addDlg.kleIPAddress->text());
> item->setText(4,advancedOptions->kleDescription->text());
> - 
> +
> if (valuesChanged(dev,
> addDlg.kcbAutoBootProto->currentText(),
> addDlg.kcbNetmask->currentText(),
> @@ -636,10 +638,10 @@
> 
> void KNetworkConf::verifyDeviceStateChanged(){
> KNetworkInterface *dev;
> -  QPixmap activeEthernetDeviceImg(locate("icon","default.kde/22x22/actions/network_connected_lan.png"));
>                 
> -  QPixmap inactiveEthernetDeviceImg(locate("icon","default.kde/22x22/actions/network_disconnected_lan.png"));
>                 
> -  QPixmap activeWirelessDeviceImg(locate("icon","default.kde/22x22/actions/network_traffic_wlan.png"));
>                 
> -  QPixmap inactiveWirelessDeviceImg(locate("icon","default.kde/22x22/actions/network_disconnected_wlan.png"));
>  +  QPixmap activeEthernetDeviceImg(BarIcon("network_connected_lan"));
> +  QPixmap inactiveEthernetDeviceImg(BarIcon("network_disconnected_lan"));
> +  QPixmap activeWirelessDeviceImg(BarIcon("network_traffic_wlan"));
> +  QPixmap inactiveWirelessDeviceImg(BarIcon("network_disconnected_wlan"));
> 
> commandOutput = commandOutput.section('\n',1);
> if (commandErrOutput.length() > 0)
> @@ -664,7 +666,7 @@
> item->setPixmap(0,activeWirelessDeviceImg);
> 
> item->setText(3,i18n("Enabled"));
> -        item->setPixmap(3,locate("icon","default.kde/16x16/actions/ok.png"));
> +        item->setPixmap(3,SmallIcon("ok"));
> //        config->runDetectionScript(netInfo->getPlatformName());
> config->listIfaces(netInfo->getPlatformName());
> //        item->setText(1,dev->getIpAddress());
> @@ -678,7 +680,7 @@
> item->setPixmap(0,inactiveWirelessDeviceImg);
> 
> item->setText(3,i18n("Disabled"));
> -        item->setPixmap(3,locate("icon","default.kde/16x16/actions/stop.png"));
> +        item->setPixmap(3,SmallIcon("stop"));
> if (dev->getBootProto().lower() == "dhcp")
> item->setText(1,"");
> }

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCe0vqyOYzc4nQ8j0RArS/AJ45wbaoIDfqptprsx/VhvedjZDMqQCaAw9T
qTESvg566CkgiddD07FJJCI=
=AyB0
-----END PGP SIGNATURE-----


[prev in list] [next in list] [prev in thread] [next in thread]