summaryrefslogtreecommitdiff
path: root/src/installationmanager.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-06-05 09:51:48 +0200
committerTannin <devnull@localhost>2013-06-05 09:51:48 +0200
commit1606c1366f5d0ba304334b0e57680fb99feb88b9 (patch)
tree2023762f0c10f3c8801ffc4f0d0d1b4c1f40ffbc /src/installationmanager.cpp
parent8077c1ad7324e44059fbdc89401eaeb774b8cb84 (diff)
- install plugins now get a chance to update name, version and modid of mods
- NCC now makes name, version and modid from the info.xml file available to the installer - integrated fomod installer also uses version and modid from the info.xml - mods can now be renamed during installation - configurator plugin now highlights changed keys and saves changes
Diffstat (limited to 'src/installationmanager.cpp')
-rw-r--r--src/installationmanager.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 98a8a760..75ab11a3 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -68,7 +68,7 @@ template <typename T> T resolveFunction(QLibrary &lib, const char *name)
InstallationManager::InstallationManager(QWidget *parent)
: QObject(parent), m_ParentWidget(parent),
- m_InstallationProgress(parent), m_SupportedExtensions() //boost::assign::list_of("zip")("rar")("7z")("fomod")
+ m_InstallationProgress(parent), m_SupportedExtensions(boost::assign::list_of("zip")("rar")("7z")("fomod"))
{
QLibrary archiveLib("dlls\\archive.dll");
if (!archiveLib.load()) {
@@ -695,10 +695,9 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
try {
{ // simple case
IPluginInstallerSimple *installerSimple = dynamic_cast<IPluginInstallerSimple*>(installer);
-
if ((installerSimple != NULL) &&
(filesTree != NULL) && (installer->isArchiveSupported(*filesTree))) {
- installResult = installerSimple->install(modName, *filesTree);
+ installResult = installerSimple->install(modName, *filesTree, version, modID);
if (installResult == IPluginInstaller::RESULT_SUCCESS) {
mapToArchive(filesTree);
// the simple installer only prepares the installation, the rest works the same for all installers
@@ -716,7 +715,7 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
((filesTree == NULL) && installerCustom->isArchiveSupported(fileName)))) {
std::set<QString> installerExtensions = installerCustom->supportedExtensions();
if (installerExtensions.find(fileInfo.suffix()) != installerExtensions.end()) {
- installResult = installerCustom->install(modName, fileName);
+ installResult = installerCustom->install(modName, fileName, version, modID);
}
}
}