Fix MCEdit on OSX

2 files changed, 17 insertions, 2 deletions

diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index fd67b22f..d79bb558 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -623,7 +623,12 @@ void SettingsDialog::on_mceditPathBtn_clicked()
 	QString error;
 	do
 	{
+#ifdef Q_OS_OSX
+#warning stuff
+		raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
+#else
 		raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Directory"), raw_dir);
+#endif
 		if (raw_dir.isEmpty())
 		{
 			break;
diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp
index c4edece5..e22a5d4a 100644
--- a/logic/tools/MCEditTool.cpp
+++ b/logic/tools/MCEditTool.cpp
@@ -2,6 +2,8 @@
 
 #include <QDir>
 #include <QProcess>
+#include <QDesktopServices>
+#include <QUrl>
 
 #include "settingsobject.h"
 #include "logic/BaseInstance.h"
@@ -20,6 +22,13 @@ void MCEditTool::runImpl()
 	{
 		return;
 	}
+#ifdef Q_OS_OSX
+	QProcess *process = new QProcess();
+	connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), process, SLOT(deleteLater()));
+	process->setProgram(mceditPath);
+	process->setArguments(QStringList() << save);
+	process->start();
+#else
 	QDir mceditDir(mceditPath);
 	QString program;
 	if (mceditDir.exists("mcedit.py"))
@@ -31,6 +40,7 @@ void MCEditTool::runImpl()
 		program = mceditDir.absoluteFilePath("mcedit.exe");
 	}
 	QProcess::startDetached(program, QStringList() << save, mceditPath);
+#endif
 }
 
 void MCEditFactory::registerSettings(SettingsObject *settings)
@@ -58,9 +68,9 @@ bool MCEditFactory::check(const QString &path, QString *error)
 		*error = QObject::tr("Path does not exist");
 		return false;
 	}
-	if (!dir.exists("mcedit.py") && !dir.exists("mcedit.exe"))
+	if (!dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents"))
 	{
-		*error = QObject::tr("Path does not contain mcedit.py");
+		*error = QObject::tr("Path does not seem to be a MCEdit path");
 		return false;
 	}
 	return true;