[PC-BSD Commits] r3115 - in pcbsd: branches/7.0/SystemUpdaterTray trunk/SystemUpdaterTray

[svn at pcbsd.org]

Author: kris
Date: 2008-12-18 11:43:26 -0800 (Thu, 18 Dec 2008)
New Revision: 3115

Modified:
   pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.cpp
   pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.h
   pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp
   pcbsd/trunk/SystemUpdaterTray/UpdaterTray.h
Log:

Updated the System Tray notifer to check for PBI updates as well when you request to scan for updates



Modified: pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.cpp
===================================================================
--- pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.cpp	2008-12-18 19:30:49 UTC (rev 3114)
+++ pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.cpp	2008-12-18 19:43:26 UTC (rev 3115)
@@ -93,7 +93,7 @@
   // Setup our Context Menu
   contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()), 0, 5);
-  contextMenu()->insertItem( tr("Check for updates"), this, SLOT(slotScheduledSystemCheck()), 0, 4);
+  contextMenu()->insertItem( tr("Check for updates"), this, SLOT(slotCheckAllUpdates()), 0, 4);
   contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Run at startup"), this, SLOT(slotChangeRunStartup()), 0, 6);
   contextMenu()->setItemChecked ( 6, TRUE );
@@ -114,6 +114,16 @@
   
 }
 
+void UpdaterTray::slotCheckAllUpdates()
+{
+   // Start the monitor service for system updates
+  QTimer::singleShot(300, this, SLOT(slotScheduledSystemCheck()));
+
+  // Start the monitor service for PBI updates
+  QTimer::singleShot(400, this, SLOT(slotScheduledPBICheck()));
+
+}
+
 void UpdaterTray::slotChangeRunStartup() {
 
  if ( contextMenu()->isItemChecked(6) )

Modified: pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.h
===================================================================
--- pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.h	2008-12-18 19:30:49 UTC (rev 3114)
+++ pcbsd/branches/7.0/SystemUpdaterTray/UpdaterTray.h	2008-12-18 19:43:26 UTC (rev 3115)
@@ -37,6 +37,7 @@
    void slotChangeRunStartup();
    void slotTrayActivated(QSystemTrayIcon::ActivationReason reason);
    void slotRecieveData(KIO::Job*, const QByteArray& data);
+   void slotCheckAllUpdates();
    
 protected:
    

Modified: pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp
===================================================================
--- pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp	2008-12-18 19:30:49 UTC (rev 3114)
+++ pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp	2008-12-18 19:43:26 UTC (rev 3115)
@@ -93,7 +93,7 @@
   // Setup our Context Menu
   contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Start the Update Manager"), this, SLOT(slotOpenUpdateManager()), 0, 5);
-  contextMenu()->insertItem( tr("Check for updates"), this, SLOT(slotScheduledSystemCheck()), 0, 4);
+  contextMenu()->insertItem( tr("Check for updates"), this, SLOT(slotCheckAllUpdates()), 0, 4);
   contextMenu()->insertSeparator();
   contextMenu()->insertItem( tr("Run at startup"), this, SLOT(slotChangeRunStartup()), 0, 6);
   contextMenu()->setItemChecked ( 6, TRUE );
@@ -114,6 +114,16 @@
   
 }
 
+void UpdaterTray::slotCheckAllUpdates()
+{
+   // Start the monitor service for system updates
+  QTimer::singleShot(300, this, SLOT(slotScheduledSystemCheck()));
+
+  // Start the monitor service for PBI updates
+  QTimer::singleShot(400, this, SLOT(slotScheduledPBICheck()));
+
+}
+
 void UpdaterTray::slotChangeRunStartup() {
 
  if ( contextMenu()->isItemChecked(6) )

Modified: pcbsd/trunk/SystemUpdaterTray/UpdaterTray.h
===================================================================
--- pcbsd/trunk/SystemUpdaterTray/UpdaterTray.h	2008-12-18 19:30:49 UTC (rev 3114)
+++ pcbsd/trunk/SystemUpdaterTray/UpdaterTray.h	2008-12-18 19:43:26 UTC (rev 3115)
@@ -37,6 +37,7 @@
    void slotChangeRunStartup();
    void slotTrayActivated(QSystemTrayIcon::ActivationReason reason);
    void slotRecieveData(KIO::Job*, const QByteArray& data);
+   void slotCheckAllUpdates();
    
 protected: