From 171325d42784a69ac3cadc6ab330603e258eec02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 9 Jun 2014 01:29:18 +0200 Subject: Instance settings moved to a page. --- gui/MainWindow.cpp | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'gui/MainWindow.cpp') diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 830a4fb4..e9cfd361 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -56,7 +56,6 @@ #include "gui/dialogs/VersionSelectDialog.h" #include "gui/dialogs/CustomMessageBox.h" #include "gui/dialogs/LwjglSelectDialog.h" -#include "gui/dialogs/InstanceSettings.h" #include "gui/dialogs/IconPickerDialog.h" #include "gui/dialogs/EditNotesDialog.h" #include "gui/dialogs/CopyInstanceDialog.h" @@ -944,12 +943,13 @@ void MainWindow::on_actionSettings_triggered() void MainWindow::on_actionInstanceSettings_triggered() { - if (m_selectedInstance) - { - InstanceSettings settings(&m_selectedInstance->settings(), this); - settings.setWindowTitle(tr("Instance settings")); - settings.exec(); - } + if (!m_selectedInstance) + return; + auto provider = std::dynamic_pointer_cast(m_selectedInstance); + if(!provider) + return; + PageDialog dlg(provider, "settings" , this); + dlg.exec(); } void MainWindow::on_actionManageAccounts_triggered() @@ -1042,19 +1042,13 @@ void MainWindow::on_actionViewSelectedInstFolder_triggered() void MainWindow::on_actionEditInstance_triggered() { - if (m_selectedInstance) - { - auto provider = std::dynamic_pointer_cast(m_selectedInstance); - if(!provider) - { - QLOG_ERROR() << "Instance can't be converted to BasePageProvider (NYI)"; - return; - } - auto dialog = new PageDialog(provider, this); - if (dialog) - dialog->exec(); - dialog->deleteLater(); - } + if (!m_selectedInstance) + return; + auto provider = std::dynamic_pointer_cast(m_selectedInstance); + if(!provider) + return; + PageDialog dlg(provider, "" , this); + dlg.exec(); } void MainWindow::closeEvent(QCloseEvent *event) -- cgit v1.2.3