Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

6 files changed, 49 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5c23235..d3779a74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,8 +90,8 @@ SET(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch
 
 ######## Set version numbers ########
 SET(MultiMC_VERSION_MAJOR		0)
-SET(MultiMC_VERSION_MINOR		0)
-SET(MultiMC_VERSION_HOTFIX		0)
+SET(MultiMC_VERSION_MINOR		1)
+SET(MultiMC_VERSION_HOTFIX		1)
 
 # Build number
 SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
@@ -120,17 +120,23 @@ IF (MultiMC_VERSION_HOTFIX GREATER 0)
 ENDIF()
 
 # Build a version string to display in the configure logs.
-IF (MultiMC_VERSION_TYPE STREQUAL "Custom" OR MultiMC_VERSION_TYPE STREQUAL "Release")
+IF (MultiMC_VERSION_TYPE STREQUAL "Custom")
+	MESSAGE(STATUS "Version Type: Custom")
+	SET(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
+ELSEIF (MultiMC_VERSION_TYPE STREQUAL "Release")
+	MESSAGE(STATUS "Version Type: Stable Release")
 	SET(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}")
 ELSEIF (MultiMC_VERSION_TYPE STREQUAL "ReleaseCandidate")
+	MESSAGE(STATUS "Version Type: Release Candidate")
 	SET(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}-rc${MultiMC_VERSION_BUILD}")
 ELSEIF (MultiMC_VERSION_TYPE STREQUAL "Development")
+	MESSAGE(STATUS "Version Type: Development")
 	SET(MultiMC_VERSION_STRING "${MultiMC_RELEASE_VERSION_NAME}-dev${MultiMC_VERSION_BUILD}")
 ELSE ()
 	MESSAGE(ERROR "Invalid build type.")
 ENDIF ()
 
-MESSAGE(STATUS "MultiMC 5 version ${MultiMC_VERSION_STRING}")
+MESSAGE(STATUS "MultiMC 5 Version: ${MultiMC_VERSION_STRING}")
 
 # If the update system is enabled, make sure MultiMC_CHANLIST_URL and MultiMC_VERSION_CHANNEL are set.
 IF (MultiMC_UPDATER)
diff --git a/changelog.yaml b/changelog.yaml
index 63c4b4b1..82dccd69 100644
--- a/changelog.yaml
+++ b/changelog.yaml
@@ -1,2 +1,19 @@
+#
+# This is MultiMC's changelog. It is formatted in YAML.
+#
+# Each key below represents a release version name. Each release key has several string entries under it, each containing information about a single change. Each of these entries may contain Markdown for formatting.
+#
+
 0.0:
     - Initial release.
+0.1:
+    - Reworked the version numbering system to support our [new Git workflow](http://nvie.com/posts/a-successful-git-branching-model/).
+    - Added a tray icon for the console window.
+    - Fixed instances getting deselected after FTB instances are loaded (or whenever the model is reset).
+    - Implemented proxy settings.
+    - Fixed sorting of Java installations in the Java list.
+    - Jar files are now distributed separately, rather than being extracted from the binary at runtime.
+    - Added additional information to the about dialog.
+0.1.1:
+    - Hotfix - Changed the issue tracker URL to [GitHub issues](https://github.com/MultiMC/MultiMC5/issues).
+
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 905d14cf..31e4b9e4 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -99,7 +99,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 {
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
-	setWindowTitle(QString("MultiMC %1").arg(MMC->version().toString()));
+
+	QString winTitle = QString("MultiMC 5 - Version %1").arg(MMC->version().toString());
+	if (!MMC->version().platform.isEmpty())
+		winTitle += " on " + MMC->version().platform;
+	setWindowTitle(winTitle);
 
 	// OSX magic.
 	// setUnifiedTitleAndToolBarOnMac(true);
@@ -853,7 +857,7 @@ void MainWindow::on_actionManageAccounts_triggered()
 
 void MainWindow::on_actionReportBug_triggered()
 {
-	openWebPage(QUrl("http://multimc.myjetbrains.com/youtrack/dashboard#newissue=yes"));
+	openWebPage(QUrl("https://github.com/MultiMC/MultiMC5/issues"));
 }
 
 void MainWindow::on_actionMoreNews_triggered()
diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp
index efeea6f2..35c85815 100644
--- a/gui/dialogs/AboutDialog.cpp
+++ b/gui/dialogs/AboutDialog.cpp
@@ -24,6 +24,8 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
 	MultiMCPlatform::fixWM_CLASS(this);
 	ui->setupUi(this);
 
+	ui->urlLabel->setOpenExternalLinks(true);
+
 	ui->icon->setPixmap(QIcon(":/icons/multimc/scalable/apps/multimc.svg").pixmap(64));
 	ui->title->setText("MultiMC 5 " + MMC->version().toString());
 
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index 5f2614ed..840e9928 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -106,6 +106,9 @@
               <property name="text">
                <string>No channel selected.</string>
               </property>
+              <property name="wordWrap">
+               <bool>true</bool>
+              </property>
              </widget>
             </item>
            </layout>
diff --git a/logic/JavaChecker.cpp b/logic/JavaChecker.cpp
index 6ee7b4cf..b87ee3d5 100644
--- a/logic/JavaChecker.cpp
+++ b/logic/JavaChecker.cpp
@@ -20,6 +20,9 @@ void JavaChecker::performCheck()
 	process->setArguments(args);
 	process->setProgram(path);
 	process->setProcessChannelMode(QProcess::SeparateChannels);
+	QLOG_DEBUG() << "Running java checker!";
+	QLOG_DEBUG() << "Java: " + path;
+	QLOG_DEBUG() << "Args: {" + args.join("|") + "}";
 
 	connect(process.get(), SIGNAL(finished(int, QProcess::ExitStatus)), this,
 			SLOT(finished(int, QProcess::ExitStatus)));
@@ -42,15 +45,19 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 		result.path = path;
 		result.id = id;
 	}
+	QLOG_DEBUG() << "Java checker finished with status " << status << " exit code " << exitcode;
 
 	if (status == QProcess::CrashExit || exitcode == 1)
 	{
+		QLOG_DEBUG() << "Java checker failed!";
 		emit checkFinished(result);
 		return;
 	}
 
 	bool success = true;
 	QString p_stdout = _process->readAllStandardOutput();
+	QLOG_DEBUG() << p_stdout;
+
 	QMap<QString, QString> results;
 	QStringList lines = p_stdout.split("\n", QString::SkipEmptyParts);
 	for(QString line : lines)
@@ -70,6 +77,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 
 	if(!results.contains("os.arch") || !results.contains("java.version") || !success)
 	{
+		QLOG_DEBUG() << "Java checker failed - couldn't extract required information.";
 		emit checkFinished(result);
 		return;
 	}
@@ -84,7 +92,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 	result.mojangPlatform = is_64 ? "64" : "32";
 	result.realPlatform = os_arch;
 	result.javaVersion = java_version;
-
+	QLOG_DEBUG() << "Java checker succeeded.";
 	emit checkFinished(result);
 }
 
@@ -93,7 +101,7 @@ void JavaChecker::error(QProcess::ProcessError err)
 	if(err == QProcess::FailedToStart)
 	{
 		killTimer.stop();
-
+		QLOG_DEBUG() << "Java checker has failed to start.";
 		JavaCheckResult result;
 		{
 			result.path = path;
@@ -110,6 +118,7 @@ void JavaChecker::timeout()
 	// NO MERCY. NO ABUSE.
 	if(process)
 	{
+		QLOG_DEBUG() << "Java checker has been killed by timeout.";
 		process->kill();
 	}
 }