diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-11-02 02:33:55 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-11-02 02:37:54 +0100 |
| commit | 85b64ad76705cd152fb2b0525de75fe4e832c31c (patch) | |
| tree | c95101d899b565da4ec99e43d6c5f4796a6c1385 /application/pages/global | |
| parent | 3a4304d89dc59a5f4045c1f3f2b504ba188adb33 (diff) | |
| download | MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar.gz MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar.lz MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar.xz MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.zip | |
NOISSUE MCEdit integration - remove old 'tool', replace with Worlds
Diffstat (limited to 'application/pages/global')
| -rw-r--r-- | application/pages/global/ExternalToolsPage.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/application/pages/global/ExternalToolsPage.cpp b/application/pages/global/ExternalToolsPage.cpp index e8091dee..4c3375c8 100644 --- a/application/pages/global/ExternalToolsPage.cpp +++ b/application/pages/global/ExternalToolsPage.cpp @@ -24,6 +24,7 @@ #include "tools/BaseProfiler.h" #include <FileSystem.h> #include "MultiMC.h" +#include <tools/MCEditTool.h> ExternalToolsPage::ExternalToolsPage(QWidget *parent) : QWidget(parent), @@ -93,8 +94,7 @@ void ExternalToolsPage::on_jprofilerPathBtn_clicked() QString cooked_dir = FS::NormalizePath(raw_dir); if (!MMC->profilers()["jprofiler"]->check(cooked_dir, &error)) { - QMessageBox::critical(this, tr("Error"), - tr("Error while checking JProfiler install:\n%1").arg(error)); + QMessageBox::critical(this, tr("Error"), tr("Error while checking JProfiler install:\n%1").arg(error)); continue; } else @@ -109,8 +109,7 @@ void ExternalToolsPage::on_jprofilerCheckBtn_clicked() QString error; if (!MMC->profilers()["jprofiler"]->check(ui->jprofilerPathEdit->text(), &error)) { - QMessageBox::critical(this, tr("Error"), - tr("Error while checking JProfiler install:\n%1").arg(error)); + QMessageBox::critical(this, tr("Error"), tr("Error while checking JProfiler install:\n%1").arg(error)); } else { @@ -132,8 +131,7 @@ void ExternalToolsPage::on_jvisualvmPathBtn_clicked() QString cooked_dir = FS::NormalizePath(raw_dir); if (!MMC->profilers()["jvisualvm"]->check(cooked_dir, &error)) { - QMessageBox::critical(this, tr("Error"), - tr("Error while checking JVisualVM install:\n%1").arg(error)); + QMessageBox::critical(this, tr("Error"), tr("Error while checking JVisualVM install:\n%1").arg(error)); continue; } else @@ -148,8 +146,7 @@ void ExternalToolsPage::on_jvisualvmCheckBtn_clicked() QString error; if (!MMC->profilers()["jvisualvm"]->check(ui->jvisualvmPathEdit->text(), &error)) { - QMessageBox::critical(this, tr("Error"), - tr("Error while checking JVisualVM install:\n%1").arg(error)); + QMessageBox::critical(this, tr("Error"), tr("Error while checking JVisualVM install:\n%1").arg(error)); } else { @@ -174,10 +171,9 @@ void ExternalToolsPage::on_mceditPathBtn_clicked() break; } QString cooked_dir = FS::NormalizePath(raw_dir); - if (!MMC->tools()["mcedit"]->check(cooked_dir, &error)) + if (!MMC->mcedit()->check(cooked_dir, error)) { - QMessageBox::critical(this, tr("Error"), - tr("Error while checking MCEdit install:\n%1").arg(error)); + QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error)); continue; } else @@ -190,10 +186,9 @@ void ExternalToolsPage::on_mceditPathBtn_clicked() void ExternalToolsPage::on_mceditCheckBtn_clicked() { QString error; - if (!MMC->tools()["mcedit"]->check(ui->mceditPathEdit->text(), &error)) + if (!!MMC->mcedit()->check(ui->mceditPathEdit->text(), error)) { - QMessageBox::critical(this, tr("Error"), - tr("Error while checking MCEdit install:\n%1").arg(error)); + QMessageBox::critical(this, tr("Error"), tr("Error while checking MCEdit install:\n%1").arg(error)); } else { |