diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2017-12-12 15:43:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 15:43:21 -0600 |
| commit | 2226a483d1415a315d7b558b0e2dc9919dfa858b (patch) | |
| tree | 8b4a258adbc1df8b0bbaa9b2e4d2b617cd8f1cfb /src/settings.cpp | |
| parent | 361e59e40d7e955eaaaa1cf4dd4f407a5ca7cdef (diff) | |
| parent | 240900de39aaf1562332ed88708b4b128703ad0e (diff) | |
Merge pull request #144 from erasmux/crash_fixes
Crash dumps fixes
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 05a62591..b2fc8939 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -24,6 +24,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>. #include "settingsdialog.h" #include "versioninfo.h" #include "appconfig.h" +#include "organizercore.h" #include <utility.h> #include <iplugin.h> #include <iplugingame.h> @@ -48,6 +49,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>. #include <QDir> #include <QStringList> #include <QVariantMap> +#include <QLabel> #include <Qt> // for Qt::UserRole, etc #include <QtDebug> // for qDebug, qWarning @@ -755,10 +757,20 @@ Settings::DiagnosticsTab::DiagnosticsTab(Settings *m_parent, SettingsDialog &m_d , m_logLevelBox(m_dialog.findChild<QComboBox *>("logLevelBox")) , m_dumpsTypeBox(m_dialog.findChild<QComboBox *>("dumpsTypeBox")) , m_dumpsMaxEdit(m_dialog.findChild<QSpinBox *>("dumpsMaxEdit")) + , m_diagnosticsExplainedLabel(m_dialog.findChild<QLabel *>("diagnosticsExplainedLabel")) { m_logLevelBox->setCurrentIndex(m_parent->logLevel()); m_dumpsTypeBox->setCurrentIndex(m_parent->crashDumpsType()); m_dumpsMaxEdit->setValue(m_parent->crashDumpsMax()); + QString logsPath = qApp->property("dataPath").toString() + + "/" + QString::fromStdWString(AppConfig::logPath()); + m_diagnosticsExplainedLabel->setText( + m_diagnosticsExplainedLabel->text() + .replace("LOGS_FULL_PATH", logsPath) + .replace("LOGS_DIR", QString::fromStdWString(AppConfig::logPath())) + .replace("DUMPS_FULL_PATH", QString::fromStdWString(OrganizerCore::crashDumpsPath())) + .replace("DUMPS_DIR", QString::fromStdWString(AppConfig::dumpsDir())) + ); } void Settings::DiagnosticsTab::update() |