[PC-BSD Commits] r3988 - in pcbsd/trunk-current/pcbsd-netmanager: . src/NetworkManager src/NetworkTray src/ethernetconfig src/wificonfig

svn at pcbsd.org svn at pcbsd.org
Wed May 27 13:52:43 PDT 2009


Author: kris
Date: 2009-05-27 13:52:43 -0700 (Wed, 27 May 2009)
New Revision: 3988

Modified:
   pcbsd/trunk-current/pcbsd-netmanager/CMakeLists.txt
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/CMakeLists.txt
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/kcm.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.h
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.ui
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.h
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.ui
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.h
   pcbsd/trunk-current/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/CMakeLists.txt
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.ui
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpapersonal.ui
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.h
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.ui
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiscanssid.cpp
   pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiselectiondialog.ui
Log:

Large update of the pcbsd-netmanager toolset. Now 100% QT3 free code, and builds without warnings. Also improved cmake scripts, and fixed a few formatting bugs in the UI's



Modified: pcbsd/trunk-current/pcbsd-netmanager/CMakeLists.txt
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/CMakeLists.txt	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/CMakeLists.txt	2009-05-27 20:52:43 UTC (rev 3988)
@@ -17,9 +17,7 @@
 include(UseQt4)
 include(MacroLibrary)
 
-SET( QT_USE_QT3SUPPORT TRUE )  
 add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_STL)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
 

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/CMakeLists.txt
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/CMakeLists.txt	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/CMakeLists.txt	2009-05-27 20:52:43 UTC (rev 3988)
@@ -42,7 +42,7 @@
 
 KDE4_ADD_PLUGIN(kcm_pcbsdnetwork ${NMANAGER_SRCS} ${NMANAGER_RC_SRCS} ${NMANAGER_UI_HDRS})
 
-TARGET_LINK_LIBRARIES(kcm_pcbsdnetwork pcbsd ${QT_AND_KDECORE_LIBRARIES} ${KDE4_KIO_LIBS})
+TARGET_LINK_LIBRARIES(kcm_pcbsdnetwork pcbsd ${QT_AND_KDECORE_LIBRARIES} ${QT_LIBRARIES} ${KDE4_KIO_LIBS})
 
 ### INSTALL ###
 

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/kcm.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/kcm.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/kcm.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -22,6 +22,8 @@
 {
   setButtons(KCModule::Apply);
 
+  QGridLayout *layout = new QGridLayout(this);
+
   QString LANG="NetworkManager";
   KGlobal::locale()->insertCatalog(LANG);
 
@@ -29,17 +31,15 @@
 
   netproc = new NetworkMan();
   netproc->Init();
-    if ( ! checkRoot() )
-   {
-       netproc->setNotRoot();	
-    }
+  if ( ! checkRoot() )
+  {
+     netproc->setNotRoot();	
+  }
+
+  layout->addWidget(netproc);
   netproc->setParent(this);
 
-
   connect(netproc, SIGNAL(changed(bool) ), this, SLOT(configChanged() ) );
-
-
-        
    
 }
 

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -10,6 +10,7 @@
 ** destructor.
 *****************************************************************************/
 #include <iostream>
+#include <QFile>
 #include <qtextstream.h>
 #include "networkman.h"
 #include "ui_networkman.h"
@@ -38,11 +39,13 @@
     // Get the username we're running under
     username = QString::fromLocal8Bit(getenv("LOGNAME"));
         
-    connect(listNetDev, SIGNAL(selectionChanged()), this, SLOT(DevSelectionChanged()) );
+    connect(listNetDev, SIGNAL(itemSelectionChanged()), this, SLOT(DevSelectionChanged()) );
     connect(pushConfigure, SIGNAL(clicked()), this, SLOT(PropertiesSlot()) );
     connect(pushAdminConfig, SIGNAL(clicked()), this, SLOT(slotOpenAdminDlg()) );
     connect(checkSysTray, SIGNAL(clicked()), this, SLOT(slotSysTray()) );
-    connect(listNetDev, SIGNAL(doubleClicked( Q3ListBoxItem *) ), this, SLOT(slotDoubleClick(Q3ListBoxItem *) ) );
+    listNetDev->setContextMenuPolicy( Qt::CustomContextMenu );
+    connect(listNetDev, SIGNAL(itemDoubleClicked( QListWidgetItem *) ), this, SLOT(slotDoubleClick(QListWidgetItem *) ) );
+    connect(listNetDev, SIGNAL(customContextMenuRequested( const QPoint &) ), this, SLOT(slotListRightClick(const QPoint &) ) );
          
     
     // Load any global settings
@@ -85,7 +88,7 @@
        }
    }
      textGlobalError->setText("");
-     slotTimerRefresh();
+     refreshDevices();
 }
 
 
