Ticket #5677: schemawiz.patch

libs/libmyth/schemawizard.cpp

@@ -1 +1 @@
 #include <unistd.h>      // for isatty() on Windows
 
-#include "dialogbox.h"
 #include "langsettings.h"
 #include "mythcontext.h"
 #include "schemawizard.h"
 #include "util.h"
 
 #include "libmythdb/mythtimer.h"
+#include "libmythui/mythdialogbox.h"
 #include "libmythui/mythmainwindow.h"
+#include "libmythui/myththemebase.h"
 #include "libmythui/mythuihelper.h"
 
 
 static SchemaUpgradeWizard * c_wizard = 0;
 
+static MythThemeBase * themeBase = 0;
 
 SchemaUpgradeWizard::SchemaUpgradeWizard(const QString &DBSchemaSetting,
                                          const QString &upgradeSchemaVal)
@@ -328 +330 @@
  
     if (gui)
     {
-        DialogBox       * dlg;
+        MythDialogBox   * dlg;
         MythScreenStack * pop;
         MythMainWindow  * win = gContext->GetMainWindow();
 
@@ -336 +338 @@
             win = TempMainWindow(true);
 
         pop = win->GetStack("popup stack");
+        if (!pop)
+            pop = win->GetMainStack();
+        if (!pop)
+            return MYTH_SCHEMA_ERROR;
 
-        dlg = new DialogBox(win, message);
+
+
+        dlg = new MythDialogBox(message, pop, "schema prompt");
+        if (!dlg->Create())
+            return MYTH_SCHEMA_ERROR;
+
+        pop->AddScreen(dlg);
         dlg->AddButton(QObject::tr("Exit"));
 
         if (returnValue == MYTH_SCHEMA_ERROR)
@@ -349 +361 @@
             if (m_expertMode)
                 dlg->AddButton(QObject::tr("Use current schema"));
 
-            DialogCode selected = dlg->exec();
+            DialogCode selected = (DialogCode)(int)dlg->exec();
+printf("Got exec() = %d\n", selected);
 
             // The annoying extra confirmation:
             if (kDialogCodeButton1 == selected ||
@@ -376 +389 @@
                 if (connections)
                     message += "\n\n" + warnOtherCl;
 
-                DialogBox *dlg2 = new DialogBox(win, message);
+                MythDialogBox *dlg2 = new MythDialogBox(message, pop,
+                                                        "schema extra popup");
+                if (!dlg2->Create())
+                    return MYTH_SCHEMA_ERROR;
+                pop->AddScreen(dlg2);
 
                 dlg2->AddButton(QObject::tr("Exit"));
                 if (upgradable)
@@ -384 +401 @@
                 if (m_expertMode)
                     dlg2->AddButton(QObject::tr("Use current schema"));
 
-                selected = dlg2->exec();
+                selected = (DialogCode)(int)dlg->exec();
 
                 dlg2->deleteLater();
             }
@@ -471 +488 @@
 
     win->Init();
     gContext->SetMainWindow(win);
+
+    themeBase = new MythThemeBase();
+
     m_createdTempWindow = true;
 
     LanguageSettings::prompt();
@@ -481 +501 @@
 
 void SchemaUpgradeWizard::EndTempWindow(void)
 {
+    delete themeBase;
     gContext->SetMainWindow(NULL);
     DestroyMythMainWindow();
     m_createdTempWindow = false;