diff options
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | gui/MainWindow.cpp | 1 | ||||
-rw-r--r-- | gui/dialogs/LwjglSelectDialog.cpp | 72 | ||||
-rw-r--r-- | gui/dialogs/LwjglSelectDialog.h | 44 | ||||
-rw-r--r-- | gui/dialogs/LwjglSelectDialog.ui | 85 |
5 files changed, 0 insertions, 205 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3807d04f..bc2d9daf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,8 +342,6 @@ SET(MULTIMC_SOURCES gui/dialogs/IconPickerDialog.h gui/dialogs/LoginDialog.cpp gui/dialogs/LoginDialog.h - gui/dialogs/LwjglSelectDialog.cpp - gui/dialogs/LwjglSelectDialog.h gui/dialogs/ModEditDialogCommon.cpp gui/dialogs/ModEditDialogCommon.h gui/dialogs/NewInstanceDialog.cpp @@ -675,7 +673,6 @@ SET(MULTIMC_UIS gui/dialogs/NewInstanceDialog.ui gui/dialogs/AboutDialog.ui gui/dialogs/VersionSelectDialog.ui - gui/dialogs/LwjglSelectDialog.ui gui/dialogs/ProgressDialog.ui gui/dialogs/IconPickerDialog.ui gui/dialogs/AccountSelectDialog.ui diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 721a6833..eebb8a70 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -342,7 +342,6 @@ namespace Ui { #include "gui/dialogs/AboutDialog.h" #include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/CustomMessageBox.h" -#include "gui/dialogs/LwjglSelectDialog.h" #include "gui/dialogs/IconPickerDialog.h" #include "gui/dialogs/CopyInstanceDialog.h" #include "gui/dialogs/AccountSelectDialog.h" diff --git a/gui/dialogs/LwjglSelectDialog.cpp b/gui/dialogs/LwjglSelectDialog.cpp deleted file mode 100644 index 5ad14356..00000000 --- a/gui/dialogs/LwjglSelectDialog.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright 2013-2015 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 "MultiMC.h" -#include "LwjglSelectDialog.h" -#include "ui_LwjglSelectDialog.h" -#include "gui/Platform.h" - -#include "logic/LwjglVersionList.h" - -LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent) - : QDialog(parent), ui(new Ui::LWJGLSelectDialog) -{ - MultiMCPlatform::fixWM_CLASS(this); - ui->setupUi(this); - ui->labelStatus->setVisible(false); - auto lwjgllist = MMC->lwjgllist(); - ui->lwjglListView->setModel(lwjgllist.get()); - - connect(lwjgllist.get(), SIGNAL(loadingStateUpdated(bool)), - SLOT(loadingStateUpdated(bool))); - connect(lwjgllist.get(), SIGNAL(loadListFailed(QString)), SLOT(loadingFailed(QString))); - loadingStateUpdated(lwjgllist->isLoading()); -} - -LWJGLSelectDialog::~LWJGLSelectDialog() -{ - delete ui; -} - -QString LWJGLSelectDialog::selectedVersion() const -{ - return MMC->lwjgllist() - ->data(ui->lwjglListView->selectionModel()->currentIndex(), Qt::DisplayRole) - .toString(); -} - -void LWJGLSelectDialog::on_refreshButton_clicked() -{ - if (!MMC->lwjgllist()->isLoading()) - MMC->lwjgllist()->loadList(); -} - -void LWJGLSelectDialog::loadingStateUpdated(bool loading) -{ - setEnabled(!loading); - if (loading) - { - ui->labelStatus->setText(tr("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); -} diff --git a/gui/dialogs/LwjglSelectDialog.h b/gui/dialogs/LwjglSelectDialog.h deleted file mode 100644 index 095af76b..00000000 --- a/gui/dialogs/LwjglSelectDialog.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2013-2015 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. - */ - -#pragma once - -#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; -}; diff --git a/gui/dialogs/LwjglSelectDialog.ui b/gui/dialogs/LwjglSelectDialog.ui deleted file mode 100644 index 0287ec8f..00000000 --- a/gui/dialogs/LwjglSelectDialog.ui +++ /dev/null @@ -1,85 +0,0 @@ -<?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>Manage Lwjgl Versions</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>&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> |