@@ -140,7 +143,7 @@
 
 void NetworkMan::DevSelectionChanged()
 {
-    int    sel = listNetDev->currentItem();
+    int    sel = listNetDev->currentRow();
     
     if ( sel != -1 ) {
     
@@ -194,7 +197,7 @@
 bool NetworkMan::checkValue( QString File, QString Key, QString Value )
 {
 QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -225,46 +228,47 @@
 
 void NetworkMan::PropertiesSlot()
 {
+    QString program;
+    QStringList arguments;
     
-    workingDev = listNetDev->currentItem();
+    workingDev = listNetDev->currentRow();
     
     if ( workingDev != -1) {
     
     if ( DevsType[workingDev] == "Wireless" )
     {
-	    ConfigDevice = new Q3Process( this );
-	    // If we are running as root
-	    if ( getuid() != 0 )
-	    {
-		ConfigDevice->addArgument( "kdesu");
-		ConfigDevice->addArgument( "-d");
-		ConfigDevice->addArgument( "--noignorebutton");
-	    }
-	    ConfigDevice->addArgument( "pc-wificonfig");
-	    ConfigDevice->addArgument( Devs[workingDev] );
-    
-	    //connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
-       	   
-	    if ( ConfigDevice->start() ) {
-	    }
+	// If we are running as root
+	if ( getuid() != 0 )
+	{
+          program = "kdesu";
+	  arguments.clear();
+	  arguments << "-d" << "--noignorebutton" << "pc-wificonfig" << Devs[workingDev];
+	 } else {
+          program = "pc-wificonfig";
+	  arguments.clear();
+	  arguments << Devs[workingDev];
+	 }
+
+	 ConfigDevice = new QProcess( this );
+         ConfigDevice->start(program, arguments); 
+
     } else {
    
-    ConfigDevice = new Q3Process( this );
-     // If we are not running as root
-     if ( getuid() != 0 )
-    {
-	ConfigDevice->addArgument( "kdesu");
-	ConfigDevice->addArgument( "-d");
-	ConfigDevice->addArgument( "--noignorebutton");
-    }
-    ConfigDevice->addArgument( "pc-ethernetconfig");
-    ConfigDevice->addArgument( Devs[workingDev] );
-    
-    //connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
-       	   
-     if ( ConfigDevice->start() ) {
-         }
-     
+	// If we are running as root
+	if ( getuid() != 0 )
+	{
+          program = "kdesu";
+	  arguments.clear();
+	  arguments << "-d" << "--noignorebutton" << "pc-ethernetconfig" << Devs[workingDev];
+	 } else {
+          program = "pc-ethernetconfig";
+	  arguments.clear();
+	  arguments << Devs[workingDev];
+	 }
+
+	 ConfigDevice = new QProcess( this );
+         ConfigDevice->start(program, arguments); 
+
    }
     
   }
@@ -287,7 +291,7 @@
      int found = 1;
     
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -353,7 +357,7 @@
     
     // Load the old file, find the oldKey, remove it and replace with newKey
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -427,7 +431,7 @@
     
     // Save the new file
     QFile fileout( File );
-    if ( fileout.open( IO_WriteOnly ) ) {
+    if ( fileout.open( QIODevice::WriteOnly ) ) {
         QTextStream streamout( &fileout );
                     streamout << SavedFile;
         fileout.close();
@@ -543,112 +547,57 @@
 {
     
     int i = 0;
-    int curItem = 0;
-    
-    if ( firstUpdate == 0 ) {
-       listNetDev->clear(); 
-   } else {
-         curItem = listNetDev->currentItem();
-   }
+    listNetDev->clear(); 
     while (! Devs[i].isEmpty() )
     {
 	
-	              DevsIP[i] = getIpForIdent(Devs[i]);
+                DevsIP[i] = getIpForIdent(Devs[i]);
 		DevsStatus[i] = getStatusForIdent(Devs[i]);
 		DevsUp[i] = getUpStatusForIdent(Devs[i]);
 		DevsNetmask[i] = getNetmaskForIdent(Devs[i]);
 		
 		if ( firstUpdate == 0) {
-		DevsMAC[i] = getMacForIdent(Devs[i]);
-		listNetDev->setCurrentItem(0);
-	             }
+		  DevsMAC[i] = getMacForIdent(Devs[i]);
+		  listNetDev->setCurrentRow(0);
+	        }
 
 		if ( DevsType[i] == "Wireless")
 		{
 		    
-		    
 		    // If we are using a Wireless device
 		    if ( DevsStatus[i] == "associated" && DevsUp[i] == "UP" )
 		    {
-		       QImage *Icon = new QImage(KStandardDirs::locate("data", "pc-netmanager/pics/network_wifi.png"));
-		       QPixmap PixmapIcon;
-	                     PixmapIcon.fromImage(Icon->scaled(32,32));
-		       if ( firstUpdate == 0 ) {
-			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
-		       } else {
-			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			   //qDebug("Updating device: " + Devs[i]);
-			   if ( curItem != -1) {
-			      listNetDev->setCurrentItem(curItem);
-		                 }
-		       }
+		       QPixmap PixmapIcon(KStandardDirs::locate("data", "pc-netmanager/pics/network_wifi.png"));
+		       listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		    } else {
-		       QImage *Icon = new QImage(KStandardDirs::locate("data", "pc-netmanager/pics/network_wifi_dis.png"));
-		       QPixmap PixmapIcon;
-	                     PixmapIcon.fromImage(Icon->scaled(32,32));
-		       if ( firstUpdate == 0 ) {
-			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
-		       } else {
-			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			   //qDebug("Updating device: " + Devs[i]);
-			   if ( curItem != -1) {
-			      listNetDev->setCurrentItem(curItem);
-		                 }
-		       }
+		       QPixmap PixmapIcon(KStandardDirs::locate("data", "pc-netmanager/pics/network_wifi_dis.png"));
+		       listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		    }
 	                  
 		    
 		 } else {
 		   // If we are looking at a regular Ethernet device  
 		     
-		      if ( (DevsStatus[i] == "active" || DevsStatus[i] == "") && DevsUp[i] == "UP" )
+		    if ( (DevsStatus[i] == "active" || DevsStatus[i] == "") && DevsUp[i] == "UP" )
 		    {
-		       QImage *Icon = new QImage(KStandardDirs::locate("data", "pc-netmanager/pics/network_local.png"));
-		       QPixmap PixmapIcon;
-	                     PixmapIcon.fromImage(Icon->scaled(32,32));
-		        if ( firstUpdate == 0 ) {
-			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
-		       } else {
-			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			   //qDebug("Updating device: " + Devs[i]);
-			   if ( curItem != -1) {
-			      listNetDev->setCurrentItem(curItem);
-		                 }
-		       }
+		       QPixmap PixmapIcon(KStandardDirs::locate("data", "pc-netmanager/pics/network_local.png"));
+		       listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		    } else {
-		       QImage *Icon = new QImage(KStandardDirs::locate("data", "pc-netmanager/pics/network_local_dis.png"));
-		       QPixmap PixmapIcon;
-	                     PixmapIcon.fromImage(Icon->scaled(32,32));
-		       if ( firstUpdate == 0 ) {
-			   listNetDev->insertItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")" );
-		       } else {
-			   listNetDev->changeItem(PixmapIcon, Devs[i] + " (" +DevsName[i] + ")", i );
-			   //qDebug("Updating device: " + Devs[i]);
-			   if ( curItem != -1) {
-			      listNetDev->setCurrentItem(curItem);
-		                 }
-		       }
+		       QPixmap PixmapIcon(KStandardDirs::locate("data", "pc-netmanager/pics/network_local_dis.png"));
+		       listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		    }
 	                  
 		}
 	
 	i++;
     }
-    
-    // Show the correct device. 
-    if ( firstUpdate == 0)
-    {
-	    DevSelectionChanged();
-    }
-    
-    firstUpdate = 1;
-    QTimer::singleShot( 3000, this, SLOT(refreshDevices()) );
+			   
 }
 
 
 void NetworkMan::slotSysTray()
 {
-    int    sel = listNetDev->currentItem();
+    int    sel = listNetDev->currentRow();
     if ( sel == -1 )
     {
        return;	
@@ -670,17 +619,17 @@
 	
 	    // Save the new file
                  QFile fileout( "/home/" + username + "/.kde4/Autostart/tray-" + Devs[sel] + ".desktop" );
-                 if ( fileout.open( IO_WriteOnly ) ) {
+                 if ( fileout.open( QIODevice::WriteOnly ) ) {
                           QTextStream streamout( &fileout );
-                                streamout << "[Desktop Entry]\nExec=pc-networktray ";
+                                streamout << "[Desktop Entry]\nExec=pc-nettray ";
 		    streamout << Type + " " + Devs[sel] ;
 		    streamout << "\nIcon=network\nStartupNotify=false\nType=Application\n";
                                 fileout.close();
 		    
 		    runCommand("chown " + username + ":" + username + " \"/home/" + username + "/.kde4/Autostart/tray-" + Devs[sel] + ".desktop\"");
-		    //runCommand("su " + username + " -c \"pc-networktray " + Type + " " + Devs[sel] + "\"");
+		    //runCommand("su " + username + " -c \"pc-nettray " + Type + " " + Devs[sel] + "\"");
 		    // Run the command without SU flags
-		   runCommand("pc-networktray " + Type + " " + Devs[sel] + " &");
+		   runCommand("pc-nettray " + Type + " " + Devs[sel] + " &");
 		    
                     }
 	
@@ -692,7 +641,7 @@
 }
 
 
-void NetworkMan::slotDoubleClick( Q3ListBoxItem *item )
+void NetworkMan::slotDoubleClick( QListWidgetItem *item )
 {
     // Start the configuration dialog
     PropertiesSlot();
@@ -728,7 +677,7 @@
 	}
 
 	// Now load the ppp.conf file
-	if ( filein.open( IO_ReadOnly ) ) {
+	if ( filein.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &filein );
         QString line;
         while ( !stream.atEnd() ) {
@@ -792,16 +741,15 @@
 
 void NetworkMan::slotTimerRefresh()
 {
-    QTimer::singleShot( 1000, this, SLOT(refreshDevices()) );
+    QTimer::singleShot( 10000, this, SLOT(refreshDevices()) );
 }
 
 
 
 
-void NetworkMan::slotListRightClick( Q3ListBoxItem *item, const QPoint &pos )
+void NetworkMan::slotListRightClick( const QPoint &pos )
 {
-   
-    int currentItem = listNetDev->currentItem();
+    int currentItem = listNetDev->currentRow();
     if ( currentItem != -1 ) {
 	  popup = new KMenu();
 	  popup->addAction( tr("Configure ") + Devs[currentItem], this, SLOT(PropertiesSlot()));
@@ -826,7 +774,7 @@
 
 void NetworkMan::slotDisableDevice()
 {
-        int currentItem = listNetDev->currentItem();
+        int currentItem = listNetDev->currentRow();
     if ( currentItem != -1 ) {
 	runCommand("ifconfig " + Devs[currentItem] + " down");
     }
@@ -838,7 +786,7 @@
 
 void NetworkMan::slotEnableDevice()
 {
-        int currentItem = listNetDev->currentItem();
+        int currentItem = listNetDev->currentRow();
     if ( currentItem != -1 ) {
 	runCommand("ifconfig " + Devs[currentItem] + " up");		
     }	
@@ -847,47 +795,47 @@
 
 void NetworkMan::slotShowInfoConfig()
 {
- workingDev = listNetDev->currentItem();
+   QString program;
+   QStringList arguments;
+
+   workingDev = listNetDev->currentRow();
     
-    if ( workingDev != -1) {
+   if ( workingDev != -1) {
     
     if ( DevsType[workingDev] == "Wireless" )
     {
-	    ConfigDevice = new Q3Process( this );
-	     // If we not are running as root
-	    if ( getuid() != 0 )
-	    {
-		ConfigDevice->addArgument( "kdesu");
-		ConfigDevice->addArgument( "-d");
-		ConfigDevice->addArgument( "--noignorebutton");
-	    }
-	    ConfigDevice->addArgument( "pc-wificonfig");
-	    ConfigDevice->addArgument( "info");
-	    ConfigDevice->addArgument( Devs[workingDev] );
-    
-	    //connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
-       	   
-	    if ( ConfigDevice->start() ) {
-	    }
+
+	// If we are running as root
+	if ( getuid() != 0 )
+	{
+          program = "kdesu";
+	  arguments.clear();
+	  arguments << "-d" << "--noignorebutton" << "pc-wificonfig" << "info" << Devs[workingDev];
+	 } else {
+          program = "pc-wificonfig";
+	  arguments.clear();
+	  arguments << "info" << Devs[workingDev];
+	 }
+
+	 ConfigDevice = new QProcess( this );
+         ConfigDevice->start(program, arguments); 
+
     } else {
    
-    ConfigDevice = new Q3Process( this );
-     // If we not are running as root
-     if ( getuid() != 0 )
-    {
-	ConfigDevice->addArgument( "kdesu");
-	ConfigDevice->addArgument( "-d");
-	ConfigDevice->addArgument( "--noignorebutton");
-    }
-    ConfigDevice->addArgument( "pc-ethernetconfig");
-    ConfigDevice->addArgument( "info");
-    ConfigDevice->addArgument( Devs[workingDev] );
-    
-    //connect( ConfigDevice, SIGNAL(processExited()), this, SLOT(refreshDevices() ) );
-       	   
-     if ( ConfigDevice->start() ) {
-         }
-     
+	// If we are running as root
+	if ( getuid() != 0 )
+	{
+          program = "kdesu";
+	  arguments.clear();
+	  arguments << "-d" << "--noignorebutton" << "pc-ethernetconfig" << "info" << Devs[workingDev];
+	 } else {
+          program = "pc-ethernetconfig";
+	  arguments.clear();
+	  arguments << "info" << Devs[workingDev];
+	 }
+
+	 ConfigDevice = new QProcess( this );
+         ConfigDevice->start(program, arguments); 
    }
     
   }
@@ -925,18 +873,22 @@
 
 void NetworkMan::slotOpenAdminDlg()
 {
-     ConfigSys = new Q3Process( this );
+     QString program;
+     QStringList arguments;
+
      // If we are running as root
      if ( getuid() != 0 )
      {
-         ConfigSys->addArgument( "kdesu");
-         ConfigSys->addArgument( "-d");
-         ConfigSys->addArgument( "--noignorebutton");
-      }
-      ConfigSys->addArgument( "pc-netadmin" );
-    
-      connect( ConfigSys, SIGNAL(processExited()), this, SLOT(loadGlobals() ) );
-       
-     if ( ConfigSys->start() ) {
+          program = "kdesu";
+	  arguments.clear();
+          arguments << "-d" << "--noignorebutton" << "pc-netadmin";
+     } else {
+          program = "pc-netadmin";
+	  arguments.clear();
      }
+
+     ConfigSys = new QProcess( this );
+     connect( ConfigSys, SIGNAL(processExited()), this, SLOT(loadGlobals() ) );
+     ConfigSys->start(program, arguments); 
+       
 }

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.h
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.h	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.h	2009-05-27 20:52:43 UTC (rev 3988)
@@ -2,7 +2,8 @@
 #define NETMAN_H
 
 #include <qdialog.h>
-#include <Q3ListBoxItem>
+#include <QListWidgetItem>
+#include <QProcess>
 #include <kmenu.h>
 #include "ui_networkman.h"
 #include "restartpopup.h"
@@ -32,11 +33,11 @@
     void refreshDevices();
     void slotSysTray();
     void slotTimerRefresh();
-    void slotListRightClick( Q3ListBoxItem * item, const QPoint &pos );
+    void slotListRightClick( const QPoint &pos );
     void slotDisableDevice();
     void slotEnableDevice();
     void slotShowInfoConfig();
-    void slotDoubleClick( Q3ListBoxItem * item );
+    void slotDoubleClick( QListWidgetItem * item );
     void slotOpenAdminDlg();
     void loadGlobals();
 
@@ -46,17 +47,17 @@
     QString DevsIP[100];
     QString DevsStatus[100];
     QString DevsMAC[100];
-    Q3Process *GetDevList;
+    QProcess *GetDevList;
     int workingDev;
-    Q3Process *GetDevName;
+    QProcess *GetDevName;
     QString DevsName[100];
-    Q3Process *StartDHCP;
-    Q3Process *KillDHClient;
+    QProcess *StartDHCP;
+    QProcess *KillDHClient;
     QString DevsNetmask[100];
     restartPopup *restartDialog;
     QString DevsType[100];
-    Q3Process *ConfigDevice;
-    Q3Process *ConfigSys;
+    QProcess *ConfigDevice;
+    QProcess *ConfigSys;
     QString username;
     int firstUpdate;
     KMenu *popup;

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.ui	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/networkman.ui	2009-05-27 20:52:43 UTC (rev 3988)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>700</width>
-    <height>411</height>
+    <width>654</width>
+    <height>395</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -32,19 +32,11 @@
       <number>0</number>
      </property>
      <widget class="QWidget" name="Widget8" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>666</width>
-        <height>350</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Devices</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3" >
-       <item row="0" column="0" colspan="3" >
+       <item row="0" column="0" colspan="2" >
         <widget class="QLabel" name="textLabel1" >
          <property name="text" >
           <string>Local Network Adapters</string>
@@ -57,61 +49,47 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="4" >
-        <widget class="Q3ListBox" name="listNetDev" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize" >
-          <size>
-           <width>0</width>
-           <height>140</height>
-          </size>
-         </property>
-         <property name="font" >
-          <font>
-           <pointsize>9</pointsize>
-          </font>
-         </property>
-        </widget>
+       <item row="1" column="0" colspan="2" >
+        <widget class="QListWidget" name="listNetDev" />
        </item>
        <item row="2" column="0" colspan="2" >
-        <widget class="QCheckBox" name="checkSysTray" >
-         <property name="text" >
-          <string>Display system tray icon</string>
-         </property>
-        </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_4" >
+         <item>
+          <widget class="QCheckBox" name="checkSysTray" >
+           <property name="text" >
+            <string>Display system tray icon</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="spacer3" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType" >
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>230</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pushConfigure" >
+           <property name="text" >
+            <string>&amp;Configure</string>
+           </property>
+           <property name="shortcut" >
+            <string>Alt+C</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
-       <item row="2" column="2" >
-        <spacer name="spacer3" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>230</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="3" >
-        <widget class="QPushButton" name="pushConfigure" >
-         <property name="text" >
-          <string>&amp;Configure</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+C</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" colspan="4" >
+       <item row="3" column="0" colspan="2" >
         <widget class="Line" name="line1" >
          <property name="frameShape" >
           <enum>QFrame::HLine</enum>
@@ -121,7 +99,7 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="4" >
+       <item row="4" column="0" colspan="2" >
         <widget class="QLabel" name="textLabel2" >
          <property name="text" >
           <string>Device Status</string>
@@ -147,7 +125,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="1" colspan="3" >
+       <item row="5" column="1" >
         <widget class="QLabel" name="textStatus1" >
          <property name="text" >
           <string/>
@@ -170,7 +148,7 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="1" colspan="3" >
+       <item row="6" column="1" >
         <widget class="QLabel" name="textStatus2" >
          <property name="text" >
           <string/>
@@ -193,7 +171,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="1" colspan="3" >
+       <item row="7" column="1" >
         <widget class="QLabel" name="textStatus3" >
          <property name="text" >
           <string/>
@@ -203,7 +181,7 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="4" >
+       <item row="8" column="0" colspan="2" >
         <widget class="Line" name="line1_2" >
          <property name="frameShape" >
           <enum>QFrame::HLine</enum>
@@ -213,7 +191,7 @@
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="4" >
+       <item row="9" column="0" colspan="2" >
         <widget class="QLabel" name="textGlobalError" >
          <property name="text" >
           <string/>
@@ -226,7 +204,7 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0" colspan="4" >
+       <item row="10" column="0" colspan="2" >
         <spacer name="spacer23" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -245,18 +223,10 @@
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>666</width>
-        <height>350</height>
-       </rect>
-      </property>
       <attribute name="title" >
        <string>Network Configuration (Advanced)</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2" >
+      <layout class="QGridLayout" name="gridLayout_4" >
        <item rowspan="2" row="0" column="0" >
         <spacer name="spacer35" >
          <property name="orientation" >
@@ -274,350 +244,197 @@
         </spacer>
        </item>
        <item row="0" column="1" >
-        <layout class="QVBoxLayout" name="verticalLayout_5" >
-         <item>
-          <widget class="QGroupBox" name="groupBox" >
-           <property name="title" >
-            <string>System configuration settings</string>
-           </property>
-           <layout class="QGridLayout" name="gridLayout" >
-            <item row="0" column="0" >
-             <layout class="QHBoxLayout" name="horizontalLayout_2" >
+        <widget class="QGroupBox" name="groupBox_3" >
+         <property name="title" >
+          <string>System configuration settings</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2" >
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" name="horizontalLayout_2" >
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_4" >
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_4" >
-                <item>
-                 <widget class="QLabel" name="textLabel11_2_2" >
-                  <property name="text" >
-                   <string>DNS 1:</string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="wordWrap" >
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="textLabel11_2_3" >
-                  <property name="text" >
-                   <string>DNS 2:</string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="wordWrap" >
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
+               <widget class="QLabel" name="textLabel11_2_2" >
+                <property name="text" >
+                 <string>DNS 1:</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
               </item>
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_3" >
-                <item>
-                 <widget class="QLineEdit" name="lineDNS1" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="inputMask" >
-                   <string>999\.999\.999\.999; </string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignHCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="lineDNS2" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="inputMask" >
-                   <string>999\.999\.999\.999; </string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignHCenter</set>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
+               <widget class="QLabel" name="textLabel11_2_3" >
+                <property name="text" >
+                 <string>DNS 2:</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
               </item>
              </layout>
             </item>
-            <item row="0" column="1" >
-             <layout class="QHBoxLayout" name="horizontalLayout" >
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_3" >
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout_2" >
-                <item>
-                 <widget class="QLabel" name="textLabel11" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text" >
-                   <string>Hostname:</string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="wordWrap" >
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="textLabel11_2" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text" >
-                   <string>Gateway:</string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="wordWrap" >
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="textLabel11_2_4" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text" >
-                   <string>IPv6 gateway:</string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                  </property>
-                  <property name="wordWrap" >
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
+               <widget class="QLineEdit" name="lineDNS1" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="inputMask" >
+                 <string>999\.999\.999\.999; </string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignHCenter</set>
+                </property>
+               </widget>
               </item>
               <item>
-               <layout class="QVBoxLayout" name="verticalLayout" >
-                <item>
-                 <widget class="QLineEdit" name="lineHostname" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="lineGateway" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="inputMask" >
-                   <string>999\.999\.999\.999; </string>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignHCenter</set>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="lineIPv6Gateway" >
-                  <property name="sizePolicy" >
-                   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="inputMask" >
-                   <string/>
-                  </property>
-                  <property name="text" >
-                   <string/>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignHCenter</set>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
+               <widget class="QLineEdit" name="lineDNS2" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="inputMask" >
+                 <string>999\.999\.999\.999; </string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignHCenter</set>
+                </property>
+               </widget>
               </item>
              </layout>
             </item>
            </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="Q3GroupBox" name="groupBoxPPPOE" >
-           <property name="title" >
-            <string>PPPoE configuration</string>
-           </property>
-           <layout class="QGridLayout" >
-            <item row="0" column="0" >
-             <widget class="QLabel" name="textLabel3" >
-              <property name="text" >
-               <string>Username:</string>
-              </property>
-              <property name="alignment" >
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="wordWrap" >
-               <bool>false</bool>
-              </property>
-             </widget>
+          </item>
+          <item row="0" column="1" >
+           <layout class="QHBoxLayout" name="horizontalLayout" >
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_2" >
+              <item>
+               <widget class="QLabel" name="textLabel11" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text" >
+                 <string>Hostname:</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="textLabel11_2" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text" >
+                 <string>Gateway:</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="textLabel11_2_4" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text" >
+                 <string>IPv6 gateway:</string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+                <property name="wordWrap" >
+                 <bool>false</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
-            <item row="1" column="0" >
-             <widget class="QLabel" name="textLabel4" >
-              <property name="text" >
-               <string>Password:</string>
-              </property>
-              <property name="alignment" >
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="wordWrap" >
-               <bool>false</bool>
-              </property>
-             </widget>
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout" >
+              <item>
+               <widget class="QLineEdit" name="lineHostname" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="lineGateway" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="inputMask" >
+                 <string>999\.999\.999\.999; </string>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignHCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="lineIPv6Gateway" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="inputMask" >
+                 <string/>
+                </property>
+                <property name="text" >
+                 <string/>
+                </property>
+                <property name="alignment" >
+                 <set>Qt::AlignHCenter</set>
+                </property>
+               </widget>
+              </item>
+             </layout>
             </item>
-            <item row="2" column="3" colspan="3" >
-             <widget class="QCheckBox" name="checkPPPNat" >
-              <property name="text" >
-               <string>Internet Connection Sharing</string>
-              </property>
-              <property name="shortcut" >
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="3" colspan="3" >
-             <widget class="QCheckBox" name="checkPPPAlwaysOn" >
-              <property name="text" >
-               <string>Alwa&amp;ys on connection</string>
-              </property>
-              <property name="shortcut" >
-               <string>Alt+Y</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="5" >
-             <spacer name="spacer31" >
-              <property name="orientation" >
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType" >
-               <enum>QSizePolicy::Expanding</enum>
-              </property>
-              <property name="sizeHint" stdset="0" >
-               <size>
-                <width>16</width>
-                <height>21</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item row="0" column="4" >
-             <widget class="QLabel" name="textLabel1_3" >
-              <property name="text" >
-               <string>PPPoE Device</string>
-              </property>
-              <property name="wordWrap" >
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="3" >
-             <widget class="QComboBox" name="comboPPPOEDev" />
-            </item>
-            <item rowspan="3" row="0" column="2" >
-             <spacer name="spacer32" >
-              <property name="orientation" >
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeType" >
-               <enum>QSizePolicy::Fixed</enum>
-              </property>
-              <property name="sizeHint" stdset="0" >
-               <size>
-                <width>16</width>
-                <height>80</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item row="2" column="1" >
-             <widget class="QLineEdit" name="linePPPService" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="echoMode" >
-               <enum>QLineEdit::Normal</enum>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1" >
-             <widget class="QLineEdit" name="linePPPPassword" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="echoMode" >
-               <enum>QLineEdit::Password</enum>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1" >
-             <widget class="QLineEdit" name="linePPPUsername" >
-              <property name="sizePolicy" >
-               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0" >
-             <widget class="QLabel" name="textLabel4_2" >
-              <property name="text" >
-               <string>Service name (optional):</string>
-              </property>
-              <property name="alignment" >
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="wordWrap" >
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
            </layout>
-          </widget>
-         </item>
-        </layout>
+          </item>
+         </layout>
+        </widget>
        </item>
        <item rowspan="2" row="0" column="2" >
         <spacer name="spacer34" >
@@ -636,6 +453,155 @@
         </spacer>
        </item>
        <item row="1" column="1" >
+        <widget class="QGroupBox" name="groupBox_2" >
+         <property name="title" >
+          <string>PPPoE configuration</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_9" >
+          <item rowspan="2" row="0" column="0" >
+           <spacer name="spacer32" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>13</width>
+              <height>77</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLabel" name="textLabel3" >
+            <property name="text" >
+             <string>Username:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <widget class="QLineEdit" name="linePPPUsername" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3" >
+           <widget class="QComboBox" name="comboPPPOEDev" />
+          </item>
+          <item row="0" column="4" >
+           <widget class="QLabel" name="textLabel1_3" >
+            <property name="text" >
+             <string>PPPoE Device</string>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="5" >
+           <spacer name="spacer31" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>26</width>
+              <height>24</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLabel" name="textLabel4" >
+            <property name="text" >
+             <string>Password:</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2" >
+           <widget class="QLineEdit" name="linePPPPassword" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="echoMode" >
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3" colspan="3" >
+           <widget class="QCheckBox" name="checkPPPAlwaysOn" >
+            <property name="text" >
+             <string>Alwa&amp;ys on connection</string>
+            </property>
+            <property name="shortcut" >
+             <string>Alt+Y</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2" >
+           <widget class="QLabel" name="textLabel4_2" >
+            <property name="text" >
+             <string>Service name (optional):</string>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2" >
+           <widget class="QLineEdit" name="linePPPService" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="echoMode" >
+             <enum>QLineEdit::Normal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3" colspan="3" >
+           <widget class="QCheckBox" name="checkPPPNat" >
+            <property name="text" >
+             <string>Internet Connection Sharing</string>
+            </property>
+            <property name="shortcut" >
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="1" >
         <layout class="QHBoxLayout" name="horizontalLayout_3" >
          <item>
           <spacer name="horizontalSpacer" >
@@ -672,7 +638,7 @@
          </item>
         </layout>
        </item>
-       <item row="2" column="1" colspan="2" >
+       <item row="3" column="0" colspan="3" >
         <spacer name="spacer33" >
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
@@ -695,32 +661,11 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <customwidgets>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3ListBox</class>
-   <extends>Q3Frame</extends>
-   <header>q3listbox.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
-  <tabstop>listNetDev</tabstop>
   <tabstop>checkSysTray</tabstop>
   <tabstop>pushConfigure</tabstop>
-  <tabstop>linePPPUsername</tabstop>
-  <tabstop>linePPPPassword</tabstop>
-  <tabstop>linePPPService</tabstop>
-  <tabstop>comboPPPOEDev</tabstop>
-  <tabstop>checkPPPAlwaysOn</tabstop>
-  <tabstop>checkPPPNat</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >q3process.h</include>
   <include location="local" >qmessagebox.h</include>
   <include location="local" >qtimer.h</include>
   <include location="local" >restartpopup.h</include>
@@ -735,70 +680,5 @@
  <resources>
   <include location="NetworkManager.qrc" />
  </resources>
- <connections>
-  <connection>
-   <sender>checkPPPAlwaysOn</sender>
-   <signal>clicked()</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotPPPOEChanged()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkPPPNat</sender>
-   <signal>clicked()</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotPPPOEChanged()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>listNetDev</sender>
-   <signal>rightButtonClicked(Q3ListBoxItem*,QPoint)</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotListRightClick(Q3ListBoxItem*,QPoint)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>comboPPPOEDev</sender>
-   <signal>highlighted(QString)</signal>
-   <receiver>NetworkMan</receiver>
-   <slot>slotCheckGlobalText()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -19,26 +19,16 @@
    QTimer::singleShot( 500, this, SLOT(restart()) );
 }
 
-
-
 void restartPopup::restart()
 {
-        restartNet = new Q3Process( this );
-        restartNet->addArgument( "/etc/rc.d/netif" );
-        restartNet->addArgument( "restart" );	
-     
-        connect( restartNet, SIGNAL(processExited()), this, SLOT(slotClose() ) );	   
-         if ( !restartNet->start() ) {
-	      
-         }
-       
+   QString program = "/etc/rc.d/netif";     
+   QStringList arguments;
+   arguments << "restart";
+   restartNet = new QProcess( this );
+   restartNet->start(program, arguments);  
+   connect( restartNet, SIGNAL(processExited()), this, SLOT(slotClose() ) );	   
 }
 
-
-
-
-
-
 void restartPopup::slotClose()
 {
     close();

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.h
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.h	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.h	2009-05-27 20:52:43 UTC (rev 3988)
@@ -2,6 +2,7 @@
 #define RESTARTPOP_H
 
 #include <qdialog.h>
+#include <QProcess>
 #include "ui_restartpopup.h"
 
 class restartPopup : public QDialog, private Ui::restartPopup
@@ -23,7 +24,7 @@
     void slotClose();
 
 private:
-   Q3Process *restartNet;
+   QProcess *restartNet;
 
 signals:
 

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.ui
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.ui	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkManager/restartpopup.ui	2009-05-27 20:52:43 UTC (rev 3988)
@@ -41,7 +41,6 @@
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <includes>
-  <include location="local" >q3process.h</include>
  </includes>
  <resources>
   <include location="NetworkManager.qrc" />

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -1,5 +1,4 @@
 
-
 /* Qt */
 #include <qtimer.h>
 #include <QProcess>
@@ -113,7 +112,7 @@
      	  QString ProfileName = "internet";
           
 	  // Now load the ppp.conf file
-	  if ( filein.open( IO_ReadOnly ) ) {
+	  if ( filein.open( QIODevice::ReadOnly ) ) {
           QTextStream stream( &filein );
           QString line;
           while ( !stream.atEnd() ) {
@@ -348,14 +347,14 @@
            QString program = "kdesu";
            QStringList arguments;
            arguments << "--noignorebutton" << "-d" << "pc-ethernetconfig " + DeviceName;
-	   QProcess process;
-   	   process.start(program, arguments);
+	   QProcess *runCommandProc = new QProcess(this);
+           runCommandProc->start(program, arguments);
 	} else {
 	   QString program = "kdesu";
            QStringList arguments;
            arguments << "--noignorebutton" << "-d" << "pc-wificonfig " + DeviceName;
-           QProcess process;
-           process.start(program, arguments);
+	   QProcess *runCommandProc = new QProcess(this);
+           runCommandProc->start(program, arguments);
 	}
 
 }
@@ -365,7 +364,7 @@
 
    QString  tooltipStr;
 
-   tooltipStr = QString(tr("Device Name: /dev/%s", DeviceName.toLatin1()));
+   tooltipStr = QString(tr("Device Name:") + " /dev/" + DeviceName);
 
    tooltipStr += "<br>" + DeviceIdent +"<hr>";
 
@@ -644,8 +643,8 @@
     QString program = "kdesu";
     QStringList arguments;
     arguments << "--noignorebutton" << "-d" << "/etc/rc.d/netif restart ; /etc/rc.d/routing restart ; /etc/rc.d/ppp restart";
-    QProcess process;
-    process.start(program, arguments);
+    QProcess *runCommandProc = new QProcess(this);
+    runCommandProc->start(program, arguments);
 }
 
 void NetworkTray::slotEnablePPPOE() {
@@ -653,23 +652,23 @@
     QString program = "kdesu";
     QStringList arguments;
     arguments << "--noignorebutton" << "-d" << "ppp -background " + ProfileName;
-    QProcess process;
-    process.start(program, arguments);
+    QProcess *runCommandProc = new QProcess(this);
+    runCommandProc->start(program, arguments);
 }
 void NetworkTray::slotDisablePPPOE() {
     QString program = "kdesu";
     QStringList arguments;
     arguments << "--noignorebutton" << "-d" << "kilalll ppp";
-    QProcess process;
-    process.start(program, arguments);
+    QProcess *runCommandProc = new QProcess(this);
+    runCommandProc->start(program, arguments);
 }
 
 void NetworkTray::openNetManager() {
     QString program = "kcmshell4";
     QStringList arguments;
-    arguments << "pcbsdnetwork";
-    QProcess process;
-    process.start(program, arguments);
+    arguments << "pcnetwork";
+    QProcess *runCommandProc = new QProcess(this);
+    runCommandProc->start(program, arguments);
 }
 
 QString NetworkTray::getValue( QString File, QString Key, int occur ) {
@@ -677,7 +676,7 @@
 int found = 1;
     
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -730,8 +729,8 @@
 	} else {
            arguments << "--noignorebutton" << "-d" << "pc-wificonfig info " + DeviceName;
 	}
-        QProcess process;
-        process.start(program, arguments);
+        QProcess *runCommandProc = new QProcess(this);
+        runCommandProc->start(program, arguments);
 
 }
 

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.h
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.h	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/NetworkTray/NetworkTray.h	2009-05-27 20:52:43 UTC (rev 3988)
@@ -1,5 +1,8 @@
+// QT Includes
+#include <qpair.h>
+#include <QProcess>
 
-#include <qpair.h>
+// KDE Includes
 #include <ksystemtrayicon.h>
 
 
@@ -45,5 +48,6 @@
    QString getMediaForIdent( QString ident );
    QString getIPv6ForIdent( QString ident );
    QString getGatewayForIdent( QString ident );
+   QProcess *runCommandProc;
 
 };

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/ethernetconfig/ethernetconfig.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -242,7 +242,7 @@
     
     // Load the old file, find the oldKey, remove it and replace with newKey
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -316,7 +316,7 @@
     
     // Save the new file
     QFile fileout( File );
-    if ( fileout.open( IO_WriteOnly ) ) {
+    if ( fileout.open( QIODevice::WriteOnly ) ) {
         QTextStream streamout( &fileout );
                     streamout << SavedFile;
         fileout.close();
@@ -354,7 +354,7 @@
 int found = 1;
     
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -674,10 +674,17 @@
 	QString status = "";
 	
 	if (inputLine != "" && inputLine.indexOf("media:") != -1){
-		
 		status = inputLine.remove(0, inputLine.indexOf("media:") + 7);
 		status.truncate(inputLine.indexOf("\n") );
-	
+                if ( status.indexOf("(") != -1)
+                {
+                   status.remove(0, status.indexOf("(") + 1);
+                }
+                if ( status.indexOf(")") != -1)
+                {
+                   status.truncate(status.indexOf(")"));
+                }
+
 	}
 	
 	return status;

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/CMakeLists.txt
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/CMakeLists.txt	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/CMakeLists.txt	2009-05-27 20:52:43 UTC (rev 3988)
@@ -35,7 +35,6 @@
 
 # enable warnings
 ADD_DEFINITIONS( -Wall )
-SET( QT_USE_QT3SUPPORT TRUE ) 
 
 # this command will generate rules that will run rcc on all files from SAMPLE_RCS
 # in result SAMPLE_RC_SRCS variable will contain paths to files produced by rcc

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -80,12 +80,10 @@
 
 void dialogWPAEnterprise::slotSelectCACert()
 {
-        QString file = QFileDialog::getOpenFileName(
+        QString file = QFileDialog::getOpenFileName( 0, 
+                    "Choose a Certificate file",
                     "/home",
-                    "Certificate File (*.pem)",
-                    this,
-                    "open file dialog",
-                    "Choose a Certificate file" );
+                    "Certificate File (*.pem)" );
 	
 	lineCACert->setText(file);
 	
@@ -94,12 +92,10 @@
 
 void dialogWPAEnterprise::slotSelectClientCert()
 {
-       QString file = QFileDialog::getOpenFileName(
+       QString file = QFileDialog::getOpenFileName( 0,
+                    "Choose a client certificate file",
                     "/home",
-                    "Certificate File (*.pem)",
-                    this,
-                    "open file dialog",
-                    "Choose a client certificate file" );
+                    "Certificate File (*.pem)" );
 	
 	lineClientCert->setText(file);
 }
@@ -107,12 +103,10 @@
 
 void dialogWPAEnterprise::slotSelectPrivateKeyFile()
 {
-       QString file = QFileDialog::getOpenFileName(
+       QString file = QFileDialog::getOpenFileName( 0,
+                    "Choose a private key file",
                     "/home",
-                    "Certificate File (*.pem)",
-                    this,
-                    "open file dialog",
-                    "Choose a private key file" );
+                    "Certificate File (*.pem)");
 	
 	linePrivateKeyFile->setText(file);
 }

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.ui
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.ui	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpaenterprise.ui	2009-05-27 20:52:43 UTC (rev 3988)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>424</width>
-    <height>378</height>
+    <width>331</width>
+    <height>344</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -16,35 +16,9 @@
    <iconset resource="wificonfig.qrc" >
     <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
   </property>
-  <layout class="QGridLayout" >
-   <item row="1" column="0" >
-    <spacer name="spacer8" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>261</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="pushClose" >
-     <property name="text" >
-      <string>&amp;Close</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+C</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2" >
-    <widget class="Q3ButtonGroup" name="buttonGroup2" >
+  <layout class="QGridLayout" name="gridLayout_2" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>WPA Enterprise Configuration</string>
      </property>
@@ -231,22 +205,56 @@
         </property>
        </widget>
       </item>
+      <item row="9" column="0" colspan="2" >
+       <spacer name="verticalSpacer" >
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="spacer8" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>261</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushClose" >
+       <property name="text" >
+        <string>&amp;Close</string>
+       </property>
+       <property name="shortcut" >
+        <string>Alt+C</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <customwidgets>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <includes>
-  <include location="local" >q3filedialog.h</include>
   <include location="local" >qmessagebox.h</include>
  </includes>
  <resources>

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpapersonal.ui
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpapersonal.ui	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/dialogwpapersonal.ui	2009-05-27 20:52:43 UTC (rev 3988)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>319</width>
-    <height>174</height>
+    <width>311</width>
+    <height>168</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -17,17 +17,11 @@
     <normaloff>:/tray_wifi85.png</normaloff>:/tray_wifi85.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_2" >
-   <item row="0" column="0" colspan="2" >
-    <widget class="Q3GroupBox" name="groupBox3" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Wireless Network Key</string>
+      <string>WPA Personal Configuration</string>
      </property>
-     <property name="frameShape" >
-      <enum>Q3GroupBox::GroupBoxPanel</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>Q3GroupBox::Sunken</enum>
-     </property>
      <layout class="QGridLayout" name="gridLayout" >
       <item row="0" column="0" >
        <widget class="QLabel" name="textLabel1" >
@@ -86,43 +80,38 @@
     </widget>
    </item>
    <item row="1" column="0" >
-    <spacer name="spacer12" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>191</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="spacer12" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>191</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushClose" >
+       <property name="text" >
+        <string>&amp;Close</string>
+       </property>
+       <property name="shortcut" >
+        <string>Alt+C</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="pushClose" >
-     <property name="text" >
-      <string>&amp;Close</string>
-     </property>
-     <property name="shortcut" >
-      <string>Alt+C</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <includes>
   <include location="local" >qmessagebox.h</include>
  </includes>

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -11,6 +11,7 @@
 *****************************************************************************/
 #include "wificonfigwidgetbase.h"
 #include "ui_wificonfigwidgetbase.h"
+#include <QFile>
 #include <qtextstream.h>
 #include <unistd.h>
 
@@ -78,7 +79,7 @@
 	
     // Now create the wpa_supplicant file based on saved configuration
     QFile fileout( "/etc/wpa_supplicant.conf" );
-    if ( fileout.open( IO_WriteOnly ) ) {
+    if ( fileout.open( QIODevice::WriteOnly ) ) {
        QTextStream streamout( &fileout );
 
        // Loop through all the devices we have now
@@ -155,7 +156,7 @@
     
    // Now restart the network for new settings to take effect
    QFile filerestart( "/tmp/.netrestart.sh" );
-   if ( filerestart.open( IO_WriteOnly ) ) {
+   if ( filerestart.open( QIODevice::WriteOnly ) ) {
 	QTextStream streamrestart( &filerestart );
 	streamrestart << "#!/bin/sh\n";
 	streamrestart << "/etc/rc.d/netif restart " << DeviceName << "\n";
@@ -266,7 +267,7 @@
     
     // Load the old file, find the oldKey, remove it and replace with newKey
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -340,7 +341,7 @@
     
     // Save the new file
     QFile fileout( File );
-    if ( fileout.open( IO_WriteOnly ) ) {
+    if ( fileout.open( QIODevice::WriteOnly ) ) {
         QTextStream streamout( &fileout );
                     streamout << SavedFile;
         fileout.close();
@@ -354,7 +355,7 @@
 int found = 1;
     
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         QString line;
         while ( !stream.atEnd() ) {
@@ -1045,7 +1046,7 @@
    
    // Look for the wpa_supplicant.conf file
    QFile file( "/etc/wpa_supplicant.conf" );
-   if ( file.open( IO_ReadOnly ) ) {
+   if ( file.open( QIODevice::ReadOnly ) ) {
       int curItem=0;
       QTextStream stream( &file );
       QString line;
@@ -1285,7 +1286,14 @@
 		
 		status = inputLine.remove(0, inputLine.indexOf("media:") + 7);
 		status.truncate(inputLine.indexOf("\n") );
-	
+                if ( status.indexOf("(") != -1)
+                {
+                   status.remove(0, status.indexOf("(") + 1);
+                }	
+                if ( status.indexOf(")") != -1)
+                {
+                   status.truncate(status.indexOf(")"));
+                }	
 	}
 	
 	return status;

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.h
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.h	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.h	2009-05-27 20:52:43 UTC (rev 3988)
@@ -12,7 +12,7 @@
 #include "dialogwpapersonal.h"
 #include "dialogwpaenterprise.h"
 #include "ui_wificonfigwidgetbase.h"
-#include <Q3Process>
+#include <QProcess>
 
 
 // Setup our encryption type defines
@@ -78,7 +78,7 @@
     QString getMediaForIdent( QString ident );
     QString DeviceName;
     wifiselectiondialog *wifiselect;
-    Q3Process *netifProc;
+    QProcess *netifProc;
 
     // Lets define our arrays for the SSID profiles
     QString SSIDList[150];

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.ui
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.ui	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wificonfigwidgetbase.ui	2009-05-27 20:52:43 UTC (rev 3988)
@@ -765,7 +765,6 @@
   <include location="local" >dialogwpaenterprise.h</include>
   <include location="local" >qdesktopwidget.h</include>
   <include location="local" >qapplication.h</include>
-  <include location="local" >q3process.h</include>
   <include location="global" >pcbsd-netif.h</include>
   <include location="global" >pcbsd-utils.h</include>
  </includes>

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiscanssid.cpp
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiscanssid.cpp	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiscanssid.cpp	2009-05-27 20:52:43 UTC (rev 3988)
@@ -36,7 +36,7 @@
 
     // Now read the output file
     QFile file( "/tmp/.wifilist" );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
         while ( !stream.atEnd() ) {
                  line = stream.readLine(); // line of text excluding '\n'

Modified: pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiselectiondialog.ui
===================================================================
--- pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiselectiondialog.ui	2009-05-27 16:47:41 UTC (rev 3987)
+++ pcbsd/trunk-current/pcbsd-netmanager/src/wificonfig/wifiselectiondialog.ui	2009-05-27 20:52:43 UTC (rev 3988)
@@ -191,7 +191,6 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <includes>
   <include location="local" >qtimer.h</include>
   <include location="local" >qfile.h</include>



More information about the Commits mailing list