CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5

Browse Source 
Conflicts:
	data/instancemodel.cpp
This commit is contained in:
Petr Mrázek
2013-02-21 18:09:26 +01:00
parent 1beef3f73c 96e4f73a94
commit 58379657e9
48 changed files with 1913 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gui/mainwindow.cpp
View File

@ -21,22 +21,29 @@
#include <QDesktopServices>
#include <QUrl>
#include <QFileInfo>
#include "util/osutils.h"
#include "osutils.h"
#include "gui/settingsdialog.h"
#include "gui/newinstancedialog.h"
#include "gui/logindialog.h"
#include "gui/taskdialog.h"
#include "data/appsettings.h"
#include "instancelist.h"
#include "appsettings.h"
#include "data/version.h"
#include "tasks/logintask.h"
// Opens the given file in the default application.
// TODO: Move this somewhere.
void openInDefaultProgram(QString filename);
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
ui(new Ui::MainWindow),
instList(settings->getInstanceDir())
{
ui->setupUi(this);
@ -45,8 +52,7 @@ MainWindow::MainWindow(QWidget *parent) :
restoreGeometry(settings->getConfig().value("MainWindowGeometry", saveGeometry()).toByteArray());
restoreState(settings->getConfig().value("MainWindowState", saveState()).toByteArray());
instList.initialLoad("instances");
ui->instanceView->setModel(&instList);
instList.loadList();
}
MainWindow::~MainWindow()
@ -67,7 +73,7 @@ void MainWindow::on_actionViewInstanceFolder_triggered()
void MainWindow::on_actionRefresh_triggered()
{
instList.initialLoad("instances");
instList.loadList();
}
void MainWindow::on_actionViewCentralModsFolder_triggered()
@ -155,3 +161,8 @@ void MainWindow::onLoginComplete(LoginResponse response)
QString("Logged in as %1 with session ID %2.").
arg(response.getUsername(), response.getSessionID()));
}
void openInDefaultProgram(QString filename)
{
QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath());
}

4
gui/mainwindow.h
View File

@ -18,7 +18,7 @@
#include <QMainWindow>
#include "data/instancemodel.h"
#include "instancelist.h"
#include "data/loginresponse.h"
namespace Ui
@ -70,7 +70,7 @@ private slots:
private:
Ui::MainWindow *ui;
InstanceModel instList;
InstanceList instList;
};
#endif // MAINWINDOW_H

2
gui/settingsdialog.cpp
View File

@ -16,7 +16,7 @@
#include "settingsdialog.h"
#include "ui_settingsdialog.h"
#include "data/appsettings.h"
#include "appsettings.h"
#include <QFileDialog>
#include <QMessageBox>