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

Implemented LWJGL version lists.

Browse Source 
The LWJGL list actually doesn't use tasks for loading. Instead, it takes advantage of the
QNetworkAccessManager's asynchronous requests. This is a system that I may look to implement for other version
lists and things such as the Minecraft version list and possibly even instance mod lists.

Loading things this way means that code that wants to load a list can simply call the load list function, rather
than having to get a task from the list and execute the task. Unfortunately, it also means we can't have task
progress dialogs for loading lists, but it shouldn't really be too difficult to write one that works with this
system.

At some point in the future, I'll probably end up putting all the code for this method of loading lists into a
base class and then update the other lists to support it.
This commit is contained in:
Andrew
2013-05-17 11:53:22 -05:00
parent 159404f444
commit 3b38e5f924
9 changed files with 559 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
gui/lwjglselectdialog.cpp Normal file
View File

@ -0,0 +1,68 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "lwjglselectdialog.h"
#include "ui_lwjglselectdialog.h"
#include "lwjglversionlist.h"
LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::LWJGLSelectDialog)
{
ui->setupUi(this);
ui->labelStatus->setVisible(false);
ui->lwjglListView->setModel(&LWJGLVersionList::get());
connect(&LWJGLVersionList::get(), SIGNAL(loadingStateUpdated(bool)), SLOT(loadingStateUpdated(bool)));
connect(&LWJGLVersionList::get(), SIGNAL(loadListFailed(QString)), SLOT(loadingFailed(QString)));
loadingStateUpdated(LWJGLVersionList::get().isLoading());
}
LWJGLSelectDialog::~LWJGLSelectDialog()
{
delete ui;
}
QString LWJGLSelectDialog::selectedVersion() const
{
return LWJGLVersionList::get().data(
ui->lwjglListView->selectionModel()->currentIndex(),
Qt::DisplayRole).toString();
}
void LWJGLSelectDialog::on_refreshButton_clicked()
{
if (!LWJGLVersionList::get().isLoading())
LWJGLVersionList::get().loadList();
}
void LWJGLSelectDialog::loadingStateUpdated(bool loading)
{
setEnabled(!loading);
if (loading)
{
ui->labelStatus->setText("Loading LWJGL version list...");
ui->labelStatus->setStyleSheet("QLabel { color: black; }");
}
ui->labelStatus->setVisible(loading);
}
void LWJGLSelectDialog::loadingFailed(QString error)
{
ui->labelStatus->setText(error);
ui->labelStatus->setStyleSheet("QLabel { color: red; }");
ui->labelStatus->setVisible(true);
}

46
gui/lwjglselectdialog.h Normal file
View File

@ -0,0 +1,46 @@
/* Copyright 2013 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LWJGLSELECTDIALOG_H
#define LWJGLSELECTDIALOG_H
#include <QDialog>
namespace Ui
{
class LWJGLSelectDialog;
}
class LWJGLSelectDialog : public QDialog
{
Q_OBJECT
public:
explicit LWJGLSelectDialog(QWidget *parent = 0);
~LWJGLSelectDialog();
QString selectedVersion() const;
private slots:
void on_refreshButton_clicked();
void loadingStateUpdated(bool loading);
void loadingFailed(QString error);
private:
Ui::LWJGLSelectDialog *ui;
};
#endif // LWJGLSELECTDIALOG_H

85
gui/lwjglselectdialog.ui Normal file
View File

@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LWJGLSelectDialog</class>
<widget class="QDialog" name="LWJGLSelectDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="labelStatus">
<property name="text">
<string>Status label...</string>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="lwjglListView"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="refreshButton">
<property name="text">
<string>&amp;Refresh</string>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>LWJGLSelectDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>LWJGLSelectDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

21
gui/mainwindow.cpp
View File

@ -40,6 +40,7 @@
#include "gui/browserdialog.h"
#include "gui/aboutdialog.h"
#include "gui/versionselectdialog.h"
#include "gui/lwjglselectdialog.h"
#include "gui/consolewindow.h"
#include "kcategorizedview.h"
@ -59,6 +60,7 @@
#include "instancedelegate.h"
#include "minecraftversionlist.h"
#include "lwjglversionlist.h"
// Opens the given file in the default application.
// TODO: Move this somewhere.
@ -140,6 +142,11 @@ MainWindow::MainWindow ( QWidget *parent ) :
m_versionLoadTask = MinecraftVersionList::getMainList().getLoadTask();
startTask(m_versionLoadTask);
}
if (!LWJGLVersionList::get().isLoaded())
{
LWJGLVersionList::get().loadList();
}
}
MainWindow::~MainWindow()
@ -460,3 +467,17 @@ void MainWindow::on_actionChangeInstMCVersion_triggered()
inst->setIntendedVersion(vselect->selectedVersion()->descriptor());
}
}
void MainWindow::on_actionChangeInstLWJGLVersion_triggered()
{
Instance *inst = selectedInstance();
if (!inst)
return;
LWJGLSelectDialog *lselect = new LWJGLSelectDialog(this);
if (lselect->exec())
{
}
}

2
gui/mainwindow.h
View File

@ -99,6 +99,8 @@ private slots:
void taskStart(Task *task);
void taskEnd(Task *task);
void on_actionChangeInstLWJGLVersion_triggered();
public slots:
void instanceActivated ( QModelIndex );