diff options
| author | Brian Munro <brian.alexander.munro@gmail.com> | 2017-01-17 20:21:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 20:21:58 -0800 |
| commit | d63c164a748ef438a1e6b7919da1fc3eab6f0bfd (patch) | |
| tree | b105f5a36569ea207c6518059fe014e6bc56a307 /src | |
| parent | d869d9978582668300478ccd84e251b17116b0e4 (diff) | |
| parent | 45cc67da05c57f3088e2b17e4c588905fda6c43c (diff) | |
Merge pull request #49 from ZachHaber/new_vfs_library
Loot Button & Overwrite
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.ui | 2 | ||||
| -rw-r--r-- | src/organizercore.cpp | 10 | ||||
| -rw-r--r-- | src/organizercore.h | 2 | ||||
| -rw-r--r-- | src/organizerproxy.cpp | 10 | ||||
| -rw-r--r-- | src/organizerproxy.h | 1 |
5 files changed, 22 insertions, 3 deletions
diff --git a/src/mainwindow.ui b/src/mainwindow.ui index b464a384..4b5467ed 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -733,7 +733,7 @@ p, li { white-space: pre-wrap; } <string>Sort</string>
</property>
<property name="visible">
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="icon">
<iconset resource="resources.qrc">
diff --git a/src/organizercore.cpp b/src/organizercore.cpp index 55d3f494..d9ed6ab6 100644 --- a/src/organizercore.cpp +++ b/src/organizercore.cpp @@ -703,6 +703,16 @@ QString OrganizerCore::downloadsPath() const return QDir::fromNativeSeparators(m_Settings.getDownloadDirectory());
}
+QString OrganizerCore::overwritePath() const
+{
+ return QDir::fromNativeSeparators(m_Settings.getOverwriteDirectory());
+}
+
+QString OrganizerCore::basePath() const
+{
+ return QDir::fromNativeSeparators(m_Settings.getBaseDirectory());
+}
+
MOBase::VersionInfo OrganizerCore::appVersion() const
{
return m_Updater.getVersion();
diff --git a/src/organizercore.h b/src/organizercore.h index e994d9b1..297b94f6 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -165,6 +165,8 @@ public: QString profileName() const;
QString profilePath() const;
QString downloadsPath() const;
+ QString overwritePath() const;
+ QString basePath() const;
MOBase::VersionInfo appVersion() const;
MOBase::IModInterface *getMod(const QString &name) const;
MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);
diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp index b6dbd242..cf2e29e3 100644 --- a/src/organizerproxy.cpp +++ b/src/organizerproxy.cpp @@ -37,9 +37,15 @@ QString OrganizerProxy::downloadsPath() const QString OrganizerProxy::overwritePath() const
{
- return QDir::fromNativeSeparators(qApp->property("dataPath").toString())
+ /*return QDir::fromNativeSeparators(qApp->property("dataPath").toString())
+ "/"
- + ToQString(AppConfig::overwritePath());
+ + ToQString(AppConfig::overwritePath());*/
+ return m_Proxied->overwritePath();
+}
+
+QString OrganizerProxy::basePath() const
+{
+ return m_Proxied->basePath();
}
VersionInfo OrganizerProxy::appVersion() const
diff --git a/src/organizerproxy.h b/src/organizerproxy.h index 7d925482..7004db14 100644 --- a/src/organizerproxy.h +++ b/src/organizerproxy.h @@ -18,6 +18,7 @@ public: virtual QString profilePath() const;
virtual QString downloadsPath() const;
virtual QString overwritePath() const;
+ virtual QString basePath() const;
virtual MOBase::VersionInfo appVersion() const;
virtual MOBase::IModInterface *getMod(const QString &name) const;
virtual MOBase::IModInterface *createMod(MOBase::GuessedValue<QString> &name);
|