From 5f5184ebfe9a6b7102654863cbb390a610ab1563 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sat, 19 Dec 2015 20:49:54 +0000 Subject: Changes to support getting list of mods / esps to activate from game plugin --- src/organizerproxy.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/organizerproxy.cpp') diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index ba07c154..474f0837 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -1,6 +1,7 @@ #include "organizerproxy.h" -#include +#include "appconfig.h" +#include "organizercore.h" #include @@ -170,3 +171,8 @@ MOBase::IPluginGame const *OrganizerProxy::managedGame() const { return m_Proxied->managedGame(); } + +QStringList OrganizerProxy::modsSortedByProfilePriority() const +{ + return m_Proxied->modsSortedByProfilePriority(); +} -- cgit v1.3.1 From 42417b6a010926c11beeefd7398c7e0089c09c7d Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sat, 26 Dec 2015 15:49:19 +0000 Subject: Fix missing functions and also a bit of const correctness --- src/organizerproxy.cpp | 5 +++++ src/organizerproxy.h | 1 + 2 files changed, 6 insertions(+) (limited to 'src/organizerproxy.cpp') diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index 474f0837..de1b6d03 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -167,6 +167,11 @@ MOBase::IModList *OrganizerProxy::modList() const return m_Proxied->modList(); } +IProfile *OrganizerProxy::profile() const +{ + return m_Proxied->currentProfile(); +} + MOBase::IPluginGame const *OrganizerProxy::managedGame() const { return m_Proxied->managedGame(); diff --git a/src/organizerproxy.h b/src/organizerproxy.h index 2a0fc397..7ce8982e 100644 --- a/src/organizerproxy.h +++ b/src/organizerproxy.h @@ -38,6 +38,7 @@ public: virtual MOBase::IDownloadManager *downloadManager() const; virtual MOBase::IPluginList *pluginList() const; virtual MOBase::IModList *modList() const; + virtual MOBase::IProfile *profile() const override; virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = ""); virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const; virtual void refreshModList(bool saveChanges); -- cgit v1.3.1 From 387326f2d62fe02babe3594e2e00f831355da9b7 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sat, 23 Jan 2016 07:29:06 +0000 Subject: thoughts --- SConstruct | 14 ++++++++++++++ src/organizercore.h | 2 +- src/organizerproxy.cpp | 5 +++++ src/organizerproxy.h | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) (limited to 'src/organizerproxy.cpp') diff --git a/SConstruct b/SConstruct index b52cf509..c7248251 100644 --- a/SConstruct +++ b/SConstruct @@ -623,6 +623,20 @@ if qt_env['QT_MAJOR_VERSION'] > 4: ] # Finally, set up rules to install the DLLs. +# use windeployqt.exe to install all required libraries +#SET(windeploy_parameters --no-translations --no-plugins --libdir dlls --release-with-debug-info --no-compiler-runtime) +#INSTALL( +# CODE +# "EXECUTE_PROCESS( +# COMMAND +# ${qt5bin}/windeployqt.exe ModOrganizer.exe ${windeploy_parameters} +# COMMAND +# ${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters} +# WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin +# )" +#) +# this should probably be a rule though it seems to produce an awful lot of +# Stuff(TM). or a postaction dll_path = os.path.join('$INSTALL_PATH', 'DLLs') diff --git a/src/organizercore.h b/src/organizercore.h index 5cfbaca4..f4cfabe7 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -89,7 +89,7 @@ public: m_ExecutablesList = executablesList; } - Profile *currentProfile() { return m_CurrentProfile; } + Profile *currentProfile() const { return m_CurrentProfile; } void setCurrentProfile(const QString &profileName); std::vector enabledArchives(); diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index ba07c154..b289b659 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -166,6 +166,11 @@ MOBase::IModList *OrganizerProxy::modList() const return m_Proxied->modList(); } +MOBase::IProfile *OrganizerProxy::profile() const +{ + return m_Proxied->currentProfile(); +} + MOBase::IPluginGame const *OrganizerProxy::managedGame() const { return m_Proxied->managedGame(); diff --git a/src/organizerproxy.h b/src/organizerproxy.h index 62a35498..95543ba3 100644 --- a/src/organizerproxy.h +++ b/src/organizerproxy.h @@ -37,6 +37,7 @@ public: virtual MOBase::IDownloadManager *downloadManager() const; virtual MOBase::IPluginList *pluginList() const; virtual MOBase::IModList *modList() const; + virtual MOBase::IProfile *profile() const override; virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = ""); virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = nullptr) const; virtual void refreshModList(bool saveChanges); -- cgit v1.3.1