External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 09:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	gui/mainwindow.cpp
This commit is contained in:
TakSuyu
2013-07-27 12:55:51 -07:00
parent 44498f9894 a7a84d4dbb
commit dc39d09339
29 changed files with 1598 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gui/mainwindow.cpp
View File

@@ -43,6 +43,7 @@
#include "gui/lwjglselectdialog.h"
#include "gui/consolewindow.h"
#include "gui/legacymodeditdialog.h"
#include "gui/instancesettings.h"
#include "kcategorizedview.h"
#include "kcategorydrawer.h"
@@ -130,6 +131,9 @@ MainWindow::MainWindow ( QWidget *parent ) :
view->setModel ( proxymodel );
connect(view, SIGNAL(doubleClicked(const QModelIndex &)),
this, SLOT(instanceActivated(const QModelIndex &)));
connect(view, SIGNAL(clicked(const QModelIndex &)),
this, SLOT(instanceChanged(const QModelIndex &)));
// Load the instances.
instList.loadList();
@@ -417,7 +421,7 @@ void MainWindow::onLoginComplete(LoginResponse response)
{
Q_ASSERT_X(m_activeInst != NULL, "onLoginComplete", "no active instance is set");
if (!m_activeInst->shouldUpdateGame())
if (!m_activeInst->shouldUpdate())
{
launchInstance(m_activeInst, response);
}
@@ -554,3 +558,20 @@ void MainWindow::on_actionChangeInstLWJGLVersion_triggered()
}
}
void MainWindow::on_actionInstanceSettings_triggered()
{
if (view->selectionModel()->selectedIndexes().count() < 1)
return;
Instance *inst = selectedInstance();
SettingsObject *s;
s = &inst->settings();
InstanceSettings settings(s, this);
settings.setWindowTitle(QString("Instance settings"));
settings.exec();
}
void MainWindow::instanceChanged(QModelIndex idx) {
ui->instanceToolBar->setEnabled(idx.isValid());
}