[PC-BSD Commits] r3118 - in pcbsd: branches/7.0/kcmPBUstart trunk/kcmPBUstart

[svn at pcbsd.org]

Author: kris
Date: 2008-12-18 12:30:36 -0800 (Thu, 18 Dec 2008)
New Revision: 3118

Modified:
   pcbsd/branches/7.0/kcmPBUstart/notroot.cpp
   pcbsd/branches/7.0/kcmPBUstart/notroot.h
   pcbsd/trunk/kcmPBUstart/notroot.cpp
   pcbsd/trunk/kcmPBUstart/notroot.h
Log:

Updated the system settings Online Update manager GUI to reflect the new changes in the update service



Modified: pcbsd/branches/7.0/kcmPBUstart/notroot.cpp
===================================================================
--- pcbsd/branches/7.0/kcmPBUstart/notroot.cpp	2008-12-18 19:55:43 UTC (rev 3117)
+++ pcbsd/branches/7.0/kcmPBUstart/notroot.cpp	2008-12-18 20:30:36 UTC (rev 3118)
@@ -35,6 +35,7 @@
     qDebug("Application starting as non-root...");
     
     connect(pushAdmin, SIGNAL( clicked() ), this, SLOT(slotLaunchUpdater() ) );
+    connect(pushTray, SIGNAL( clicked() ), this, SLOT(slotLaunchTray() ) );
     
 }
 
@@ -42,12 +43,23 @@
 {
     // Launch the kcmshell4 process as root
     launchAdminProc = new Q3Process( this );
-    launchAdminProc->addArgument( "sudo" );
-    launchAdminProc->addArgument( "/PCBSD/SystemUpdater/bin/SystemUpdater.sh" );
+    launchAdminProc->addArgument( "kdesu" );
+    launchAdminProc->addArgument( "kcmshell4" );
+    launchAdminProc->addArgument( "pcbsdpbm" );
  
     if ( !launchAdminProc->start() ) {
  
     }
 }
 
+void NotRoot::slotLaunchTray()
+{
+    // Launch the kcmshell4 process as root
+    launchAdminProc = new Q3Process( this );
+    launchAdminProc->addArgument( "/PCBSD/SystemUpdater/bin/SystemUpdaterTray" );
+    if ( !launchAdminProc->start() ) {
+ 
+    }
+}
 
+

Modified: pcbsd/branches/7.0/kcmPBUstart/notroot.h
===================================================================
--- pcbsd/branches/7.0/kcmPBUstart/notroot.h	2008-12-18 19:55:43 UTC (rev 3117)
+++ pcbsd/branches/7.0/kcmPBUstart/notroot.h	2008-12-18 20:30:36 UTC (rev 3118)
@@ -23,6 +23,7 @@
 
 private slots:
 	void slotLaunchUpdater();
+	void slotLaunchTray();
 
 private:
 	Q3Process *launchAdminProc;

Modified: pcbsd/trunk/kcmPBUstart/notroot.cpp
===================================================================
--- pcbsd/trunk/kcmPBUstart/notroot.cpp	2008-12-18 19:55:43 UTC (rev 3117)
+++ pcbsd/trunk/kcmPBUstart/notroot.cpp	2008-12-18 20:30:36 UTC (rev 3118)
@@ -35,6 +35,7 @@
     qDebug("Application starting as non-root...");
     
     connect(pushAdmin, SIGNAL( clicked() ), this, SLOT(slotLaunchUpdater() ) );
+    connect(pushTray, SIGNAL( clicked() ), this, SLOT(slotLaunchTray() ) );
     
 }
 
@@ -42,12 +43,23 @@
 {
     // Launch the kcmshell4 process as root
     launchAdminProc = new Q3Process( this );
-    launchAdminProc->addArgument( "sudo" );
-    launchAdminProc->addArgument( "/PCBSD/SystemUpdater/bin/SystemUpdater.sh" );
+    launchAdminProc->addArgument( "kdesu" );
+    launchAdminProc->addArgument( "kcmshell4" );
+    launchAdminProc->addArgument( "pcbsdpbm" );
  
     if ( !launchAdminProc->start() ) {
  
     }
 }
 
+void NotRoot::slotLaunchTray()
+{
+    // Launch the kcmshell4 process as root
+    launchAdminProc = new Q3Process( this );
+    launchAdminProc->addArgument( "/PCBSD/SystemUpdater/bin/SystemUpdaterTray" );
+    if ( !launchAdminProc->start() ) {
+ 
+    }
+}
 
+

Modified: pcbsd/trunk/kcmPBUstart/notroot.h
===================================================================
--- pcbsd/trunk/kcmPBUstart/notroot.h	2008-12-18 19:55:43 UTC (rev 3117)
+++ pcbsd/trunk/kcmPBUstart/notroot.h	2008-12-18 20:30:36 UTC (rev 3118)
@@ -23,6 +23,7 @@
 
 private slots:
 	void slotLaunchUpdater();
+	void slotLaunchTray();
 
 private:
 	Q3Process *launchAdminProc;