summaryrefslogtreecommitdiffstats
path: root/gui/dialogs/AboutDialog.cpp
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-07 18:47:06 -0600
committerForkk <forkk@forkk.net>2014-01-07 18:47:06 -0600
commit8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf (patch)
treedf2a719ebb12f129165c487ab730a6328c9750e7 /gui/dialogs/AboutDialog.cpp
parentfb83299e592ef7627d5914e0fbce70c570981124 (diff)
parent3629f9b9995e375dad181268f5a70dc6cb7697a2 (diff)
downloadMultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar
MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.gz
MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.lz
MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.tar.xz
MultiMC-8dfc1028ee2bcc17e2719ea8fc1bff8077f7aaaf.zip
Merge branch 'new-version-system' into develop
Diffstat (limited to 'gui/dialogs/AboutDialog.cpp')
-rw-r--r--gui/dialogs/AboutDialog.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp
index 58d61dd0..efeea6f2 100644
--- a/gui/dialogs/AboutDialog.cpp
+++ b/gui/dialogs/AboutDialog.cpp
@@ -25,7 +25,22 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
ui->setupUi(this);
ui->icon->setPixmap(QIcon(":/icons/multimc/scalable/apps/multimc.svg").pixmap(64));
- ui->title->setText("MultiMC " + MMC->version().toString());
+ ui->title->setText("MultiMC 5 " + MMC->version().toString());
+
+ ui->versionLabel->setText(tr("Version") +": " + MMC->version().toString());
+ ui->vtypeLabel->setText(tr("Version Type") +": " + MMC->version().typeName());
+ ui->platformLabel->setText(tr("Platform") +": " + MMC->version().platform);
+
+ if (MMC->version().build >= 0)
+ ui->buildNumLabel->setText(tr("Build Number") +": " + QString::number(MMC->version().build));
+ else
+ ui->buildNumLabel->setVisible(false);
+
+ if (!MMC->version().channel.isEmpty())
+ ui->channelLabel->setText(tr("Channel") +": " + MMC->version().channel);
+ else
+ ui->channelLabel->setVisible(false);
+
connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
MMC->connect(ui->aboutQt, SIGNAL(clicked()), SLOT(aboutQt()));