From d7564a51ce4a85799bd421dac0c913cb20d25a63 Mon Sep 17 00:00:00 2001 From: Forkk Date: Tue, 7 Jan 2014 19:21:42 -0600 Subject: [PATCH 1/8] Bump minor version number and update changelog. --- CMakeLists.txt | 2 +- changelog.yaml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c795ab8f..33183b9d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ 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_MINOR 1) SET(MultiMC_VERSION_HOTFIX 0) # Build number diff --git a/changelog.yaml b/changelog.yaml index 63c4b4b13..38b8f755e 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -1,2 +1,18 @@ +# +# 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. + - Added a hack to fix NVidia Optimus using the wrong graphics card. + - 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. + From 87b12a63a12529933e10c0e9d9fdcb5415f3132f Mon Sep 17 00:00:00 2001 From: Forkk Date: Tue, 7 Jan 2014 19:30:08 -0600 Subject: [PATCH 2/8] Make CMake output version type info --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33183b9d7..274e4155d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) From 7ace682260bb392714e2a9a8a985e79f3ee9b022 Mon Sep 17 00:00:00 2001 From: Forkk Date: Wed, 8 Jan 2014 17:54:23 -0600 Subject: [PATCH 3/8] Remove lies from the changelog There wasn't really an Optimus fix. LIES! ALL LIES! --- changelog.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/changelog.yaml b/changelog.yaml index 38b8f755e..0e41abdd1 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -11,7 +11,6 @@ - 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. - - Added a hack to fix NVidia Optimus using the wrong graphics card. - 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. From b4fcbab5135205d64b34d1774b2efd7c3dd56672 Mon Sep 17 00:00:00 2001 From: Forkk Date: Wed, 8 Jan 2014 17:56:38 -0600 Subject: [PATCH 4/8] Word wrap the update channel description label Previously, channel descriptions that were too long would mess up the dialog. --- gui/dialogs/SettingsDialog.ui | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index e7671cce4..251e79162 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -106,6 +106,9 @@ No channel selected. + + true + @@ -895,7 +898,7 @@ - + From b767d4b134148ddb3f956253a2f7f2cad831e782 Mon Sep 17 00:00:00 2001 From: Forkk Date: Wed, 8 Jan 2014 18:02:15 -0600 Subject: [PATCH 5/8] Fix the window title The window title now says "MultiMC 5 - Version [on ]" --- gui/MainWindow.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 905d14cff..69cdf602b 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); From c51a993ff741074ac88bbc901ebfad9da636eeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 9 Jan 2014 01:20:24 +0100 Subject: [PATCH 6/8] Add logging calls to the java checker. --- logic/JavaChecker.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/logic/JavaChecker.cpp b/logic/JavaChecker.cpp index 6ee7b4cfa..b87ee3d55 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 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(); } } From 7d74c9bc2574609470c886b1c4cf1a4776e8d70a Mon Sep 17 00:00:00 2001 From: Forkk Date: Wed, 8 Jan 2014 22:50:08 -0600 Subject: [PATCH 7/8] Change the issue tracker URL to GitHub issues Bump hotfix version number and add an entry in the changelog. --- CMakeLists.txt | 2 +- changelog.yaml | 2 ++ gui/MainWindow.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 274e4155d..425ddf5f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ 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 1) -SET(MultiMC_VERSION_HOTFIX 0) +SET(MultiMC_VERSION_HOTFIX 1) # Build number SET(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.") diff --git a/changelog.yaml b/changelog.yaml index 0e41abdd1..82dccd69b 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -14,4 +14,6 @@ - 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 69cdf602b..31e4b9e44 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -857,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() From 52c9cd5497153365f5b3871b216e5828923f9b5f Mon Sep 17 00:00:00 2001 From: Forkk Date: Wed, 8 Jan 2014 23:38:34 -0600 Subject: [PATCH 8/8] Make the GitHub link in the about dialog clickable Fixes #38 --- gui/dialogs/AboutDialog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp index efeea6f2c..35c858152 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());