diff options
| author | Sky <git@bunnies.cc> | 2014-01-09 15:42:44 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2014-01-09 15:42:44 +0000 |
| commit | 86b6cdfcb3c9f9afa572901c0c0f1654a4bf19ea (patch) | |
| tree | 81af1a15dbdb5b67b05dab410cb469a70cf2e28a /gui | |
| parent | e6201f9ff799a21faff15c61586f2da4e62b799f (diff) | |
| parent | 52c9cd5497153365f5b3871b216e5828923f9b5f (diff) | |
| download | MultiMC-86b6cdfcb3c9f9afa572901c0c0f1654a4bf19ea.tar MultiMC-86b6cdfcb3c9f9afa572901c0c0f1654a4bf19ea.tar.gz MultiMC-86b6cdfcb3c9f9afa572901c0c0f1654a4bf19ea.tar.lz MultiMC-86b6cdfcb3c9f9afa572901c0c0f1654a4bf19ea.tar.xz MultiMC-86b6cdfcb3c9f9afa572901c0c0f1654a4bf19ea.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/MainWindow.cpp | 8 | ||||
| -rw-r--r-- | gui/dialogs/AboutDialog.cpp | 2 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.ui | 3 |
3 files changed, 11 insertions, 2 deletions
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> |