Ticket #6712: mythgamefixes.diff

mythgame/mythgame/gameui.cpp

@@ -72 +72 @@
 
     m_gameTree = new MythGenericTree("game root", 0, false);
 
-    timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), SLOT(showImageTimeout()));
-
     //  create system filter to only select games where handlers are present
     QString systemFilter;
 
@@ -197 +194 @@
             node->deleteAllChildren();
             fillNode(node);
         }
-        if (timer->isActive())
-            timer->stop();
         clearRomInfo();
     }
     else
@@ -209 +204 @@
         if (romInfo->Romname().isEmpty())
             romInfo->fillData();
         updateRomInfo(romInfo);
-        if (!romInfo->ImagePath().isEmpty() || !romInfo->Fanart().isEmpty() ||
+        if (!romInfo->Screenshot().isEmpty() || !romInfo->Fanart().isEmpty() ||
             !romInfo->Boxart().isEmpty())
-        {
-            if (timer->isActive())
-                timer->changeInterval(330);
-            else
-                timer->start(330, true);
-        }
+            showImages();
         else
         {
             if (m_gameImage->IsVisible())
@@ -267 +257 @@
     }
 }
 
-void GameUI::showImageTimeout(void)
+void GameUI::showImages(void)
 {
     m_gameImage->Load();
     if (!m_gameImage->IsVisible())

mythgame/mythgame/gamehandler.cpp

@@ -464 +464 @@
                           "publisher, version, fanart, boxart) "
                           "VALUES (:SYSTEM, :ROMNAME, :GAMENAME, :GENRE, :YEAR, "
                           ":GAMETYPE, :ROMPATH, :COUNTRY, :CRC32, '1', '1', :PLOT, :PUBLISHER, :VERSION, "
-                          ":FANART, BOXART)");
+                          ":FANART, :BOXART)");
 
             query.bindValue(":SYSTEM",handler->SystemName());
             query.bindValue(":ROMNAME",iter.data().Rom());

mythgame/mythgame/rominfo.cpp

@@ -266 +266 @@
         setBoxart(query.value(16).toString());
     }
 
-    query.prepare("SELECT screenshots FROM gameplayers "
-                  "WHERE playername = :SYSTEM");
-    query.bindValue(":SYSTEM",system);
-
-    if (query.exec() && query.next())
-    {
-        if (!query.value(0).toString().isEmpty())
-        {
-            QString Image = query.value(0).toString() + "/" + romname;
-            if (FindImage(query.value(0).toString() + "/" + romname, &Image))
-                setImagePath(Image);
-            else
-                setImagePath("");
-        }
-    }
-
     setRomCount(romInDB(romname,gametype));
 
     // If we have more than one instance of this rom in the DB fill in all

mythgame/mythgame/gameui.h

@@ -24 +24 @@
   public slots:
     void nodeChanged(MythGenericTree* node);
     void itemClicked(MythUIButtonListItem* item);
-    void showImageTimeout(void);
+    void showImages(void);
     void searchComplete(QString);
 
   private:

mythgame/mythgame/rominfo.h

@@ -43 +43 @@
                 system = lhs.system;
                 gamename = lhs.gamename;
                 genre = lhs.genre;
-                imagepath = lhs.imagepath;
                 year = lhs.year;
                 favorite = lhs.favorite;
                 rompath = lhs.rompath;
@@ -107 +106 @@
     QString CRC_VALUE() const { return crc_value; }
     void setCRC_VALUE(const QString &lcrc_value) { crc_value = lcrc_value; }
 
-    QString ImagePath() const { return imagepath; }
-    void setImagePath(const QString &limagepath) { imagepath = limagepath; } 
-
     QString Plot() const { return plot; }
     void setPlot(const QString &lplot) { plot = lplot; }
 
@@ -136 +132 @@
     QString system;
     QString gamename;
     QString genre;
-    QString imagepath; 
     QString country;
     QString crc_value;
     QString gametype;

mythgame/mythgame/gamesettings.cpp

@@ -89 +89 @@
 HostLineEdit *GetScreenshotDir()
 {
     HostLineEdit *gc = new HostLineEdit("mythgame.screenshotdir");
-    gc->setLabel(QObject::tr("Directory where Game Screenshot is stored"));
+    gc->setLabel(QObject::tr("Directory where Game Screenshots are stored"));
     gc->setValue(GetConfDir() + "/MythGame/Screenshots");
     gc->setHelpText(QObject::tr("This directory will be the default browse "
                     "location when assigning screenshots."));
@@ -228 +228 @@
     };
 };
 
-
-class ScreenPath : public LineEditSetting, public GameDBStorage
-{
-  public:
-    ScreenPath(const MythGamePlayerSettings &parent) :
-        LineEditSetting(this), GameDBStorage(this, parent, "screenshots")
-    {
-        setLabel(QObject::tr("ScreenShots"));
-        setHelpText(QObject::tr("Path to any screenshots for this player"));
-    };
-};
-
 MythGamePlayerSettings::MythGamePlayerSettings()
 {
     // must be first
@@ -251 +239 @@
     group->addChild(new GameType(*this));
     group->addChild(new Command(*this));
     group->addChild(new RomPath(*this));
-    group->addChild(new ScreenPath(*this));
     group->addChild(new WorkingDirPath(*this));
     group->addChild(new Extensions(*this));
     group->addChild(new AllowMultipleRoms(*this));