[PC-BSD Commits] r8032 - pcbsd/current/src-qt4/pc-systemupdatertray

[svn at pcbsd.org]

Author: kris
Date: 2010-11-16 05:19:18 -0800 (Tue, 16 Nov 2010)
New Revision: 8032

Modified:
   pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
   pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.h
Log:

Fixed bug lauching system / software manager from the tray icon, noticed by: Odhiambo WASHINGTON



Modified: pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2010-11-15 14:09:16 UTC (rev 8031)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2010-11-16 13:19:18 UTC (rev 8032)
@@ -108,7 +108,8 @@
   trayIconMenu = new QMenu(this);
   trayIconMenu->setIcon(contextIcon);
   trayIconMenu->addSeparator();
-  trayIconMenu->addAction( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()));
+  trayIconMenu->addAction( tr("Start the System Update Manager"), this, SLOT(slotOpenUpdateManager()));
+  trayIconMenu->addAction( tr("Start the Software Manager"), this, SLOT(slotOpenSoftwareManager()));
   trayIconMenu->addAction( tr("Check for updates"), this, SLOT(slotCheckAllUpdates()));
   trayIconMenu->addSeparator();
   runAction = trayIconMenu->addAction( tr("Run at startup"), this, SLOT(slotChangeRunStartup()) );
@@ -565,10 +566,13 @@
 
 void UpdaterTray::slotOpenUpdateManager(void)
 {   
-     // Launch the kcmshell4 process as root
-    system ("(pc-su --caption 'Start Program Manager' pc-softwaremanager) &"); 
+    system ("(pc-su pc-sysmanager) &"); 
 }
 
+void UpdaterTray::slotOpenSoftwareManager(void)
+{   
+    system ("(pc-su pc-softwaremanager) &"); 
+}
 
 // The user wants to quit the application
 void UpdaterTray::slotQuitTray() {

Modified: pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.h
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.h	2010-11-15 14:09:16 UTC (rev 8031)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.h	2010-11-16 13:19:18 UTC (rev 8032)
@@ -29,28 +29,29 @@
    virtual ~UpdaterTray() {};
    
 private slots:
+   void contextMenuRefresh();
+   void slotAutoUpdateStatusChanged();
+   void slotChangeRunStartup();
+   void slotCheckAllUpdates();
+   void slotMonitorForChanges();
+   void slotOpenConfigDlg();
    void slotOpenUpdateManager();
-   void slotOpenConfigDlg();
-   void slotStartUpdateCheck();
+   void slotOpenSoftwareManager();
+   void slotPBICheckUpdate();
+   void slotPopulatePBIList();
    void slotQuitTray();
+   void slotReadPBIBuffer();
    void slotReadSystemUpdates();
+   void slotRecieveSysData();
+   void slotSaveUpdaterPrefs();
+   void slotScheduledPBICheck();
+   void slotScheduledSystemCheck();
+   void slotSetTimerReadAutoStatus();
+   void slotStartPBIUpdateCheck();
+   void slotStartUpdateCheck();
    void slotSysUpdateCheckFinished();
-   void slotScheduledSystemCheck();
-   void slotScheduledPBICheck();
-   void contextMenuRefresh();
-   void slotSaveUpdaterPrefs();
    void slotSysUpdateTimer();
-   void slotStartPBIUpdateCheck();
-   void slotPBICheckUpdate();
-   void slotPopulatePBIList();
-   void slotChangeRunStartup();
    void slotTrayActivated(QSystemTrayIcon::ActivationReason reason);
-   void slotRecieveSysData();
-   void slotAutoUpdateStatusChanged();
-   void slotSetTimerReadAutoStatus();
-   void slotCheckAllUpdates();
-   void slotReadPBIBuffer();
-   void slotMonitorForChanges();
    
 protected: