Compare commits

..
Author SHA1 Message Date
Mikaël Capelle 3ab86a768b Update translation file. 2021-02-02 20:39:13 +01:00
Jeremy Rimpo b13d9a43b0 [ci skip] Update artifacts paths for msbuild 2021-01-29 10:53:32 -06:00
Mikaël Capelle 4c9e004729 Merge pull request #14 from Holt59/iplugin-isactive-refactoring
IPlugin::isActive refactoring
2020-11-18 10:01:10 +01:00
Mikaël Capelle 384c9a8483 Update following removal of IPlugin::isActive(). 2020-11-11 15:12:24 +01:00
Mikaël Capelle 047cc80b51 Merge pull request #13 from Holt59/installer-callbacks
Set installation file correctly and re-use previously installed file.
2020-09-25 11:27:48 +02:00
Jeremy Rimpo 792e0a3cc3 [skip ci] Use PR branch for umbrella repo (if it exists) 2020-09-25 00:34:11 -05:00
Mikaël Capelle 85ecc1c134 Set installation file correctly and re-use previously installed file. 2020-09-23 21:21:35 +02:00
Jeremy Rimpo 5049593b77 [skip ci] Force exit PS with last exit code after umbrella build error 2020-09-21 06:25:00 -05:00
Jeremy Rimpo 2564071b0b [skip ci] Pull data from all branches 2020-09-21 05:02:19 -05:00
Jeremy Rimpo 328e05eb9b Finalize appveyor script update 2020-09-20 22:34:26 -05:00
Jeremy Rimpo c5944960f7 Convert scripts to PowerShell 2020-09-20 19:56:31 -05:00
Jeremy Rimpo fcda663540 Need extra space for second command 2020-09-20 19:11:44 -05:00
Jeremy Rimpo 0592d5293c Update to checkout current branch in umbrella if it exists 2020-09-20 19:02:28 -05:00
Al 1e34e24e33 Merge pull request #12 from Holt59/multiarchive
Allow user to select archive to install when multiple ones are found.
2020-09-20 07:06:50 -07:00
Mikaël Capelle 50f0cf7266 Allow user to select archive to install when multiple ones are found. 2020-09-10 19:15:34 +02:00
Al ea3d31fe71 Merge pull request #11 from Holt59/use-manager-extensions
Use list of supported extensions from installation manager.
2020-06-11 11:04:21 -07:00
Mikaël Capelle 289663f1cd Use list of supported extensions from installation manager. 2020-06-11 19:45:24 +02:00
Al 7fc63ddfd7 Merge pull request #10 from Holt59/new-filetree
Update for the new file tree implementation
2020-05-20 13:04:22 +02:00
Mikaël Capelle b3f9d0c575 Fix issue with .fomod file not being accepted by the installer. 2020-05-08 22:03:53 +02:00
Mikaël Capelle 2c7e8a417a Switch to the new file tree implementation and clean code. 2020-05-01 18:16:05 +02:00
Silarn aae2c898f0 Appveyor CMAKE fix 2020-05-01 04:58:55 -05:00
isanae 9bb9c301c4 Merge pull request #9 from isanae/new-cmakefiles
New cmakefiles
2020-04-26 02:54:11 -04:00
isanae 558a806ea8 now using new cmakefiles 2020-04-24 23:26:29 -04:00
Chris Bessent 1e1f77ce55 Merge pull request #8 from ModOrganizer2/2_2_2
Pull in 2.2.2.1 changes
2020-01-13 23:03:48 -07:00
Chris Bessent 004135b33d Merge pull request #7 from ModOrganizer2/Develop
Stage for release 2.2.2
2020-01-06 05:02:19 -07:00
Silarn 17fa43b0c1 Update Appveyor to official VS 2019 image 2019-09-28 00:41:34 -05:00
Jeremy Rimpo 9633afaeed Merge pull request #6 from ModOrganizer2/Develop
Stage for release 2.2.1
2019-07-14 17:55:38 -05:00
Silarn 122c3d275c Set optimization for release builds 2019-05-22 02:04:14 -05:00
Silarn cef3001f30 Add logs to build artifacts on CI fail, commit translation changes 2019-05-21 23:46:01 -05:00
Silarn 74f9eb6241 Switch to local build files as appveyor can't use installed files 2019-05-21 02:27:51 -05:00
Silarn 4f4b3a0068 Unify artifacts source path to install path 2019-05-21 01:37:11 -05:00
Silarn aa7f56f1de Set appveyor image to VS 2019 Preview 2019-05-08 23:10:29 -05:00
LostDragonist 64982ed25f Merge pull request #5 from ModOrganizer2/Develop
Stage for Release 2.2.0
2019-05-03 20:55:37 -05:00
Brian Munro d4f562041e Merge pull request #4 from ModOrganizer2/Appveyor
Support Appveyor.
2019-04-28 13:42:07 +02:00
LePresidente 8e971e8c3e Support Appveyor. 2019-04-28 10:08:42 +02:00
LostDragonist bc0465f4dc Merge pull request #3 from ModOrganizer2/Develop
Stage for release 2.1.6
2018-12-20 14:01:24 -06:00
LostDragonist 6a28610a4d Update version to 1.1.0.0 2018-12-12 01:57:11 -06:00
Silarn ab61d00c64 Allow installs to pass Mod ID through (fixes NCC installs losing ID) 2018-09-09 04:12:22 -05:00
Brian Munro f449bd3afe Merge pull request #2 from Modorganizer2/Develop
Stage for 2.1.3 release
2018-05-08 12:21:29 +02:00
Silarn 7222892a10 Updating gitignore 2018-05-04 00:28:36 -05:00
Brian Munro 00c515bace Merge pull request #1 from Modorganizer2/Develop
Merge to Master for Release
2018-04-13 08:55:21 +02:00
Jeremy Rimpo b7d1d4fe9b Remove extraneous search code 2018-04-13 00:38:19 -05:00
Silarn 0b6b898edf Prep for Qt 5.11 (backward-compatible) 2018-04-10 23:28:23 -05:00
Silarn 9c1fb3cb21 Fix up CMAKE to use /MP and allow building through umbrella 2018-04-07 17:12:13 -05:00
LePresidente a6085f8ecc Updated cmakelists to get the QT5 location from the QT_ROOT variable, instead of expecting it in DEPENDENCIES_DIR. 2017-09-21 16:53:16 +02:00
Tannin 907c61cd6f translation 2016-06-04 20:36:04 +02:00
Tannin e86aed98db updated cmake script 2016-05-06 23:11:23 +02:00
Tannin 2af8182e4f using optimization flags from cmake settings 2016-01-10 19:54:20 +01:00
TanninOne ce0063bd50 Merge pull request #1 from ThosRTanner/master
Look harder for bundled archive.
2015-12-06 18:29:03 +01:00
Thomas Tanner f509d34693 Merge remote-tracking branch 'refs/remotes/TanninOne/master' 2015-11-18 20:48:27 +00:00
Tannin 4eef76e09c updated build scripts 2015-11-16 21:39:51 +01:00
ThosRTanner 4fd0260f62 remove trace. 2015-10-10 14:03:30 +01:00
Thomas Tanner eaa12dddf2 Merge remote-tracking branch 'TanninOne/master' 2015-10-10 13:57:08 +01:00
Thomas Tanner 131c91099b Fixes #1269
This makes the bundle installer recurse through (single) directories looking for a valid archive.
2015-10-10 13:49:40 +01:00
Tannin 45b3e8b099 more work on build system 2015-10-09 19:53:52 +02:00
Thomas Tanner 92c42d3545 Merge remote-tracking branch 'TanninOne/master' 2015-10-02 21:51:38 +01:00
Tannin 64dc934891 fixed build system 2015-09-26 23:57:04 +02:00
Tannin 87d1421dd7 updated build system 2015-09-26 12:06:26 +02:00
convert-repo 31052f53b2 update tags 2015-09-07 17:12:37 +00:00
Tannin d81a26aef0 post-merge cleanup 2015-06-08 19:55:00 +02:00
Tom Tanner d2ee67f6a9 Addition of FileNameString clase which ignores case during compares.
Affects rather a lot of stuff.
2015-06-06 15:56:44 +01:00
Tannin 4b1dd8fb81 Merge 2015-05-09 21:46:40 +02:00
Tannin 17c3bc3450 Merge in changes by Tom Tanner 2015-03-27 18:24:37 +01:00
Tom Tanner 8f9b8cf564 Fixed Scons build for existing bits.
Changed pynedit.pro to fetch from 'standard' install location
Changed saveas code to use organizer report rather than uibase - this way it's
not dependant on the vagaries of the include path, and works the same as the
rest of the organiser directory
2015-03-20 10:34:30 +00:00
Tom Tanner 6ef78cf305 Merge with branch1.2 2015-03-18 17:40:29 +00:00
Tom Tanner 729a2d2856 Refactoring and cleanup. 2015-03-18 14:16:04 +00:00
Tom Tanner dc7d96ec8e Every plugin now built 2015-03-17 16:31:15 +00:00
Tannin 6797d50370 Merge with branch1.2 2015-01-03 15:58:52 +01:00
Tannin 1e359abd46 normalized eol style (all files should now have windows line endings) 2014-07-17 22:02:15 +02:00
Tannin 89e0c258e3 - added an option to show meta info on downloads instead of filenames
- MO will now cancel if user tries to run MO vfs-injected
- when saving the MO ini file it is now written to a tmp file first and then overwritten
- updated to link against boost python 1.55
2014-04-23 23:59:30 +02:00
Tannin dbbed655a1 - improved NCC compatibility
- crude support for multi-volume archives
- updated imageformats plugins
- nxmhandler now puts the exe to the top of the list when registering an MO instance, even if it is already in the list
- bugfix: WritePrivateProfileString hook attempted to access lpKeyName even when it is null
2014-03-26 15:35:59 +01:00
Tannin 376e23c34c - nxmhandler now has a ui to modify the proxy-handler
- mo now registers itself with nxmhandler when launching the browser
- pdbs are now generated for plugins
- reverted configurator to pyqt4
2013-06-29 21:10:53 +02:00
Tannin 23cd59932b - completed Qt5 compatibility
- added GetFileVerisonInfoW hook for Windows 8 compatibility
- fixed BossDummy to compile correctly with current version of the RGiesecke.DllExport assembly
- fixed NCC components compiling with different Framewerk versions
- dropped files-list in Nexus-tab of modinfo dialog
2013-06-15 14:42:20 +02:00
Tannin f58df55d2d - 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
2013-06-05 09:51:48 +02:00
Tannin 6da60deda1 Merge with default 2013-03-29 10:12:34 +01:00
Tannin 281bdd40a9 Merge with branch1.0 2013-03-27 21:04:27 +01:00
Tannin 0419f0db69 - support for grouping filters for mod list (incomplete)
- offering multiple options for mod names during installation
- support for renaming profiles
- updated installer plugins
- minor bugfixes
2013-03-22 18:46:40 +01:00
13 changed files with 576 additions and 114 deletions
+5
View File
@@ -0,0 +1,5 @@
edit
CMakeLists.txt.user
/msbuild.log
/*std*.log
/*build
+12
View File
@@ -0,0 +1,12 @@
cmake_minimum_required(VERSION 3.16)
project(installer_bundle)
set(project_type plugin)
set(enable_warnings OFF)
if(DEFINED DEPENDENCIES_DIR)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
else()
include(../cmake_common/project.cmake)
endif()
add_subdirectory(src)
+40
View File
@@ -0,0 +1,40 @@
version: 1.0.{build}
skip_branch_with_pr: true
image: Visual Studio 2019
environment:
WEBHOOK_URL:
secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw=
build_script:
- pwsh: >-
$ErrorActionPreference = 'Stop'
git clone --depth=1 --no-single-branch https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella
New-Item -ItemType Directory -Path c:\projects\modorganizer-build
cd c:\projects\modorganizer-umbrella
($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH -eq $null) ? ($branch = $env:APPVEYOR_REPO_BRANCH) : ($branch = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH)
git checkout $(git show-ref --verify --quiet refs/remotes/origin/${branch} || echo '-b') ${branch}
C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True ${env:APPVEYOR_PROJECT_NAME}
if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode ) }
artifacts:
- path: vsbuild\src\RelWithDebInfo\installer_bundle.dll
name: installer_bundle_dll
- path: vsbuild\src\RelWithDebInfo\installer_bundle.pdb
name: installer_bundle_pdb
- path: vsbuild\src\RelWithDebInfo\installer_bundle.lib
name: installer_bundle_lib
on_success:
- ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
- ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
- ps: ./send.ps1 success $env:WEBHOOK_URL
on_failure:
- ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER
- ps: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stdout.log
- ps: Push-AppveyorArtifact ${env:APPVEYOR_BUILD_FOLDER}\stderr.log
- ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1
- ps: ./send.ps1 failure $env:WEBHOOK_URL
+6
View File
@@ -0,0 +1,6 @@
cmake_minimum_required(VERSION 3.16)
if(DEFINED DEPENDENCIES_DIR)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake)
else()
include(../../cmake_common/src.cmake)
endif()
+15
View File
@@ -0,0 +1,15 @@
Import('qt_env')
env = qt_env.Clone()
env.DisableQtModules('Gui')
env.AppendUnique(CPPDEFINES = [ 'INSTALLERBUNDLE_LIBRARY' ])
# Sigh
env['CPPPATH'] += [ '.' ]
lib = env.SharedLibrary('installerBundle', env.Glob('*.cpp'))
env.InstallModule(lib)
res = env['QT_USED_MODULES']
Return('res')
+9
View File
@@ -12,6 +12,11 @@ TEMPLATE = lib
CONFIG += plugins
CONFIG += dll
CONFIG(release, debug|release) {
QMAKE_CXXFLAGS += /Zi
QMAKE_LFLAGS += /DEBUG
}
DEFINES += INSTALLERBUNDLE_LIBRARY
SOURCES += installerbundle.cpp
@@ -20,3 +25,7 @@ HEADERS += installerbundle.h
include(../plugin_template.pri)
OTHER_FILES += \
installerbundle.json\
SConscript
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
<name>InstallerBundle</name>
<message>
<location filename="installerbundle.cpp" line="48"/>
<source>Bundle Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="installerbundle.cpp" line="58"/>
<source>Proxy-Installer to handle bundles containing the actual mod archive</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MultiArchiveDialog</name>
<message>
<location filename="multiarchivedialog.ui" line="14"/>
<source>Bundled archives</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="multiarchivedialog.ui" line="20"/>
<source>This archive contains multiple archives that can be installed separately. Please select the archive you want to extract and install.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="multiarchivedialog.ui" line="35"/>
<location filename="multiarchivedialog.ui" line="38"/>
<source>Opens a Dialog that allows custom modifications.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="multiarchivedialog.ui" line="41"/>
<source>Manual</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="multiarchivedialog.ui" line="64"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
+176 -81
View File
@@ -17,84 +17,179 @@ You should have received a copy of the GNU General Public License
along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#include "installerbundle.h"
#include "iinstallationmanager.h"
#include <QtPlugin>
InstallerBundle::InstallerBundle()
{
}
bool InstallerBundle::init(IOrganizer*)
{
return true;
}
QString InstallerBundle::name() const
{
return "Bundle Installer";
}
QString InstallerBundle::author() const
{
return "Tannin";
}
QString InstallerBundle::description() const
{
return tr("Proxy-Installer to handle bundles containing the actual mod archive");
}
VersionInfo InstallerBundle::version() const
{
return VersionInfo(1, 0, 0, VersionInfo::RELEASE_FINAL);
}
bool InstallerBundle::isActive() const
{
return true;
}
QList<PluginSetting> InstallerBundle::settings() const
{
return QList<PluginSetting>();
}
unsigned int InstallerBundle::priority() const
{
return 10;
}
bool InstallerBundle::isManualInstaller() const
{
return false;
}
bool InstallerBundle::isArchiveSupported(const DirectoryTree &tree) const
{
for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
fileIter != tree.leafsEnd(); ++fileIter) {
if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
return true;
}
}
return false;
}
IPluginInstaller::EInstallResult InstallerBundle::install(QString &modName, DirectoryTree &tree)
{
for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
fileIter != tree.leafsEnd(); ++fileIter) {
if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
QString tempFile = manager()->extractFile(fileIter->getName());
return manager()->installArchive(modName, tempFile);
}
}
return IPluginInstaller::RESULT_NOTATTEMPTED;
}
Q_EXPORT_PLUGIN2(installerBundle, InstallerBundle)
#include "installerbundle.h"
#include "iinstallationmanager.h"
#include <QtPlugin>
#include "multiarchivedialog.h"
using namespace MOBase;
InstallerBundle::InstallerBundle()
{
}
bool InstallerBundle::init(IOrganizer *organizer)
{
m_Organizer = organizer;
return true;
}
QString InstallerBundle::name() const
{
return "Bundle Installer";
}
QString InstallerBundle::localizedName() const
{
return tr("Bundle Installer");
}
QString InstallerBundle::author() const
{
return "Tannin";
}
QString InstallerBundle::description() const
{
return tr("Proxy-Installer to handle bundles containing the actual mod archive");
}
VersionInfo InstallerBundle::version() const
{
return VersionInfo(1, 1, 0, VersionInfo::RELEASE_FINAL);
}
QList<PluginSetting> InstallerBundle::settings() const
{
return {
PluginSetting("auto_reinstall", "when reinstalling from an archive containing multiple mods, automatically select the previously installed", true)
};
}
unsigned int InstallerBundle::priority() const
{
return 10;
}
bool InstallerBundle::isManualInstaller() const
{
return false;
}
void InstallerBundle::onInstallationStart(QString const& archive, bool reinstallation, IModInterface* currentMod)
{
// We reset some field and fetch the previously installed file:
m_InstallationFile = archive;
m_InstallerUsed = false;
m_SelectedFile = "";
m_PreviousFile = "";
if (reinstallation && m_Organizer->pluginSetting(name(), "auto_reinstall").toBool()) {
m_PreviousFile = currentMod->pluginSetting(name(), "archive", QString()).toString();
}
}
void InstallerBundle::onInstallationEnd(EInstallResult result, IModInterface* newMod)
{
if (result == EInstallResult::RESULT_SUCCESS && m_InstallerUsed) {
newMod->setInstallationFile(m_InstallationFile);
if (!m_SelectedFile.isEmpty()) {
newMod->setPluginSetting(name(), "archive", m_SelectedFile);
}
}
}
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> InstallerBundle::findObjects(std::shared_ptr<const IFileTree> tree) const
{
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries;
// Check if we have an archive:
auto managerExtensions = manager()->getSupportedExtensions();
// Look for a file with a valid extension:
int nDirs = 0;
for (auto entry : *tree) {
if (entry->isFile()) {
if (managerExtensions.contains(entry->suffix(), FileNameComparator::CaseSensitivity)) {
entries.push_back(entry);
}
}
else {
nDirs++;
}
}
if (!entries.empty()) {
return entries;
}
// Arguably this should also check the name of the directory we're looking at
// is the same as the module name:
if (nDirs != 1) {
return {};
}
// Retrieve the first folder which is the first item:
return findObjects(tree->at(0)->astree());
}
bool InstallerBundle::isArchiveSupported(std::shared_ptr<const IFileTree> tree) const
{
return !findObjects(tree).empty();
}
IPluginInstaller::EInstallResult InstallerBundle::install(
GuessedValue<QString>& modName, std::shared_ptr<IFileTree>& tree, QString&, int &modId)
{
// Find a valid "object":
auto entries = findObjects(tree);
if (entries.empty()) {
return IPluginInstaller::RESULT_NOTATTEMPTED;
}
std::shared_ptr<const FileTreeEntry> entry = nullptr;
if (entries.size() == 1) {
entry = entries[0];
}
else {
if (!m_PreviousFile.isEmpty()) {
entry = tree->find(m_PreviousFile);
}
if (entry == nullptr) {
MultiArchiveDialog dialog(entries, parentWidget());
if (dialog.exec() == QDialog::Accepted) {
entry = dialog.selectedEntry();
m_SelectedFile = entry->pathFrom(tree);
}
else {
if (dialog.manualRequested()) {
return IPluginInstaller::RESULT_MANUALREQUESTED;
}
else {
return IPluginInstaller::RESULT_CANCELED;
}
}
}
}
if (entry == nullptr) {
return IPluginInstaller::RESULT_CANCELED;
}
m_InstallerUsed = true;
// Extract it:
QString tempFile = manager()->extractFile(entry);
IPluginInstaller::EInstallResult res = manager()->installArchive(modName, tempFile, modId);
if (res == IPluginInstaller::RESULT_SUCCESS) {
res = IPluginInstaller::RESULT_SUCCESSCANCEL;
}
return res;
}
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
Q_EXPORT_PLUGIN2(installerBundle, InstallerBundle)
#endif
+69 -33
View File
@@ -1,52 +1,88 @@
/*
Copyright (C) 2012 Sebastian Herbord. All rights reserved.
This file is part of Mod Organizer.
Mod Organizer is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Mod Organizer is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Copyright (C) 2012 Sebastian Herbord. All rights reserved.
This file is part of Mod Organizer.
Mod Organizer is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Mod Organizer is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef INSTALLERBUNDLE_H
#define INSTALLERBUNDLE_H
#include <iplugininstallersimple.h>
class InstallerBundle : public IPluginInstallerSimple
class InstallerBundle : public MOBase::IPluginInstallerSimple
{
Q_OBJECT
Q_INTERFACES(IPlugin IPluginInstaller IPluginInstallerSimple)
Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple)
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
Q_PLUGIN_METADATA(IID "org.tannin.InstallerBundle" FILE "installerbundle.json")
#endif
public:
InstallerBundle();
virtual bool init(IOrganizer *moInfo);
virtual QString name() const;
virtual QString author() const;
virtual QString description() const;
virtual VersionInfo version() const;
virtual bool isActive() const;
virtual QList<PluginSetting> settings() const;
virtual bool init(MOBase::IOrganizer* moInfo) override;
virtual QString name() const override;
virtual QString localizedName() const override;
virtual QString author() const override;
virtual QString description() const override;
virtual MOBase::VersionInfo version() const override;
virtual QList<MOBase::PluginSetting> settings() const override;
virtual unsigned int priority() const;
virtual bool isManualInstaller() const;
virtual unsigned int priority() const override;
virtual bool isManualInstaller() const override;
virtual bool isArchiveSupported(const DirectoryTree &tree) const;
virtual EInstallResult install(QString &modName, DirectoryTree &tree);
virtual void onInstallationStart(QString const& archive, bool reinstallation, MOBase::IModInterface* currentMod) override;
virtual void onInstallationEnd(EInstallResult result, MOBase::IModInterface* newMod) override;
virtual bool isArchiveSupported(std::shared_ptr<const MOBase::IFileTree> tree) const override;
virtual EInstallResult install(MOBase::GuessedValue<QString> &modName,
std::shared_ptr<MOBase::IFileTree> &tree,
QString &version, int &modID) override;
private:
/**
* @brief Find the entries that can be extracted from this archive.
*
* @param tree The tree to look the entry in.
*
* @return the entry, if one was found, or a null pointer.
*/
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> findObjects(std::shared_ptr<const MOBase::IFileTree> tree) const;
private:
MOBase::IOrganizer* m_Organizer;
// The archive being installed:
QString m_InstallationFile;
// Indicates if this installer was used during the installation process:
bool m_InstallerUsed;
// Contains the file installed (when multiple archives are present), or an
// empty string:
QString m_SelectedFile;
// Contains the file previously installed (when multiple archives are present), or an
// empty string:
QString m_PreviousFile;
};
View File
+44
View File
@@ -0,0 +1,44 @@
#include "multiarchivedialog.h"
#include "ui_multiarchivedialog.h"
using namespace MOBase;
MultiArchiveDialog::MultiArchiveDialog(
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries, QWidget* parent)
: QDialog(parent), ui(new Ui::MultiArchiveDialog), m_Manual(false), m_SelectedEntry(nullptr)
{
ui->setupUi(this);
auto layout = ui->middleLayout;
for (auto& entry : entries) {
QPushButton* button = new QPushButton(entry->name(), this);
button->setStyleSheet("text-align: left; padding: 10px; font-weight: bold;");
layout->addWidget(button);
connect(button, &QPushButton::clicked, [this, entry]() {
m_SelectedEntry = entry;
this->accept();
});
}
}
MultiArchiveDialog::~MultiArchiveDialog()
{
delete ui;
}
void MultiArchiveDialog::on_cancelBtn_clicked()
{
this->reject();
}
void MultiArchiveDialog::on_manualBtn_clicked()
{
m_Manual = true;
this->reject();
}
+77
View File
@@ -0,0 +1,77 @@
/*
Copyright (C) 2012 Sebastian Herbord. All rights reserved.
This file is part of Mod Organizer.
Mod Organizer is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Mod Organizer is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef BAINCOMPLEXINSTALLERDIALOG_H
#define BAINCOMPLEXINSTALLERDIALOG_H
#include <vector>
#include <QDialog>
#include "ifiletree.h"
namespace Ui {
class MultiArchiveDialog;
}
/**
*
**/
class MultiArchiveDialog: public QDialog
{
Q_OBJECT
public:
/**
* @brief Constructor
*
* @param tree the directory tree of the archive. The caller is resonsible to verify this actually qualifies as a bain installer
* @param modName proposed name for the mod. The dialog allows the user to change this
* @param packageTXT path to the extracted package.txt file or an empty string if there is none
* @param parent parent widget
**/
explicit MultiArchiveDialog(std::vector<std::shared_ptr<const MOBase::FileTreeEntry>> entries, QWidget *parent);
~MultiArchiveDialog();
/**
* @return bool true if the user requested the manual dialog
**/
bool manualRequested() const { return m_Manual; }
/**
* @return QString the (user-modified) name to be used for the mod
**/
auto selectedEntry() const { return m_SelectedEntry; }
private slots:
void on_manualBtn_clicked();
void on_cancelBtn_clicked();
private:
Ui::MultiArchiveDialog *ui;
bool m_Manual;
std::shared_ptr<const MOBase::FileTreeEntry> m_SelectedEntry;
};
#endif // BAINCOMPLEXINSTALLERDIALOG_H
+77
View File
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MultiArchiveDialog</class>
<widget class="QDialog" name="MultiArchiveDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>424</width>
<height>146</height>
</rect>
</property>
<property name="windowTitle">
<string>Bundled archives</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>This archive contains multiple archives that can be installed separately. Please select the archive you want to extract and install.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="middleLayout"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="manualBtn">
<property name="toolTip">
<string>Opens a Dialog that allows custom modifications.</string>
</property>
<property name="whatsThis">
<string>Opens a Dialog that allows custom modifications.</string>
</property>
<property name="text">
<string>Manual</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="cancelBtn">
<property name="text">
<string>Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>