diff options
35 files changed, 423 insertions, 356 deletions
diff --git a/.clang-format b/.clang-format index 167a8fa7..4aec119c 100644 --- a/.clang-format +++ b/.clang-format @@ -9,6 +9,7 @@ NamespaceIndentation: None BreakBeforeBraces: Allman AllowShortIfStatementsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None ColumnLimit: 96 MaxEmptyLinesToKeep: 1 diff --git a/gui/pagedialog/PageDialog.cpp b/gui/pagedialog/PageDialog.cpp index 4dd4a811..c0bcdf9f 100644 --- a/gui/pagedialog/PageDialog.cpp +++ b/gui/pagedialog/PageDialog.cpp @@ -14,18 +14,20 @@ */ #include "PageDialog.h" -#include "gui/Platform.h" -#include "MultiMC.h" -#include "logic/settings/SettingsObject.h" -#include <gui/widgets/IconLabel.h> -#include <gui/widgets/PageContainer.h> #include <QDialogButtonBox> #include <QPushButton> #include <QVBoxLayout> -#include <QtGui/QKeyEvent> +#include <QKeyEvent> + +#include "MultiMC.h" +#include "logic/settings/SettingsObject.h" +#include "gui/Platform.h" +#include "gui/widgets/IconLabel.h" +#include "gui/widgets/PageContainer.h" -PageDialog::PageDialog(BasePageProviderPtr pageProvider, QString defaultId, QWidget *parent) : QDialog(parent) +PageDialog::PageDialog(BasePageProviderPtr pageProvider, QString defaultId, QWidget *parent) + : QDialog(parent) { MultiMCPlatform::fixWM_CLASS(this); setWindowTitle(pageProvider->dialogTitle()); @@ -34,23 +36,25 @@ PageDialog::PageDialog(BasePageProviderPtr pageProvider, QString defaultId, QWid QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(m_container); mainLayout->setSpacing(0); - mainLayout->setContentsMargins(0,0,0,0); + mainLayout->setContentsMargins(0, 0, 0, 0); setLayout(mainLayout); - + QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Close); buttons->button(QDialogButtonBox::Close)->setDefault(true); m_container->addButtons(buttons); connect(buttons->button(QDialogButtonBox::Close), SIGNAL(clicked()), this, SLOT(close())); - connect(buttons->button(QDialogButtonBox::Help), SIGNAL(clicked()), m_container, SLOT(help())); + connect(buttons->button(QDialogButtonBox::Help), SIGNAL(clicked()), m_container, + SLOT(help())); - restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("PagedGeometry").toByteArray())); + restoreGeometry( + QByteArray::fromBase64(MMC->settings()->get("PagedGeometry").toByteArray())); } -void PageDialog::closeEvent(QCloseEvent * event) +void PageDialog::closeEvent(QCloseEvent *event) { - if(m_container->requestClose(event)) + if (m_container->requestClose(event)) { MMC->settings()->set("PagedGeometry", saveGeometry().toBase64()); QDialog::closeEvent(event); diff --git a/gui/pagedialog/PageDialog.h b/gui/pagedialog/PageDialog.h index 097eac64..19d1b01f 100644 --- a/gui/pagedialog/PageDialog.h +++ b/gui/pagedialog/PageDialog.h @@ -14,8 +14,9 @@ */ #pragma once + #include <QDialog> -#include <gui/pages/BasePageProvider.h> +#include "gui/pages/BasePageProvider.h" class PageContainer; class PageDialog : public QDialog @@ -24,7 +25,7 @@ class PageDialog : public QDialog public: explicit PageDialog(BasePageProviderPtr pageProvider, QString defaultId = QString(), QWidget *parent = 0); - virtual ~PageDialog() {}; + virtual ~PageDialog() {} private slots: diff --git a/gui/pages/BasePage.h b/gui/pages/BasePage.h index 26c0b9f7..2cc602b7 100644 --- a/gui/pages/BasePage.h +++ b/gui/pages/BasePage.h @@ -14,6 +14,7 @@ */ #pragma once + #include <QString> #include <QIcon> #include <memory> @@ -21,28 +22,15 @@ class BasePage { public: - virtual ~BasePage(){} + virtual ~BasePage() {} virtual QString id() const = 0; virtual QString displayName() const = 0; virtual QIcon icon() const = 0; - virtual bool apply() - { - return true; - } - virtual bool shouldDisplay() const - { - return true; - } - virtual QString helpPage() const - { - return QString(); - } - virtual void opened() - { - } - virtual void closed() - { - } + virtual bool apply() { return true; } + virtual bool shouldDisplay() const { return true; } + virtual QString helpPage() const { return QString(); } + virtual void opened() {} + virtual void closed() {} int stackIndex = -1; int listIndex = -1; }; diff --git a/gui/pages/InstanceSettingsPage.cpp b/gui/pages/InstanceSettingsPage.cpp index 25fe46e5..34b1b401 100644 --- a/gui/pages/InstanceSettingsPage.cpp +++ b/gui/pages/InstanceSettingsPage.cpp @@ -1,27 +1,14 @@ #include "InstanceSettingsPage.h" -#include <gui/dialogs/VersionSelectDialog.h> -#include "logic/NagUtils.h" -#include <logic/java/JavaVersionList.h> -#include "MultiMC.h" -#include <QDialog> -#include <QFileDialog> -#include <QMessageBox> #include "ui_InstanceSettingsPage.h" -QString InstanceSettingsPage::displayName() const -{ - return tr("Settings"); -} - -QIcon InstanceSettingsPage::icon() const -{ - return QIcon::fromTheme("settings"); -} +#include <QFileDialog> +#include <QDialog> +#include <QMessageBox> -QString InstanceSettingsPage::id() const -{ - return "settings"; -} +#include "gui/dialogs/VersionSelectDialog.h" +#include "logic/NagUtils.h" +#include "logic/java/JavaVersionList.h" +#include "MultiMC.h" InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst) diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h index 7052040c..988862cf 100644 --- a/gui/pages/InstanceSettingsPage.h +++ b/gui/pages/InstanceSettingsPage.h @@ -14,11 +14,12 @@ */ #pragma once + #include <QWidget> -#include <logic/OneSixInstance.h> -#include <logic/net/NetJob.h> -#include <logic/java/JavaChecker.h> +#include "logic/OneSixInstance.h" +#include "logic/net/NetJob.h" +#include "logic/java/JavaChecker.h" #include "BasePage.h" class JavaChecker; @@ -34,11 +35,23 @@ class InstanceSettingsPage : public QWidget, public BasePage public: explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0); virtual ~InstanceSettingsPage(); - virtual QString displayName() const override; - virtual QIcon icon() const override; - virtual QString id() const override; + virtual QString displayName() const override + { + return tr("Settings"); + } + virtual QIcon icon() const override + { + return QIcon::fromTheme("settings"); + } + virtual QString id() const override + { + return "settings"; + } virtual bool apply(); - virtual QString helpPage() const override { return "Instance-settings"; } + virtual QString helpPage() const override + { + return "Instance-settings"; + } virtual bool shouldDisplay() const; private slots: void on_javaDetectBtn_clicked(); @@ -51,6 +64,7 @@ private slots: void applySettings(); void loadSettings(); + private: Ui::InstanceSettingsPage *ui; BaseInstance *m_instance; diff --git a/gui/pages/LegacyJarModPage.cpp b/gui/pages/LegacyJarModPage.cpp index 8acb2d50..16a2ff66 100644 --- a/gui/pages/LegacyJarModPage.cpp +++ b/gui/pages/LegacyJarModPage.cpp @@ -15,6 +15,13 @@ #include "LegacyJarModPage.h" #include "ui_LegacyJarModPage.h" + +#include <QKeyEvent> +#include <QFileDialog> +#include <QKeyEvent> + +#include <pathutils.h> + #include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/ProgressDialog.h" #include "gui/dialogs/ModEditDialogCommon.h" @@ -23,10 +30,6 @@ #include "logic/forge/ForgeVersion.h" #include "logic/forge/ForgeVersionList.h" #include "MultiMC.h" -#include <pathutils.h> -#include <QtGui/QKeyEvent> -#include <QFileDialog> -#include <QKeyEvent> LegacyJarModPage::LegacyJarModPage(LegacyInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::LegacyJarModPage), m_inst(inst) @@ -49,26 +52,11 @@ LegacyJarModPage::~LegacyJarModPage() delete ui; } -QString LegacyJarModPage::displayName() const -{ - return tr("Jar Mods"); -} - bool LegacyJarModPage::shouldDisplay() const { return !m_inst->isRunning(); } -QIcon LegacyJarModPage::icon() const -{ - return QIcon::fromTheme("plugin-red"); -} - -QString LegacyJarModPage::id() const -{ - return "jarmods"; -} - bool LegacyJarModPage::eventFilter(QObject *obj, QEvent *ev) { if (ev->type() != QEvent::KeyPress || obj != ui->jarModsTreeView) diff --git a/gui/pages/LegacyJarModPage.h b/gui/pages/LegacyJarModPage.h index 261d9020..1a72abf3 100644 --- a/gui/pages/LegacyJarModPage.h +++ b/gui/pages/LegacyJarModPage.h @@ -15,8 +15,9 @@ #pragma once -#include <QDialog> -#include <logic/net/NetJob.h> +#include <QWidget> + +#include "logic/net/NetJob.h" #include "BasePage.h" class ModList; @@ -34,10 +35,22 @@ public: explicit LegacyJarModPage(LegacyInstance *inst, QWidget *parent = 0); virtual ~LegacyJarModPage(); - virtual QString displayName() const; - virtual QIcon icon() const; - virtual QString id() const; - virtual QString helpPage() const override { return "Legacy-jar-mods"; } + virtual QString displayName() const + { + return tr("Jar Mods"); + } + virtual QIcon icon() const + { + return QIcon::fromTheme("plugin-red"); + } + virtual QString id() const + { + return "jarmods"; + } + virtual QString helpPage() const override + { + return "Legacy-jar-mods"; + } virtual bool shouldDisplay() const; private diff --git a/gui/pages/LegacyUpgradePage.cpp b/gui/pages/LegacyUpgradePage.cpp index bc800bc8..79478efb 100644 --- a/gui/pages/LegacyUpgradePage.cpp +++ b/gui/pages/LegacyUpgradePage.cpp @@ -1,21 +1,7 @@ #include "LegacyUpgradePage.h" -#include <logic/LegacyInstance.h> #include "ui_LegacyUpgradePage.h" -QString LegacyUpgradePage::displayName() const -{ - return tr("Upgrade"); -} - -QIcon LegacyUpgradePage::icon() const -{ - return QIcon::fromTheme("checkupdate"); -} - -QString LegacyUpgradePage::id() const -{ - return "upgrade"; -} +#include "logic/LegacyInstance.h" LegacyUpgradePage::LegacyUpgradePage(LegacyInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::LegacyUpgradePage), m_inst(inst) diff --git a/gui/pages/LegacyUpgradePage.h b/gui/pages/LegacyUpgradePage.h index c9eede72..4fd88b5b 100644 --- a/gui/pages/LegacyUpgradePage.h +++ b/gui/pages/LegacyUpgradePage.h @@ -14,10 +14,11 @@ */ #pragma once + #include <QWidget> -#include <logic/OneSixInstance.h> -#include <logic/net/NetJob.h> +#include "logic/OneSixInstance.h" +#include "logic/net/NetJob.h" #include "BasePage.h" class EnabledItemFilter; @@ -33,10 +34,22 @@ class LegacyUpgradePage : public QWidget, public BasePage public: explicit LegacyUpgradePage(LegacyInstance *inst, QWidget *parent = 0); virtual ~LegacyUpgradePage(); - virtual QString displayName() const override; - virtual QIcon icon() const override; - virtual QString id() const override; - virtual QString helpPage() const override { return "Legacy-upgrade"; } + virtual QString displayName() const override + { + return tr("Upgrade"); + } + virtual QIcon icon() const override + { + return QIcon::fromTheme("checkupdate"); + } + virtual QString id() const override + { + return "upgrade"; + } + virtual QString helpPage() const override + { + return "Legacy-upgrade"; + } virtual bool shouldDisplay() const; private slots: diff --git a/gui/pages/LogPage.cpp b/gui/pages/LogPage.cpp index a7a0171f..601c738f 100644 --- a/gui/pages/LogPage.cpp +++ b/gui/pages/LogPage.cpp @@ -7,21 +7,6 @@ #include "logic/MinecraftProcess.h" #include "gui/GuiUtil.h" -QString LogPage::displayName() const -{ - return tr("Minecraft Log"); -} - -QIcon LogPage::icon() const -{ - return QIcon::fromTheme("refresh"); -} - -QString LogPage::id() const -{ - return "console"; -} - LogPage::LogPage(MinecraftProcess *proc, QWidget *parent) : QWidget(parent), ui(new Ui::LogPage), m_process(proc) { diff --git a/gui/pages/LogPage.h b/gui/pages/LogPage.h index 72ca09ec..be5b3a20 100644 --- a/gui/pages/LogPage.h +++ b/gui/pages/LogPage.h @@ -13,13 +13,13 @@ * limitations under the License. */ - #pragma once + #include <QWidget> -#include <logic/BaseInstance.h> -#include <logic/net/NetJob.h> -#include <logic/MinecraftProcess.h> +#include "logic/BaseInstance.h" +#include "logic/net/NetJob.h" +#include "logic/MinecraftProcess.h" #include "BasePage.h" class EnabledItemFilter; @@ -36,11 +36,23 @@ class LogPage : public QWidget, public BasePage public: explicit LogPage(MinecraftProcess *proc, QWidget *parent = 0); virtual ~LogPage(); - virtual QString displayName() const override; - virtual QIcon icon() const override; - virtual QString id() const override; + virtual QString displayName() const override + { + return tr("Minecraft Log"); + } + virtual QIcon icon() const override + { + return QIcon::fromTheme("log"); + } + virtual QString id() const override + { + return "console"; + } virtual bool apply(); - virtual QString helpPage() const override { return "Minecraft-Log"; } + virtual QString helpPage() const override + { + return "Minecraft-Log"; + } virtual bool shouldDisplay() const; private: @@ -64,7 +76,7 @@ private slots: void on_btnPaste_clicked(); void on_btnCopy_clicked(); void on_btnClear_clicked(); - + private: Ui::LogPage *ui; MinecraftProcess *m_process; diff --git a/gui/pages/ModFolderPage.cpp b/gui/pages/ModFolderPage.cpp index a01e215d..d94696ec 100644 --- a/gui/pages/ModFolderPage.cpp +++ b/gui/pages/ModFolderPage.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "MultiMC.h" +#include "ModFolderPage.h" +#include "ui_ModFolderPage.h" -#include <pathutils.h> #include <QFileDialog> #include <QMessageBox> #include <QEvent> @@ -23,33 +23,18 @@ #include <QDesktopServices> #include <QAbstractItemModel> -#include "ModFolderPage.h" -#include "ui_ModFolderPage.h" +#include <pathutils.h> +#include "MultiMC.h" #include "gui/dialogs/CustomMessageBox.h" #include "gui/dialogs/ModEditDialogCommon.h" - #include "logic/ModList.h" #include "logic/Mod.h" -#include <logic/VersionFilterData.h> - -QString ModFolderPage::displayName() const -{ - return m_displayName; -} - -QIcon ModFolderPage::icon() const -{ - return QIcon::fromTheme(m_iconName); -} - -QString ModFolderPage::id() const -{ - return m_id; -} +#include "logic/VersionFilterData.h" -ModFolderPage::ModFolderPage(BaseInstance * inst, std::shared_ptr<ModList> mods, QString id, QString iconName, - QString displayName, QString helpPage, QWidget *parent) +ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id, + QString iconName, QString displayName, QString helpPage, + QWidget *parent) : QWidget(parent), ui(new Ui::ModFolderPage) { ui->setupUi(this); @@ -82,7 +67,7 @@ ModFolderPage::~ModFolderPage() bool ModFolderPage::shouldDisplay() const { - if(m_inst) + if (m_inst) return !m_inst->isRunning(); return true; } @@ -91,13 +76,13 @@ bool CoreModFolderPage::shouldDisplay() const { if (ModFolderPage::shouldDisplay()) { - auto inst = dynamic_cast<OneSixInstance*>(m_inst); - if(!inst) + auto inst = dynamic_cast<OneSixInstance *>(m_inst); + if (!inst) return true; auto version = inst->getFullVersion(); - if(!version) + if (!version) return true; - if(version->m_releaseTime < g_VersionFilterData.legacyCutoffDate) + if (version->m_releaseTime < g_VersionFilterData.legacyCutoffDate) { return true; } diff --git a/gui/pages/ModFolderPage.h b/gui/pages/ModFolderPage.h index 2103ce26..4d72fb8b 100644 --- a/gui/pages/ModFolderPage.h +++ b/gui/pages/ModFolderPage.h @@ -14,10 +14,11 @@ */ #pragma once + #include <QWidget> -#include <logic/OneSixInstance.h> -#include <logic/net/NetJob.h> +#include "logic/OneSixInstance.h" +#include "logic/net/NetJob.h" #include "BasePage.h" class EnabledItemFilter; @@ -36,9 +37,18 @@ public: QString iconName, QString displayName, QString helpPage = "", QWidget *parent = 0); virtual ~ModFolderPage(); - virtual QString displayName() const override; - virtual QIcon icon() const override; - virtual QString id() const override; + virtual QString displayName() const override + { + return m_displayName; + } + virtual QIcon icon() const override + { + return QIcon::fromTheme(m_iconName); + } + virtual QString id() const override + { + return m_id; + } virtual QString helpPage() const override { return m_helpName; diff --git a/gui/pages/NotesPage.cpp b/gui/pages/NotesPage.cpp index d99014ff..a2558e3c 100644 --- a/gui/pages/NotesPage.cpp +++ b/gui/pages/NotesPage.cpp @@ -1,21 +1,6 @@ #include "NotesPage.h" #include "ui_NotesPage.h" -QString NotesPage::displayName() const -{ - return tr("Notes"); -} - -QIcon NotesPage::icon() const -{ - return QIcon::fromTheme("news"); -} - -QString NotesPage::id() const -{ - return "notes"; -} - NotesPage::NotesPage(BaseInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::NotesPage), m_inst(inst) { diff --git a/gui/pages/NotesPage.h b/gui/pages/NotesPage.h index ad0a7701..81338e57 100644 --- a/gui/pages/NotesPage.h +++ b/gui/pages/NotesPage.h @@ -14,10 +14,11 @@ */ #pragma once + #include <QWidget> -#include <logic/BaseInstance.h> -#include <logic/net/NetJob.h> +#include "logic/BaseInstance.h" +#include "logic/net/NetJob.h" #include "BasePage.h" class EnabledItemFilter; @@ -33,11 +34,23 @@ class NotesPage : public QWidget, public BasePage public: explicit NotesPage(BaseInstance *inst, QWidget *parent = 0); virtual ~NotesPage(); - virtual QString displayName() const override; - virtual QIcon icon() const override; - virtual QString id() const override; + virtual QString displayName() const override + { + return tr("Notes"); + } + virtual QIcon icon() const override + { + return QIcon::fromTheme("news"); + } + virtual QString id() const override + { + return "notes"; + } virtual bool apply(); - virtual QString helpPage() const override { return "Notes"; } + virtual QString helpPage() const override + { + return "Notes"; + } private: Ui::NotesPage *ui; diff --git a/gui/pages/OtherLogsPage.cpp b/gui/pages/OtherLogsPage.cpp index 3ea1f170..f20b9fef 100644 --- a/gui/pages/OtherLogsPage.cpp +++ b/gui/pages/OtherLogsPage.cpp @@ -1,3 +1,18 @@ +/* Copyright 2014 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "OtherLogsPage.h" #include "ui_OtherLogsPage.h" @@ -8,28 +23,18 @@ #include "logic/RecursiveFileSystemWatcher.h" #include "logic/BaseInstance.h" -OtherLogsPage::OtherLogsPage(BaseInstance *instance, QWidget *parent) : - QWidget(parent), - ui(new Ui::OtherLogsPage), - m_instance(instance), - m_watcher(new RecursiveFileSystemWatcher(this)) +OtherLogsPage::OtherLogsPage(BaseInstance *instance, QWidget *parent) + : QWidget(parent), ui(new Ui::OtherLogsPage), m_instance(instance), + m_watcher(new RecursiveFileSystemWatcher(this)) { ui->setupUi(this); - connect(m_watcher, &RecursiveFileSystemWatcher::filesChanged, [this]() - { - ui->selectLogBox->clear(); - ui->selectLogBox->addItems(m_watcher->files()); - ui->selectLogBox->addItem(tr("&Other"), true); - if (m_currentFile.isNull()) - { - ui->selectLogBox->setCurrentIndex(-1); - } - else - { - const int index = ui->selectLogBox->findText(m_currentFile); - ui->selectLogBox->setCurrentIndex(-1); - } - }); + + m_watcher->setFileExpression(".*\\.log$"); + m_watcher->setRootDir(QDir::current().absoluteFilePath(m_instance->minecraftRoot())); + + connect(m_watcher, &RecursiveFileSystemWatcher::filesChanged, this, + &OtherLogsPage::populateSelectLogBox); + populateSelectLogBox(); } OtherLogsPage::~OtherLogsPage() @@ -46,6 +51,22 @@ void OtherLogsPage::closed() m_watcher->disable(); } +void OtherLogsPage::populateSelectLogBox() +{ + ui->selectLogBox->clear(); + ui->selectLogBox->addItems(m_watcher->files()); + ui->selectLogBox->addItem(tr("Other"), true); + if (m_currentFile.isNull()) + { + ui->selectLogBox->setCurrentIndex(-1); + } + else + { + const int index = ui->selectLogBox->findText(m_currentFile); + ui->selectLogBox->setCurrentIndex(index); + } +} + void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index) { QString file; @@ -53,7 +74,8 @@ void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index) { if (ui->selectLogBox->itemData(index).isValid()) { - file = QFileDialog::getOpenFileName(this, tr("Open log file"), m_instance->minecraftRoot(), tr("*.log;;*.txt;;*")); + file = QFileDialog::getOpenFileName( + this, tr("Open log file"), m_instance->minecraftRoot(), tr("*.log;;*.txt;;*")); } else { @@ -61,9 +83,10 @@ void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index) } } - if (file.isEmpty() || !QFile::exists(file)) + if (file.isEmpty() || !QFile::exists(m_instance->minecraftRoot() + "/" + file)) { m_currentFile = QString(); + ui->text->clear(); setControlsEnabled(false); } else @@ -76,13 +99,14 @@ void OtherLogsPage::on_selectLogBox_currentIndexChanged(const int index) void OtherLogsPage::on_btnReload_clicked() { - QFile file(m_currentFile); + QFile file(m_instance->minecraftRoot() + "/" + m_currentFile); if (!file.open(QFile::ReadOnly)) { setControlsEnabled(false); ui->btnReload->setEnabled(true); // allow reload m_currentFile = QString(); - QMessageBox::critical(this, tr("Error"), tr("Unable to open %1 for reading: %2").arg(m_currentFile, file.errorString())); + QMessageBox::critical(this, tr("Error"), tr("Unable to open %1 for reading: %2") + .arg(m_currentFile, file.errorString())); } else { @@ -100,15 +124,17 @@ void OtherLogsPage::on_btnCopy_clicked() } void OtherLogsPage::on_btnDelete_clicked() { - if (QMessageBox::question(this, tr("Delete"), tr("Do you really want to delete %1?").arg(m_currentFile), QMessageBox::Yes, QMessageBox::No) - == QMessageBox::No) + if (QMessageBox::question(this, tr("Delete"), + tr("Do you really want to delete %1?").arg(m_currentFile), + QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { return; } - QFile file(m_currentFile); + QFile file(m_instance->minecraftRoot() + "/" + m_currentFile); if (!file.remove()) { - QMessageBox::critical(this, tr("Error"), tr("Unable to delete %1: %2").arg(m_currentFile, file.errorString())); + QMessageBox::critical(this, tr("Error"), tr("Unable to delete %1: %2") + .arg(m_currentFile, file.errorString())); } } |