diff options
| author | Andrew <forkk@forkk.net> | 2013-01-15 18:46:27 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-01-15 18:46:27 -0600 |
| commit | f7e9a7523fdd8c9e2aaaf59f36fc4a702690b760 (patch) | |
| tree | 83f8a441ec16cc5aed4b5e4e14b93351a9c6a3da /gui/mainwindow.cpp | |
| parent | fce0f5df045f1d956cabeda41406001a037c9ab7 (diff) | |
| download | MultiMC-f7e9a7523fdd8c9e2aaaf59f36fc4a702690b760.tar MultiMC-f7e9a7523fdd8c9e2aaaf59f36fc4a702690b760.tar.gz MultiMC-f7e9a7523fdd8c9e2aaaf59f36fc4a702690b760.tar.lz MultiMC-f7e9a7523fdd8c9e2aaaf59f36fc4a702690b760.tar.xz MultiMC-f7e9a7523fdd8c9e2aaaf59f36fc4a702690b760.zip | |
Added settings dialog.
Diffstat (limited to 'gui/mainwindow.cpp')
| -rw-r--r-- | gui/mainwindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index ff9d0461..8f7372c8 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -19,15 +19,14 @@ #include <QDesktopServices> #include <QUrl> +#include "../gui/settingsdialog.h" + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); instList.loadInstances("instances"); - - model.setInstanceList(&instList); - ui->instListView->setModel(&model); } MainWindow::~MainWindow() @@ -62,7 +61,8 @@ void MainWindow::on_actionCheckUpdate_triggered() void MainWindow::on_actionSettings_triggered() { - + SettingsDialog dialog(this); + dialog.exec(); } void MainWindow::on_actionReportBug_triggered() |