diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-09-18 00:08:42 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-09-18 00:08:42 +0200 |
commit | 930b07afd4229e952d0cd47ca62cd94235499a0c (patch) | |
tree | 34cd74c3652da4b3ad0fd008faa2ab67adb4901f /gui/lwjglselectdialog.cpp | |
parent | 5cd3420c46e0b54f1479ddf720a8c9131c460a5e (diff) | |
parent | b979d0ce5da515793a02802a6421ef607a498323 (diff) | |
download | MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.gz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.lz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.xz MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.zip |
Merge branch 'feature_library_model' into develop
Diffstat (limited to 'gui/lwjglselectdialog.cpp')
-rw-r--r-- | gui/lwjglselectdialog.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gui/lwjglselectdialog.cpp b/gui/lwjglselectdialog.cpp index c3215b7b..7c424a6c 100644 --- a/gui/lwjglselectdialog.cpp +++ b/gui/lwjglselectdialog.cpp @@ -13,6 +13,7 @@ * limitations under the License. */ +#include "MultiMC.h" #include "lwjglselectdialog.h" #include "ui_lwjglselectdialog.h" @@ -24,11 +25,12 @@ LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent) : { ui->setupUi(this); ui->labelStatus->setVisible(false); - ui->lwjglListView->setModel(&LWJGLVersionList::get()); + auto lwjgllist = MMC->lwjgllist(); + ui->lwjglListView->setModel(lwjgllist); - connect(&LWJGLVersionList::get(), SIGNAL(loadingStateUpdated(bool)), SLOT(loadingStateUpdated(bool))); - connect(&LWJGLVersionList::get(), SIGNAL(loadListFailed(QString)), SLOT(loadingFailed(QString))); - loadingStateUpdated(LWJGLVersionList::get().isLoading()); + connect(lwjgllist, SIGNAL(loadingStateUpdated(bool)), SLOT(loadingStateUpdated(bool))); + connect(lwjgllist, SIGNAL(loadListFailed(QString)), SLOT(loadingFailed(QString))); + loadingStateUpdated(lwjgllist->isLoading()); } LWJGLSelectDialog::~LWJGLSelectDialog() @@ -38,15 +40,15 @@ LWJGLSelectDialog::~LWJGLSelectDialog() QString LWJGLSelectDialog::selectedVersion() const { - return LWJGLVersionList::get().data( + return MMC->lwjgllist()->data( ui->lwjglListView->selectionModel()->currentIndex(), Qt::DisplayRole).toString(); } void LWJGLSelectDialog::on_refreshButton_clicked() { - if (!LWJGLVersionList::get().isLoading()) - LWJGLVersionList::get().loadList(); + if (!MMC->lwjgllist()->isLoading()) + MMC->lwjgllist()->loadList(); } void LWJGLSelectDialog::loadingStateUpdated(bool loading) |