Compare commits

...
Author SHA1 Message Date
Mikaël Capelle 7a108fae23 Update Github action. 2025-05-28 14:01:52 +02:00
Mikaël Capelle b097ae085f Move to VCPKG. 2025-05-25 18:31:21 +02:00
Mikaël Capelle eeef5840df Merge pull request #18 from ModOrganizer2/dev/update-translations
Update translations.
2024-07-21 17:04:48 +02:00
Mikaël Capelle b23695116a Update translations. 2024-07-21 16:47:31 +02:00
Mikaël Capelle 522bc53e7b Merge pull request #16 from ModOrganizer2/dev/format-and-gh-actions 2024-06-09 14:10:37 +02:00
Mikaël Capelle 288e1b93c4 Add github actions. 2024-06-09 14:01:58 +02:00
Mikaël Capelle 5995bce5e6 Add .git-blame-ignore-revs. 2024-06-09 13:47:44 +02:00
Mikaël Capelle 988523cac1 Format files and add .gitattributes and .clang-format. 2024-06-09 13:47:44 +02:00
Mikaël Capelle 71b82656b1 Remove appveyor.yml. 2024-06-09 13:47:43 +02:00
Mikaël Capelle 6d89f9da86 Merge pull request #15 from ModOrganizer2/update-cmake-common-qt6
Update following cmake_common changes.
2022-04-28 18:16:31 +02:00
Mikaël Capelle 12d509e2d6 Update following cmake_common changes. 2022-04-19 23:33:24 +02:00
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
19 changed files with 614 additions and 92 deletions
+41
View File
@@ -0,0 +1,41 @@
---
# We'll use defaults from the LLVM style, but with 4 columns indentation.
BasedOnStyle: LLVM
IndentWidth: 2
---
Language: Cpp
DeriveLineEnding: false
UseCRLF: true
DerivePointerAlignment: false
PointerAlignment: Left
AlignConsecutiveAssignments: true
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: Never
AllowShortLambdasOnASingleLine: Empty
AlwaysBreakTemplateDeclarations: Yes
AccessModifierOffset: -2
AlignTrailingComments: true
SpacesBeforeTrailingComments: 2
NamespaceIndentation: Inner
MaxEmptyLinesToKeep: 1
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: false
AfterClass: true
AfterControlStatement: false
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: true
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: true
ColumnLimit: 88
ForEachMacros: ['Q_FOREACH', 'foreach']
+1
View File
@@ -0,0 +1 @@
988523cac10641c510fd711d80d59c82d473f6a5
+7
View File
@@ -0,0 +1,7 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.cpp text eol=crlf
*.h text eol=crlf
+20
View File
@@ -0,0 +1,20 @@
name: Build Installer Bundle
on:
push:
branches: [master]
pull_request:
types: [opened, synchronize, reopened]
env:
VCPKG_BINARY_SOURCES: clear;x-azblob,${{ vars.AZ_BLOB_VCPKG_URL }},${{ secrets.AZ_BLOB_SAS }},readwrite
jobs:
build:
runs-on: windows-2022
steps:
- name: Build Installer Bundle
id: build-installer-bundle
uses: ModOrganizer2/build-with-mob-action
with:
mo2-dependencies: uibase
+16
View File
@@ -0,0 +1,16 @@
name: Lint Installer Bundle Plugin
on:
push:
pull_request:
types: [opened, synchronize, reopened]
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Check format
uses: ModOrganizer2/check-formatting-action@master
with:
check-path: "."
+5
View File
@@ -0,0 +1,5 @@
edit
CMakeLists.txt.user
/msbuild.log
/*std*.log
/*build
+20
View File
@@ -0,0 +1,20 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-merge-conflict
- id: check-case-conflict
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v19.1.5
hooks:
- id: clang-format
'types_or': [c++, c]
ci:
autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
autofix_prs: true
autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
autoupdate_schedule: quarterly
submodules: false
+5
View File
@@ -0,0 +1,5 @@
cmake_minimum_required(VERSION 3.16)
project(installer_bundle)
add_subdirectory(src)
+67
View File
@@ -0,0 +1,67 @@
{
"configurePresets": [
{
"errors": {
"deprecated": true
},
"hidden": true,
"name": "cmake-dev",
"warnings": {
"deprecated": true,
"dev": true
}
},
{
"cacheVariables": {
"VCPKG_MANIFEST_NO_DEFAULT_FEATURES": {
"type": "BOOL",
"value": "ON"
}
},
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"hidden": true,
"name": "vcpkg"
},
{
"hidden": true,
"inherits": ["vcpkg"],
"name": "vcpkg-dev"
},
{
"binaryDir": "${sourceDir}/vsbuild",
"architecture": {
"strategy": "set",
"value": "x64"
},
"cacheVariables": {
"CMAKE_CXX_FLAGS": "/EHsc /MP /W4",
"VCPKG_TARGET_TRIPLET": {
"type": "STRING",
"value": "x64-windows-static-md"
}
},
"generator": "Visual Studio 17 2022",
"inherits": ["cmake-dev", "vcpkg-dev"],
"name": "vs2022-windows",
"toolset": "v143"
},
{
"cacheVariables": {
"VCPKG_MANIFEST_FEATURES": {
"type": "STRING",
"value": "standalone"
}
},
"inherits": "vs2022-windows",
"name": "vs2022-windows-standalone"
}
],
"buildPresets": [
{
"name": "vs2022-windows",
"resolvePackageReferences": "on",
"configurePreset": "vs2022-windows"
}
],
"version": 4
}
+8
View File
@@ -0,0 +1,8 @@
find_package(mo2-cmake CONFIG REQUIRED)
find_package(mo2-uibase CONFIG REQUIRED)
add_library(installer_bundle SHARED)
mo2_configure_plugin(installer_bundle WARNINGS OFF)
target_link_libraries(installer_bundle PRIVATE mo2::uibase)
mo2_install_plugin(installer_bundle)
-30
View File
@@ -1,30 +0,0 @@
#-------------------------------------------------
#
# Project created by QtCreator 2013-01-03T13:31:41
#
#-------------------------------------------------
QT -= gui
TARGET = installerBundle
TEMPLATE = lib
CONFIG += plugins
CONFIG += dll
CONFIG(release, debug|release) {
QMAKE_CXXFLAGS += /Zi
QMAKE_LFLAGS += /DEBUG
}
DEFINES += INSTALLERBUNDLE_LIBRARY
SOURCES += installerbundle.cpp
HEADERS += installerbundle.h
include(../plugin_template.pri)
OTHER_FILES += \
installerbundle.json
+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="45"/>
<source>Bundle Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="installerbundle.cpp" line="55"/>
<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>
+117 -42
View File
@@ -18,21 +18,20 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/
#include "installerbundle.h"
#include "iinstallationmanager.h"
#include <QtPlugin>
#include <uibase/iinstallationmanager.h>
#include "multiarchivedialog.h"
using namespace MOBase;
InstallerBundle::InstallerBundle() {}
InstallerBundle::InstallerBundle()
{
}
bool InstallerBundle::init(IOrganizer*)
bool InstallerBundle::init(IOrganizer* organizer)
{
m_Organizer = organizer;
return true;
}
@@ -41,6 +40,11 @@ QString InstallerBundle::name() const
return "Bundle Installer";
}
QString InstallerBundle::localizedName() const
{
return tr("Bundle Installer");
}
QString InstallerBundle::author() const
{
return "Tannin";
@@ -53,17 +57,15 @@ QString InstallerBundle::description() const
VersionInfo InstallerBundle::version() const
{
return VersionInfo(1, 0, 0, VersionInfo::RELEASE_FINAL);
}
bool InstallerBundle::isActive() const
{
return true;
return VersionInfo(1, 1, 0, VersionInfo::RELEASE_FINAL);
}
QList<PluginSetting> InstallerBundle::settings() const
{
return QList<PluginSetting>();
return {PluginSetting("auto_reinstall",
"when reinstalling from an archive containing multiple mods, "
"automatically select the previously installed",
true)};
}
unsigned int InstallerBundle::priority() const
@@ -76,44 +78,117 @@ bool InstallerBundle::isManualInstaller() const
return false;
}
bool InstallerBundle::isArchiveSupported(const DirectoryTree &tree) const
void InstallerBundle::onInstallationStart(QString const& archive, bool reinstallation,
IModInterface* currentMod)
{
for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
fileIter != tree.leafsEnd(); ++fileIter) {
if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
return true;
// 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);
}
}
if ((tree.numNodes() == 0)
&& (tree.numLeafs() == 1)
&& (tree.leafsBegin()->getName().endsWith(".7z", Qt::CaseInsensitive)
|| tree.leafsBegin()->getName().endsWith(".rar", Qt::CaseInsensitive))) {
// nested archive
return true;
}
return false;
}
IPluginInstaller::EInstallResult InstallerBundle::install(GuessedValue<QString> &modName, DirectoryTree &tree,
QString&, int&)
std::vector<std::shared_ptr<const MOBase::FileTreeEntry>>
InstallerBundle::findObjects(std::shared_ptr<const IFileTree> tree) const
{
for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
fileIter != tree.leafsEnd(); ++fileIter) {
QString name = fileIter->getName();
if (name.endsWith(".fomod", Qt::CaseInsensitive)
|| name.endsWith(".7z", Qt::CaseInsensitive)
|| name.endsWith(".rar", Qt::CaseInsensitive)) {
QString tempFile = manager()->extractFile(fileIter->getName());
IPluginInstaller::EInstallResult res = manager()->installArchive(modName, tempFile);
if (res == IPluginInstaller::RESULT_SUCCESS) {
res = IPluginInstaller::RESULT_SUCCESSCANCEL;
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);
}
return res;
} else {
nDirs++;
}
}
return IPluginInstaller::RESULT_NOTATTEMPTED;
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());
}
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
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
+51 -20
View File
@@ -20,38 +20,69 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#ifndef INSTALLERBUNDLE_H
#define INSTALLERBUNDLE_H
#include <iplugininstallersimple.h>
#include <uibase/iplugininstallersimple.h>
class InstallerBundle : public MOBase::IPluginInstallerSimple
{
Q_OBJECT
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")
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "org.tannin.InstallerBundle")
#endif
public:
InstallerBundle();
virtual bool init(MOBase::IOrganizer *moInfo);
virtual QString name() const;
virtual QString author() const;
virtual QString description() const;
virtual MOBase::VersionInfo version() const;
virtual bool isActive() const;
virtual QList<MOBase::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 MOBase::DirectoryTree &tree) const;
virtual EInstallResult install(MOBase::GuessedValue<QString> &modName, MOBase::DirectoryTree &tree,
QString &version, int &modID);
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;
};
#endif // INSTALLERBUNDLE_H
#endif // INSTALLERBUNDLE_H
View File
+40
View File
@@ -0,0 +1,40 @@
#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();
}
+78
View File
@@ -0,0 +1,78 @@
/*
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 <uibase/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>
+15
View File
@@ -0,0 +1,15 @@
{
"features": {
"standalone": {
"description": "Build Standalone.",
"dependencies": ["mo2-cmake", "mo2-uibase"]
}
},
"vcpkg-configuration": {
"default-registry": {
"kind": "git",
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
"baseline": "8beb2e0efa9c17dd6d17bb05288dd1e40727f673"
}
}
}