More work on the downloader and 1.6 instance creation

This commit is contained in:
Petr Mrázek
2013-07-14 18:33:31 +02:00
parent c96ac24605
commit 33b9b25da7
7 changed files with 87 additions and 36 deletions

View File

@ -80,16 +80,7 @@ class LIBMULTIMC_EXPORT Instance : public QObject
* This returns true if shouldForceUpdate game is true or if the intended and
* current versions don't match.
*/
Q_PROPERTY(bool shouldUpdateGame READ shouldUpdateGame STORED false)
/*!
* Whether or not the game will be forced to update on the next launch.
* If this is set to true, shouldUpdateGame will be true, regardless of whether or not
* the current and intended versions match.
* It should be noted that this is set to false automatically when game updates are run.
*/
Q_PROPERTY(bool shouldForceUpdateGame READ shouldForceUpdateGame WRITE setShouldForceUpdateGame)
Q_PROPERTY(bool shouldUpdate READ shouldUpdate WRITE setShouldUpdate)
/*!
* The instance's current version.
@ -236,14 +227,17 @@ public:
virtual QString intendedVersion() const { return settings().get("IntendedJarVersion").toString(); }
virtual void setIntendedVersion(QString val) { settings().set("IntendedJarVersion", val); }
virtual bool shouldUpdateGame() const
{ return shouldForceUpdateGame() || intendedVersion() != currentVersion(); }
virtual bool shouldForceUpdateGame() const { return settings().get("ShouldForceUpdate").toBool(); }
virtual void setShouldForceUpdateGame(bool val) { settings().set("ShouldForceUpdate", val); }
virtual bool shouldUpdate() const
{
QVariant var = settings().get("ShouldUpdate");
if(!var.isValid() || var.toBool() == false)
{
return intendedVersion() != currentVersion();
}
return true;
}
virtual void setShouldUpdate(bool val) { settings().set("ShouldUpdate", val); }
//// Timestamps ////
virtual qint64 lastLaunch() const { return settings().get("lastLaunchTime").value<qint64>(); }