Changeset 304095c

Timestamp:

Apr 25, 2013 11:18:40 AM (4 weeks ago)

Author:

Kris Moore <kris@…>

Branches:

master, 9.1-release

Children:

35c5dc4

Parents:

ad90f5d

Message:

Make system update tray aware of pc-pkgmanager

Location:

src-qt4/pc-systemupdatertray

Files:

• UpdaterTray.cpp (modified) (10 diffs)
• UpdaterTray.h (modified) (2 diffs)

src-qt4/pc-systemupdatertray/UpdaterTray.cpp

@@ -26 +26 @@
 #define SYSTEM_UP2DATE 0
 #define SYSTEM_UPDATE_AVAIL 1
+#define PACKAGE_UPDATE_AVAIL 1
 #define SYSTEM_CHECKING4UPDATES 4
 #define SYSTEM_UPDATING 5
@@ -340 +341 @@
 
   bool haveUp = false;
+  bool haveNGUp = false;
   bool haveUpWarden = false;
   
@@ -372 +374 @@
     line = m.readLine().simplified();
     if ( line.indexOf("To start the upgrade") == 0 ) {
-      haveUp = true;
+      haveNGUp = true;
       break;
     } 
@@ -423 +425 @@
   } else if ( haveUp ) {
     programstatus = SYSTEM_UPDATE_AVAIL;
+  } else if ( haveNGUp ) {
+    programstatus = PACKAGE_UPDATE_AVAIL;
   } else {
     // We have no updates available, indicate that now.
@@ -459 +463 @@
   if ( programstatus == SYSTEM_CHECKING4UPDATES ) 
      Icon.addFile(PREFIX + "/share/pcbsd/pc-systemupdatertray/images/working.png");
+
+  if ( programstatus == PACKAGE_UPDATE_AVAIL ) 
+     Icon.addFile(PREFIX + "/share/pcbsd/pc-systemupdatertray/images/pbiupdates.png");
 
   // If the program shows system updates available
@@ -521 +528 @@
 
    if(reason == QSystemTrayIcon::Trigger) {
-       if ( (programstatus != SYSTEM_UPDATE_AVAIL) && (pbistatus == PBI_UPDATES_AVAIL) )
+       if ( (programstatus != SYSTEM_UPDATE_AVAIL && programstatus != PACKAGE_UPDATE_AVAIL) && (pbistatus == PBI_UPDATES_AVAIL) )
        {
             slotOpenSoftwareManagerInstalled();
@@ -532 +539 @@
               return;
            }
+           if ( programstatus == PACKAGE_UPDATE_AVAIL ) {
+              slotOpenPackageManager();
+              return;
+           }
            if ( wardenstatus == WARDEN_UPDATE_AVAIL ) {
               slotOpenJailManager();
@@ -545 +556 @@
 {   
    system ("(pc-su warden gui) &"); 
+}
+
+void UpdaterTray::slotOpenPackageManager(void)
+{   
+   system ("(sudo pc-pkgmanager) &"); 
 }
 
@@ -599 +615 @@
         shownPopup=true;
         QTimer::singleShot(15000, this, SLOT(slotShowSysUpdatePopup()));
+      }
+   }
+
+   if (programstatus == PACKAGE_UPDATE_AVAIL) {
+      tooltipStr += "<br>" + tr("Package updates available");
+      if ( !shownPopup && popAction->isChecked() ) {
+        shownPopup=true;
+        QTimer::singleShot(15000, this, SLOT(slotShowPkgUpdatePopup()));
       }
    }
@@ -726 +750 @@
 }
 
+void UpdaterTray::slotShowPkgUpdatePopup()
+{
+        disconnect(trayIcon, SIGNAL(messageClicked()), 0, 0 );
+        trayIcon->showMessage(tr("System Updates Available"), tr("Important package updates are available. Click here to install them!"), QSystemTrayIcon::Critical);
+        connect( trayIcon, SIGNAL(messageClicked()), this, SLOT(slotOpenPackageManager()) );
+}
+
 
 void UpdaterTray::slotShowSysUpdatePopup()

src-qt4/pc-systemupdatertray/UpdaterTray.h

@@ -38 +38 @@
    void slotOpenJailManager();
    void slotOpenUpdateManager();
+   void slotOpenPackageManager();
    void slotOpenSoftwareManager();
    void slotOpenSoftwareManagerInstalled();
@@ -56 +57 @@
    void slotShowPBIUpdatePopup();
    void slotChangePopup();
+   void slotShowPkgUpdatePopup();
    
 protected: