[PC-BSD Commits] r7266 - in pcbsd/current: . src-qt4 src-qt4/pc-netmanager src-qt4/pc-netmanager/src/NetworkManager

svn at pcbsd.org svn at pcbsd.org
Fri Jul 23 11:02:29 PDT 2010


Author: kris
Date: 2010-07-23 11:02:29 -0700 (Fri, 23 Jul 2010)
New Revision: 7266

Added:
   pcbsd/current/src-qt4/pc-netmanager/
   pcbsd/current/src-qt4/pc-netmanager/pc-netmanager.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/main.cpp
Removed:
   pcbsd/current/pcbsd-netmanager/
   pcbsd/current/src-qt4/pc-netmanager/pcbsdnetmanager.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/kcm.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/kcm.h
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/restartpopup.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/restartpopup.h
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/restartpopup.ui
Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.h
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.ui
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/pcnetwork.desktop
Log:

Moved pcbsd-netmanager -> src-qt4/pc-netmanager

Updated pc-netmanager to not use any KDE4 libs, qt4 only



Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro
===================================================================
--- pcbsd/current/pcbsd-netmanager/src/NetworkManager/NetworkManager.pro	2010-07-23 07:04:54 UTC (rev 7257)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/NetworkManager.pro	2010-07-23 18:02:29 UTC (rev 7266)
@@ -1,25 +1,20 @@
-TEMPLATE	= lib
+TEMPLATE	= app
 LANGUAGE	= C++
 
-CONFIG	+= qt warn_on debug release
+CONFIG	+= qt warn_on release
 
-LIBS	+= -L/usr/local/kde4/lib -L/usr/local/lib -lkdecore -lkio -lkdeui -lpcbsd -Ikdelibs
+LIBS	+= -lpcbsd
 
-INCLUDEPATH	+= /usr/PCBSD/includes /usr/local/include /usr/local/kde4/include
+HEADERS	+= networkman.h
 
-HEADERS	+= kcm.h networkman.h restartpopup.h 
+SOURCES	+= main.cpp networkman.cpp
 
-SOURCES	+= kcm.cpp networkman.cpp restartpopup.cpp
+FORMS	= networkman.ui
 
-FORMS	= networkman.ui \
-	  restartpopup.ui
-
 RESOURCES += NetworkManager.qrc 
 
-TARGET  = kcm_pcbsdnetwork
+TARGET  = /usr/local/bin/pc-netmanager
 
-target.path = /usr/local/kde4/lib/kde4/
-
 TRANSLATIONS =  i18n/NetworkManager_af.ts \
 		i18n/NetworkManager_ar.ts \
 		i18n/NetworkManager_az.ts \
@@ -84,12 +79,10 @@
 		i18n/NetworkManager_zh_TW.ts \
 		i18n/NetworkManager_zu.ts
 
-desktop.path=/usr/local/kde4/share/kde4/services/
+desktop.path=/usr/local/share/applications/
 desktop.files=pcnetwork.desktop
 
-dotrans.path=/usr/local/kde4/share/apps/pcbsd/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/kde4/share/apps/pcbsd/i18n/
+dotrans.path=/usr/local/share/apps/pcbsd/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
 
 INSTALLS+= desktop dotrans target
-
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/current/pcbsd-netmanager/src/NetworkManager/networkman.cpp	2010-07-23 07:04:54 UTC (rev 7257)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-07-23 18:02:29 UTC (rev 7266)
@@ -15,10 +15,10 @@
 #include <qtextstream.h>
 #include "networkman.h"
 #include "ui_networkman.h"
-#include <kstandarddirs.h>
 #include <pcbsd-netif.h>
 #include <pcbsd-utils.h>
 #include <qstring.h>
+#include <QMenu>
 
 // Set our max number of wlan[0-9] devices we'll support
 #define MAX_WLAN_DEVICES 10
