From 0cac03cdf6cbfb7634a5f3875814b4c1aabe8714 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Wed, 30 Jan 2019 22:16:38 -0600 Subject: Always display at least 3 segments of version info for MO itself --- src/main.cpp | 2 +- src/mainwindow.cpp | 4 ++-- src/modlist.cpp | 2 +- src/nexusinterface.cpp | 2 +- src/selfupdater.cpp | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/main.cpp b/src/main.cpp index 190a8f4b..0f6d7048 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -446,7 +446,7 @@ static void preloadSsl() static QString getVersionDisplayString() { - return createVersionInfo().displayString(); + return createVersionInfo().displayString(3); } int runApplication(MOApplication &application, SingleInstance &instance, diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 9904845b..d35d9951 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -502,7 +502,7 @@ void MainWindow::updateWindowTitle(const QString &accountName, bool premium) { QString title = QString("%1 Mod Organizer v%2").arg( m_OrganizerCore.managedGame()->gameName(), - m_OrganizerCore.getVersion().displayString()); + m_OrganizerCore.getVersion().displayString(3)); if (!accountName.isEmpty()) { title.append(QString(" (%1%2)").arg(accountName, premium ? "*" : "")); @@ -719,7 +719,7 @@ size_t MainWindow::checkForProblems() void MainWindow::about() { - AboutDialog dialog(m_OrganizerCore.getVersion().displayString(), this); + AboutDialog dialog(m_OrganizerCore.getVersion().displayString(3), this); connect(&dialog, SIGNAL(linkClicked(QString)), this, SLOT(linkClicked(QString))); dialog.exec(); } diff --git a/src/modlist.cpp b/src/modlist.cpp index 224818c8..62c186a4 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -449,7 +449,7 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const return QString(); } } else if (column == COL_VERSION) { - QString text = tr("installed version: \"%1\", newest version: \"%2\"").arg(modInfo->getVersion().displayString()).arg(modInfo->getNewestVersion().displayString()); + QString text = tr("installed version: \"%1\", newest version: \"%2\"").arg(modInfo->getVersion().displayString(3)).arg(modInfo->getNewestVersion().displayString(3)); if (modInfo->downgradeAvailable()) { text += "
" + tr("The newest version on Nexus seems to be older than the one you have installed. This could either mean the version you have has been withdrawn " "(i.e. due to a bug) or the author uses a non-standard versioning scheme and that newest version is actually newer. " diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp index c6f05405..993ae41e 100644 --- a/src/nexusinterface.cpp +++ b/src/nexusinterface.cpp @@ -149,7 +149,7 @@ NexusInterface::NexusInterface(PluginContainer *pluginContainer) { m_MOVersion = createVersionInfo(); - m_AccessManager = new NXMAccessManager(this, m_MOVersion.displayString()); + m_AccessManager = new NXMAccessManager(this, m_MOVersion.displayString(3)); m_DiskCache = new QNetworkDiskCache(this); connect(m_AccessManager, SIGNAL(requestNXMDownload(QString)), this, SLOT(downloadRequestedNXM(QString))); } diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index b5e7684c..37700e08 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -145,15 +145,15 @@ void SelfUpdater::testForUpdate() if (newestVer > this->m_MOVersion) { m_UpdateCandidate = newest; qDebug("update available: %s -> %s", - qUtf8Printable(this->m_MOVersion.displayString()), - qUtf8Printable(newestVer.displayString())); + qUtf8Printable(this->m_MOVersion.displayString(3)), + qUtf8Printable(newestVer.displayString(3))); emit updateAvailable(); } else if (newestVer < this->m_MOVersion) { // this could happen if the user switches from using prereleases to // stable builds. Should we downgrade? qDebug("This version is newer than the latest released one: %s -> %s", - qUtf8Printable(this->m_MOVersion.displayString()), - qUtf8Printable(newestVer.displayString())); + qUtf8Printable(this->m_MOVersion.displayString(3)), + qUtf8Printable(newestVer.displayString(3))); } } }); -- cgit v1.3.1