summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-01-28 18:01:20 -0600
committerAndrew <forkk@forkk.net>2013-01-28 18:01:20 -0600
commit3a0367a79c53c59e670ee50927247885fe4807cb (patch)
tree78517d43d8719d476fe116caa14ef6abe85775a7 /gui
parenta25bedd7706b14cdae91556e4a577e410745f29a (diff)
downloadMultiMC-3a0367a79c53c59e670ee50927247885fe4807cb.tar
MultiMC-3a0367a79c53c59e670ee50927247885fe4807cb.tar.gz
MultiMC-3a0367a79c53c59e670ee50927247885fe4807cb.tar.lz
MultiMC-3a0367a79c53c59e670ee50927247885fe4807cb.tar.xz
MultiMC-3a0367a79c53c59e670ee50927247885fe4807cb.zip
Resized main window and added version info.
Diffstat (limited to 'gui')
-rw-r--r--gui/mainwindow.cpp6
-rw-r--r--gui/mainwindow.ui4
2 files changed, 7 insertions, 3 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 87a1dcc0..eedaddb8 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -19,13 +19,17 @@
#include <QDesktopServices>
#include <QUrl>
-#include "../gui/settingsdialog.h"
+#include "gui/settingsdialog.h"
+#include "data/version.h"
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
ui->setupUi(this);
+
+ setWindowTitle(QString("MultiMC %1").arg(Version::current.toString()));
+
instList.initialLoad("instances");
ui->instanceView->setModel(&instList);
}
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index ccc7e777..6640657a 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>739</width>
- <height>657</height>
+ <width>854</width>
+ <height>480</height>
</rect>
</property>
<property name="windowTitle">