@@ -692,10 +692,6 @@
 void NetworkMan::restartNetwork()
 {
     
-   //restartDialog= new restartPopup(this);
-   //restartDialog->init();
-   //restartDialog->exec();
-   
     //Set the hostname
     runCommand("hostname " + lineHostname->text());
 
@@ -737,12 +733,12 @@
 		if ( DevsType[i] == "Wireless")
 		{
 		    
-		    QPixmap PixmapIcon(KStandardDirs::locate("data", "pc-netmanager/pics/network_wifi.png"));
+		    QPixmap PixmapIcon("/usr/local/share/pc-netmanager/pics/network_wifi.png");
 		    listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		    
 		 } else {
 		    // If we are looking at a regular Ethernet device  
-		    QPixmap PixmapIcon(KStandardDirs::locate("data", "pc-netmanager/pics/network_local.png"));
+		    QPixmap PixmapIcon("/usr/local/share/pc-netmanager/pics/network_local.png");
 		    listNetDev->addItem(new QListWidgetItem(PixmapIcon.scaled(32,32), Devs[i] + " (" +DevsName[i] + ")") );
 		}
 	
@@ -902,7 +898,7 @@
 {
     int currentItem = listNetDev->currentRow();
     if ( currentItem != -1 ) {
-	  popup = new KMenu();
+	  popup = new QMenu();
 	  popup->addAction( tr("Configure ") + Devs[currentItem], this, SLOT(PropertiesSlot()));
 	  popup->addAction( tr("Device Information"), this, SLOT(slotShowInfoConfig()));
 	  // If we are running as root

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.h
===================================================================
--- pcbsd/current/pcbsd-netmanager/src/NetworkManager/networkman.h	2010-07-23 07:04:54 UTC (rev 7257)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.h	2010-07-23 18:02:29 UTC (rev 7266)
@@ -4,9 +4,7 @@
 #include <qdialog.h>
 #include <QListWidgetItem>
 #include <QProcess>
-#include <kmenu.h>
 #include "ui_networkman.h"
-#include "restartpopup.h"
 #include <pcbsd-netif.h>
 #include <pcbsd-utils.h>
 
@@ -55,13 +53,12 @@
     QProcess *StartDHCP;
     QProcess *KillDHClient;
     QString DevsNetmask[100];
-    restartPopup *restartDialog;
     QString DevsType[100];
     QProcess *ConfigDevice;
     QProcess *ConfigSys;
     QString username;
     int firstUpdate;
-    KMenu *popup;
+    QMenu *popup;
     QString DevsUp[100];
     bool Changed;
     QColor colourWhite;

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.ui
===================================================================
--- pcbsd/current/pcbsd-netmanager/src/NetworkManager/networkman.ui	2010-07-23 07:04:54 UTC (rev 7257)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.ui	2010-07-23 18:02:29 UTC (rev 7266)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>654</width>
+    <width>658</width>
     <height>400</height>
    </rect>
   </property>
@@ -683,11 +683,6 @@
  <includes>
   <include location="local">qmessagebox.h</include>
   <include location="local">qtimer.h</include>
-  <include location="local">restartpopup.h</include>
-  <include location="local">klocale.h</include>
-  <include location="local">kglobal.h</include>
-  <include location="local">kcmodule.h</include>
-  <include location="local">kaboutdata.h</include>
   <include location="global">qregexp.h</include>
   <include location="global">pcbsd-netif.h</include>
   <include location="global">pcbsd-utils.h</include>

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/pcnetwork.desktop
===================================================================
--- pcbsd/current/pcbsd-netmanager/src/NetworkManager/pcnetwork.desktop	2010-07-23 07:04:54 UTC (rev 7257)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/pcnetwork.desktop	2010-07-23 18:02:29 UTC (rev 7266)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell4 pcnetwork
+Exec=pc-network
 Icon=network-wired
 Type=Service
 ServiceTypes=KCModule



More information about the Commits mailing list