Changeset 4100

Timestamp:

06/13/09 06:57:07 (9 months ago)

Author:

kris

Message:

Changed the system updater tray, to not issue annoying popup if teh update check fails, and
instead only change the icon in the taskbar and the tooltip to reflect the failure.

Files:

• pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp (modified) (3 diffs)

pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp

@@ -269 +269 @@
   if ( sysFetchJob->error() != 0 )
   {
-       QImage Icon2;
-       Icon2.load("/PCBSD/SystemUpdater/images/sysupdates.png");
-       QPixmap PixmapIcon2;
-       PixmapIcon2.convertFromImage(Icon2.scaled(22,22));
-
-       KPassivePopup::message(tr("System Update Error"), tr("Could not contact the PC-BSD update server! Please check your internet connection or proxy settings."), PixmapIcon2, this);
+       // We couldn't fetch any updates, set the status and update the icon
+       programstatus = CHECK_FAILED;
+       contextMenuRefresh();
+       displayTooltip();
   } 
 
@@ -352 +350 @@
   }
 
+  // If the program couldn't get a list of updates from the server
+  if ( programstatus == CHECK_FAILED ) 
+  {
+     Icon.addFile("/PCBSD/SystemUpdater/images/connecterror.png");
+     setIcon(Icon);
+  }
 
   // If the program has a PBI update
@@ -468 +472 @@
    if (programstatus == SYSTEM_UP2DATE ) {
       tooltipStr += "<br>" + tr("Your system is fully updated!");
+   }
+   
+   if (programstatus == CHECK_FAILED ) {
+      tooltipStr += "<br>" + tr("Failed to contact the update server!");
    }