[PC-BSD Commits] r7283 - in pcbsd/current/src-qt4: pc-netmanager/src/NetworkManager pc-netmanager/src/NetworkTray pc-pfmanager pc-servicemanager pc-sysmanager pc-systemupdatertray pc-usermanager

svn at pcbsd.org svn at pcbsd.org
Sun Jul 25 08:10:46 PDT 2010


Author: kris
Date: 2010-07-25 08:10:46 -0700 (Sun, 25 Jul 2010)
New Revision: 7283

Added:
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.desktop
Removed:
   pcbsd/current/src-qt4/pc-sysmanager/pcbsdsystem.desktop
Modified:
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
   pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp
   pcbsd/current/src-qt4/pc-pfmanager/pfmanager.desktop
   pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.desktop
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
   pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
   pcbsd/current/src-qt4/pc-usermanager/pcusermanager.desktop
Log:

Updated all internal references from "kdesu" -> "pc-su"



Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp	2010-07-25 15:10:46 UTC (rev 7283)
@@ -132,7 +132,7 @@
                     }
 
                     // Create our script to setup the child wlan device
-                    system("kdesu -d sh " + tmpfile.fileName().toLatin1());
+                    system("pc-su -d sh " + tmpfile.fileName().toLatin1());
       
                     // re-start the device detection process
                     QTimer::singleShot(100,  this,  SLOT(detectDev()));
@@ -407,7 +407,7 @@
 	// If we are running as root
 	if ( getuid() != 0 )
 	{
-          program = "kdesu";
+          program = "pc-su";
 	  arguments.clear();
 	  arguments << "-d" << "--noignorebutton" << "pc-wificonfig" << Devs[workingDev];
 	 } else {
@@ -424,7 +424,7 @@
 	// If we are running as root
 	if ( getuid() != 0 )
 	{
-          program = "kdesu";
+          program = "pc-su";
 	  arguments.clear();
 	  arguments << "-d" << "--noignorebutton" << "pc-ethernetconfig" << Devs[workingDev];
 	 } else {
@@ -955,7 +955,7 @@
 	// If we are running as root
 	if ( getuid() != 0 )
 	{
-          program = "kdesu";
+          program = "pc-su";
 	  arguments.clear();
 	  arguments << "-d" << "--noignorebutton" << "pc-wificonfig" << "info" << Devs[workingDev];
 	 } else {
@@ -972,7 +972,7 @@
 	// If we are running as root
 	if ( getuid() != 0 )
 	{
-          program = "kdesu";
+          program = "pc-su";
 	  arguments.clear();
 	  arguments << "-d" << "--noignorebutton" << "pc-ethernetconfig" << "info" << Devs[workingDev];
 	 } else {
@@ -1025,7 +1025,7 @@
      // If we are running as root
      if ( getuid() != 0 )
      {
-          program = "kdesu";
+          program = "pc-su";
 	  arguments.clear();
           arguments << "-d" << "--noignorebutton" << "pc-netadmin";
      } else {

Modified: pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-netmanager/src/NetworkTray/NetworkTray.cpp	2010-07-25 15:10:46 UTC (rev 7283)
@@ -314,13 +314,13 @@
 
   if ( DeviceType == "Ethernet" )
   {
-    QString program = "kdesu";
+    QString program = "pc-su";
     QStringList arguments;
     arguments << "--noignorebutton" << "-d" << "pc-ethernetconfig " + DeviceName;
     QProcess *runCommandProc = new QProcess(this);
     runCommandProc->start(program, arguments);
   } else {
-    QString program = "kdesu";
+    QString program = "pc-su";
     QStringList arguments;
     arguments << "--noignorebutton" << "-d" << "pc-wificonfig " + DeviceName;
     QProcess *runCommandProc = new QProcess(this);
@@ -506,7 +506,7 @@
 
 // If the user wants to restart the network, do so
 void NetworkTray::slotRestartNetwork() {
-  QString program = "kdesu";
+  QString program = "pc-su";
   QStringList arguments;
   arguments << "--noignorebutton" << "-d" << "/etc/rc.d/netif restart ; /etc/rc.d/routing restart ; /etc/rc.d/ppp restart";
   QProcess *runCommandProc = new QProcess(this);
@@ -515,14 +515,14 @@
 
 void NetworkTray::slotEnablePPPOE() {
   QString ProfileName = "internet";
-  QString program = "kdesu";
+  QString program = "pc-su";
   QStringList arguments;
   arguments << "--noignorebutton" << "-d" << "ppp -background " + ProfileName;
   QProcess *runCommandProc = new QProcess(this);
   runCommandProc->start(program, arguments);
 }
 void NetworkTray::slotDisablePPPOE() {
-  QString program = "kdesu";
+  QString program = "pc-su";
   QStringList arguments;
   arguments << "--noignorebutton" << "-d" << "kilalll ppp";
   QProcess *runCommandProc = new QProcess(this);
@@ -570,7 +570,7 @@
 
 void  NetworkTray::openDeviceInfo() {
 
-  QString program = "kdesu";
+  QString program = "pc-su";
   QStringList arguments;
   if ( DeviceType == "Ethernet" )
   {

Modified: pcbsd/current/src-qt4/pc-pfmanager/pfmanager.desktop
===================================================================
--- pcbsd/current/src-qt4/pc-pfmanager/pfmanager.desktop	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-pfmanager/pfmanager.desktop	2010-07-25 15:10:46 UTC (rev 7283)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kdesu pc-pfmanager
+Exec=pc-su pc-pfmanager
 Icon=preferences-system-network-sharing
 Type=Application
 

Modified: pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.desktop
===================================================================
--- pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.desktop	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-servicemanager/pc-servicemanager.desktop	2010-07-25 15:10:46 UTC (rev 7283)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kdesu pc-servicemanager
+Exec=pc-su pc-servicemanager
 Icon=preferences-system-network-sharing
 Type=Application
 

Modified: pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-07-25 15:10:46 UTC (rev 7283)
@@ -88,7 +88,7 @@
 dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/apps/pcbsd/i18n/
 
 desktop.path=/usr/local/share/applications/ 
-desktop.files=pcbsdsystem.desktop
+desktop.files=pc-sysmanager.desktop
 
 scripts.path = /usr/local/share/apps/pcbsd/scripts/
 scripts.files = scripts/*

Modified: pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2010-07-25 15:10:46 UTC (rev 7283)
@@ -566,7 +566,7 @@
 void UpdaterTray::slotOpenUpdateManager(void)
 {   
      // Launch the kcmshell4 process as root
-    system ("(kdesu --caption 'Start Program Manager' pcSoftwareManager) &"); 
+    system ("(pc-su --caption 'Start Program Manager' pc-softwaremanager) &"); 
 }
 
 

Modified: pcbsd/current/src-qt4/pc-usermanager/pcusermanager.desktop
===================================================================
--- pcbsd/current/src-qt4/pc-usermanager/pcusermanager.desktop	2010-07-25 14:59:45 UTC (rev 7282)
+++ pcbsd/current/src-qt4/pc-usermanager/pcusermanager.desktop	2010-07-25 15:10:46 UTC (rev 7283)
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kdesu pc-usermanager
+Exec=pc-su pc-usermanager
 Icon=kuser
 Type=Application
 Comment=Manage users and groups



More information about the Commits mailing list