Ticket #9235: mythui_mythgame.diff

mythplugins/mythgame/mythgame/gamehandler.cpp

@@ +1 @@
+
 #include "gamehandler.h"
 #include "rominfo.h"
 #include "rom_metadata.h"
@@ -7 +8 @@
 #include <QDir>
 #include <QList>
 
-#include <mythcontext.h>
+
 #include <mythdbcon.h>
-#include <mythdialogs.h>
 #include <util.h>
 #include <mythdb.h>
+
+#include <mythcontext.h>
+#include <mythdialogs.h>
+
 #include <mythuihelper.h>
+#include <mythdialogbox.h>
+#include <mythmainwindow.h>
 
 #define LOC_ERR QString("MythGame:GAMEHANDLER Error: ")
 #define LOC QString("MythGame:GAMEHANDLER: ")
@@ -214 +220 @@
 
 }
 
-void GameHandler::promptForRemoval(QString filename, QString RomPath)
+void GameHandler::promptForRemoval(GameScan scan)
 {
+    QString filename = scan.Rom();
+    QString RomPath = scan.RomFullPath();
+
     if (m_RemoveAll)
         purgeGameDB(filename , RomPath);
 
     if (m_KeepAll || m_RemoveAll)
         return;
 
-    QStringList buttonText;
-    buttonText += QObject::tr("No");
-    buttonText += QObject::tr("No to all");
-    buttonText += QObject::tr("Yes");
-    buttonText += QObject::tr("Yes to all");
+    MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
+    MythDialogBox *removalPopup = new MythDialogBox(
+        tr("%1 appears to be missing.\nRemove it from the database?")
+        .arg(filename), popupStack, "chooseSystemPopup");
 
-
-    DialogCode result = MythPopupBox::ShowButtonPopup(
-        GetMythMainWindow(), 
-        QObject::tr("File Missing"),
-        QString(QObject::tr("%1 appears to be missing.\nRemove it"
-                            " from the database?")).arg(filename),
-        buttonText, kDialogCodeButton0);
-
-    switch (result)
+    if (removalPopup->Create())
     {
-        case kDialogCodeButton0:
-        case kDialogCodeRejected:
-        default:
-            break;
-        case kDialogCodeButton1:
-            m_KeepAll = true;
-            break;
-        case kDialogCodeButton2:
-            purgeGameDB(filename , RomPath);
-            break;
-        case kDialogCodeButton3:
-            m_RemoveAll = true;
-            purgeGameDB(filename , RomPath);
-            break;
-    };
+        removalPopup->SetReturnEvent(this, "removalPopup");
 
+        removalPopup->AddButton(tr("No"));
+        removalPopup->AddButton(tr("No to all"));
+        removalPopup->AddButton(tr("Yes"), qVariantFromValue(scan));
+        removalPopup->AddButton(tr("Yes to all"), qVariantFromValue(scan));
+        popupStack->AddScreen(removalPopup);
 }
+    else
+        delete removalPopup;
+}
 
 void updateDisplayRom(QString romname, int display, QString Systemname)
 {
@@ -488 +482 @@
         else if ((iter.value().FoundLoc() == inDatabase) && (removalprompt))
         {
 
-            promptForRemoval( iter.value().Rom() , iter.value().RomPath() );
+            promptForRemoval( iter.value() );
         }
 
         progressDlg->setProgress(++counter);
@@ -939 +933 @@
     handlers->append(handler);
 }
 
+void GameHandler::customEvent(QEvent *event)
+{
+    if (event->type() == DialogCompletionEvent::kEventType)
+    {
+        DialogCompletionEvent *dce = (DialogCompletionEvent*)(event);
+
+        QString resultid   = dce->GetId();
+        QString resulttext = dce->GetResultText();
+
+        if (resultid == "removalPopup")
+        {
+            int buttonNum = dce->GetResult();
+            GameScan scan = qVariantValue<GameScan>(dce->GetData());
+            switch (buttonNum)
+            {
+                case 1:
+                    m_KeepAll = true;
+                    break;
+                case 2:
+                    purgeGameDB(scan.Rom() , scan.RomFullPath());
+                    break;
+                case 3:
+                    m_RemoveAll = true;
+                    purgeGameDB(scan.Rom() , scan.RomFullPath());
+                    break;
+                default:
+                    break;
+            };
+        }
+    }
+}

mythplugins/mythgame/mythgame/gamehandler.h

@@ -4 +4 @@
 
 #include <QStringList>
 #include <QMap>
+#include <QObject>
+#include <QEvent>
 
 #include <mythdbcon.h>
 
 #include "rom_metadata.h"
 #include "rominfo.h"
 
+class MythUIProgressDialog;
 class MythMainWindow;
 class GameHandler;
-class QObject;
 
 enum GameFound
 {
@@ -46 +48 @@
     int     foundloc;
 };
 
+Q_DECLARE_METATYPE(GameScan)
+
 typedef QMap<QString, GameScan> GameScanMap;
 
 class MythProgressDialog;
-class GameHandler
+class GameHandler : public QObject
 {
+    Q_OBJECT
+
   public:
-    GameHandler() :
+    GameHandler() : QObject(),
         rebuild(false),             spandisks(0),
         systemname(QString::null),  rompath(QString::null),
         commandline(QString::null), workingpath(QString::null),
@@ -71 +77 @@
                              QString* Plot, QString* Publisher, QString* Version,
                              QString* Fanart, QString* Boxart);
 
-    void promptForRemoval(QString filename, QString RomPath );
+    void promptForRemoval(GameScan scan);
     void UpdateGameDB(GameHandler *handler);
     void VerifyGameDB(GameHandler *handler);
 
@@ -105 +111 @@
   protected:
     static GameHandler* GetHandler(RomInfo *rominfo);
     static GameHandler* GetHandlerByName(QString systemname);
+    void customEvent(QEvent *event);
 
     bool rebuild;
     int spandisks;