From 64eced4614657f22b22ba565df497a010499bf30 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sat, 13 Dec 2014 16:47:11 +0100
Subject: - NCC installer can now discover files in other mods (thanks
 Reunion!) and knows the script extender version

---
 src/aboutdialog.cpp      | 2 ++
 src/aboutdialog.h        | 3 ++-
 src/organizerproxy.cpp   | 7 +++++++
 src/organizerproxy.h     | 1 +
 src/shared/appconfig.inc | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index a8f9b4db..fba9c94f 100644
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -35,6 +35,7 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
   m_LicenseFiles[LICENSE_BOOST] = "boost.txt";
   m_LicenseFiles[LICENSE_CCBY3] = "by-sa3.txt";
   m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
+  m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
 
   addLicense("Qt 4.8.5", LICENSE_LGPL3);
   addLicense("Qt Json", LICENSE_GPL3);
@@ -46,6 +47,7 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
   addLicense("NIF File Format Library", LICENSE_BSD3);
   addLicense("BOSS (modified)", LICENSE_GPL3);
   addLicense("Alphanum Algorithm", LICENSE_ZLIB);
+  addLicense("Castle Core", LICENSE_APACHE2);
 
   ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));
 #ifdef HGID
diff --git a/src/aboutdialog.h b/src/aboutdialog.h
index 9c0901a8..c3b38c10 100644
--- a/src/aboutdialog.h
+++ b/src/aboutdialog.h
@@ -48,7 +48,8 @@ private:
     LICENSE_BSD3,
     LICENSE_BOOST,
     LICENSE_CCBY3,
-    LICENSE_ZLIB
+    LICENSE_ZLIB,
+    LICENSE_APACHE2
   };
 
 private:
diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 903c979e..66aefe33 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -48,6 +48,13 @@ QString OrganizerProxy::downloadsPath() const
   return QDir::fromNativeSeparators(m_Proxied->m_Settings.getDownloadDirectory());
 }
 
+QString OrganizerProxy::overwritePath() const
+{
+  return QDir::fromNativeSeparators(ToQString(GameInfo::instance().getOrganizerDirectory()))
+         + "/"
+         + ToQString(AppConfig::overwritePath());
+}
+
 VersionInfo OrganizerProxy::appVersion() const
 {
   return m_Proxied->m_Updater.getVersion();
diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index affa2d55..cc75b939 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -15,6 +15,7 @@ public:
   virtual QString profileName() const;
   virtual QString profilePath() const;
   virtual QString downloadsPath() const;
+  virtual QString overwritePath() const;
   virtual MOBase::VersionInfo appVersion() const;
   virtual MOBase::IModInterface *getMod(const QString &name);
   virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);
diff --git a/src/shared/appconfig.inc b/src/shared/appconfig.inc
index 080d3655..7ce2724f 100644
--- a/src/shared/appconfig.inc
+++ b/src/shared/appconfig.inc
@@ -1,5 +1,6 @@
 APPPARAM(std::wstring, translationPrefix, L"organizer")
 APPPARAM(std::wstring, pluginPath, L"plugins")
+APPPARAM(std::wstring, overwritePath, L"overwrite")
 APPPARAM(std::wstring, stylesheetsPath, L"stylesheets")
 APPPARAM(std::wstring, profileTweakIni, L"profile_tweaks.ini")
 APPPARAM(std::wstring, logFile, L"ModOrganizer.log")
-- 
cgit v1.3.1