Compare commits

...
4 Commits
Author SHA1 Message Date
Mikaël Capelle 9c130cbf2f Bump version to 2.5.2. (#2090) 2024-08-04 09:58:53 +02:00
Mikaël Capelle ea38fdc6ce Replace chopped by mid in download list. (#2089) 2024-08-03 13:37:39 +02:00
Mikaël Capelle 89f39ef200 Bump version to 2.5.2rc2. (#2084) 2024-08-01 10:58:31 +02:00
Mikaël Capelle acd201157d Move slot connections to avoid issue when starting MO2 to download a NXM link. (#2082)
* Move slot connections to avoid issue when starting MO2 to download a NXM link.
2024-08-01 10:40:44 +02:00
6 changed files with 123 additions and 134 deletions
+1 -1
View File
@@ -221,7 +221,7 @@ QVariant DownloadList::data(const QModelIndex& index, int role) const
.arg(info->modName)
.arg(m_manager.getModID(index.row()))
.arg(info->version.canonicalString())
.arg(info->description.chopped(4096));
.arg(info->description.mid(0, 4096));
}
return text;
}
+3 -15
View File
@@ -407,16 +407,9 @@ MainWindow::MainWindow(Settings& settings, OrganizerCore& organizerCore,
SLOT(nexusApi()));
connect(NexusInterface::instance().getAccessManager(),
SIGNAL(credentialsReceived(const APIUserAccount&)), this,
SLOT(updateWindowTitle(const APIUserAccount&)));
connect(NexusInterface::instance().getAccessManager(),
SIGNAL(credentialsReceived(const APIUserAccount&)),
&NexusInterface::instance(), SLOT(setUserAccount(const APIUserAccount&)));
connect(&NexusInterface::instance(),
SIGNAL(requestsChanged(const APIStats&, const APIUserAccount&)), this,
SLOT(onRequestsChanged(const APIStats&, const APIUserAccount&)));
&NXMAccessManager::credentialsReceived, this, &MainWindow::updateWindowTitle);
connect(&NexusInterface::instance(), &NexusInterface::requestsChanged, ui->statusBar,
&StatusBar::setAPI);
connect(&TutorialManager::instance(), SIGNAL(windowTutorialFinished(QString)), this,
SLOT(windowTutorialFinished(QString)));
@@ -658,11 +651,6 @@ void MainWindow::updateWindowTitle(const APIUserAccount& user)
this->setWindowTitle(title);
}
void MainWindow::onRequestsChanged(const APIStats& stats, const APIUserAccount& user)
{
ui->statusBar->setAPI(stats, user);
}
void MainWindow::resizeLists(bool pluginListCustom)
{
// ensure the columns aren't so small you can't see them any more
-2
View File
@@ -385,8 +385,6 @@ private slots:
void nxmRequestFailed(QString gameName, int modID, int fileID, QVariant userData,
int requestID, int errorCode, const QString& errorString);
void onRequestsChanged(const APIStats& stats, const APIUserAccount& user);
void modRenamed(const QString& oldName, const QString& newName);
void modRemoved(const QString& fileName);
+5 -2
View File
@@ -280,8 +280,11 @@ NexusInterface::NexusInterface(Settings* s) : m_PluginContainer(nullptr)
m_DiskCache = new QNetworkDiskCache(this);
connect(m_AccessManager, SIGNAL(requestNXMDownload(QString)), this,
SLOT(downloadRequestedNXM(QString)));
connect(m_AccessManager, &NXMAccessManager::requestNXMDownload, this,
&NexusInterface::downloadRequestedNXM);
connect(m_AccessManager, &NXMAccessManager::credentialsReceived, this,
&NexusInterface::setUserAccount);
}
NexusInterface::~NexusInterface()
+111 -111
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -4,13 +4,13 @@
// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
#define VER_FILEVERSION 2,5,2
#define VER_FILEVERSION_STR "2.5.2rc1\0"
#define VER_FILEVERSION_STR "2.5.2\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_FILEVERSION
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS VS_FF_PRERELEASE
FILEFLAGS (0)
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE (0)
@@ -24,7 +24,7 @@ BEGIN
VALUE "FileDescription", "Mod Organizer 2 GUI\0"
VALUE "OriginalFilename", "ModOrganizer.exe\0"
VALUE "InternalName", "ModOrganizer2\0"
VALUE "LegalCopyright", "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2023 Mod Organizer 2 contributors\0"
VALUE "LegalCopyright", "Copyright 2011-2016 Sebastian Herbord\r\nCopyright 2016-2024 Mod Organizer 2 contributors\0"
VALUE "ProductName", "Mod Organizer 2\0"
VALUE "ProductVersion", VER_FILEVERSION_STR
END