Changeset 2908

Timestamp:

10/15/08 12:51:29 (17 months ago)

Author:

kris

Message:

Updated a few more potential crashes in the System Updater tool, and make it a KUniqueApplication to prevent multiple copies from crashing into one another.

Location:

pcbsd

Files:

• branches/7.0/SystemUpdater/UpdaterTray.cpp (modified) (5 diffs)
• branches/7.0/SystemUpdater/main.cpp (modified) (3 diffs)
• trunk/SystemUpdater/UpdaterTray.cpp (modified) (5 diffs)
• trunk/SystemUpdater/main.cpp (modified) (3 diffs)

pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp

@@ -898 +898 @@
   // Hide the system updater tool
   SystemUpdaterDialog->hide();
+  UpdaterStatusDialog->show();
 
   // Clear out the reboot status flag
@@ -941 +942 @@
  if ( rebootFlag == 1 )
  {
+     // Show the updater status dialog, so user can see any errors
+    UpdaterStatusDialog->show();
+
     QMessageBox::warning( this->contextMenu(), tr("Online Update"), tr("One or more updates will require a reboot. You will be prompted to restart after the update is finished."), QMessageBox::Ok );
     requiresSysReboot = 1;
@@ -1264 +1268 @@
     
             if ( ! extractProc->start() ) {
+                // Show the updater status dialog, so user can see any errors
+                UpdaterStatusDialog->show();
+
                 QMessageBox::critical( this->contextMenu(), tr("Online Update"), tr("An error occured while extracting. Please try again later."), QMessageBox::Ok );
+                if ( UpdaterStatusDialog->isShown() )
+                {
+                   UpdaterStatusDialog->hide();
+                }
                 exit(15);       
             } 
@@ -1688 +1699 @@
   // Hide the system updater tool
   SystemUpdaterDialog->hide();
+  UpdaterStatusDialog->show();
 
 
@@ -1750 +1762 @@
        if ( attemptedRedownload == 3)
        {
+           // Show the updater status dialog, so user can see any errors
+           UpdaterStatusDialog->show();
+          
           QMessageBox::critical( this->contextMenu(), tr("Online Update"), PBIProgName[currentWorkingPBI] + ": " + tr("An error occured while downloading. Please try again later."), QMessageBox::Ok );
 

pcbsd/branches/7.0/SystemUpdater/main.cpp

@@ -2 +2 @@
 #include <qtranslator.h>
 #include <qtextcodec.h>
-#include <kapplication.h>
+#include <kuniqueapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
@@ -23 +23 @@
     aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris@pcbsd.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
+   KCmdLineArgs::init(argc, argv, &aboutData);
 
    KCmdLineOptions options;
@@ -30 +30 @@
    KCmdLineArgs::addCmdLineOptions( options );
 
-   KApplication a;
+   KUniqueApplication a;
 
    UpdaterTray tray;

pcbsd/trunk/SystemUpdater/UpdaterTray.cpp

@@ -898 +898 @@
   // Hide the system updater tool
   SystemUpdaterDialog->hide();
+  UpdaterStatusDialog->show();
 
   // Clear out the reboot status flag
@@ -941 +942 @@
  if ( rebootFlag == 1 )
  {
+     // Show the updater status dialog, so user can see any errors
+    UpdaterStatusDialog->show();
+
     QMessageBox::warning( this->contextMenu(), tr("Online Update"), tr("One or more updates will require a reboot. You will be prompted to restart after the update is finished."), QMessageBox::Ok );
     requiresSysReboot = 1;
@@ -1264 +1268 @@
     
             if ( ! extractProc->start() ) {
+                // Show the updater status dialog, so user can see any errors
+                UpdaterStatusDialog->show();
+
                 QMessageBox::critical( this->contextMenu(), tr("Online Update"), tr("An error occured while extracting. Please try again later."), QMessageBox::Ok );
+                if ( UpdaterStatusDialog->isShown() )
+                {
+                   UpdaterStatusDialog->hide();
+                }
                 exit(15);       
             } 
@@ -1688 +1699 @@
   // Hide the system updater tool
   SystemUpdaterDialog->hide();
+  UpdaterStatusDialog->show();
 
 
@@ -1750 +1762 @@
        if ( attemptedRedownload == 3)
        {
+           // Show the updater status dialog, so user can see any errors
+           UpdaterStatusDialog->show();
+          
           QMessageBox::critical( this->contextMenu(), tr("Online Update"), PBIProgName[currentWorkingPBI] + ": " + tr("An error occured while downloading. Please try again later."), QMessageBox::Ok );
 

pcbsd/trunk/SystemUpdater/main.cpp

@@ -2 +2 @@
 #include <qtranslator.h>
 #include <qtextcodec.h>
-#include <kapplication.h>
+#include <kuniqueapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
@@ -23 +23 @@
     aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris@pcbsd.org");
 
-    KCmdLineArgs::init(argc, argv, &aboutData);
+   KCmdLineArgs::init(argc, argv, &aboutData);
 
    KCmdLineOptions options;
@@ -30 +30 @@
    KCmdLineArgs::addCmdLineOptions( options );
 
-   KApplication a;
+   KUniqueApplication a;
 
    UpdaterTray tray;