From 253067c782955380bbf66ac0475dc954375b1ff4 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sat, 17 Aug 2013 13:40:51 +0200 Subject: Move all the things (YES. Move them.) Also, implemented some basic modlist logic, to be wired up. --- gui/IconPickerDialog.cpp | 2 +- gui/LegacyModEditDialog.cpp | 36 ++++++ gui/LegacyModEditDialog.h | 59 ++++++++++ gui/LegacyModEditDialog.ui | 281 ++++++++++++++++++++++++++++++++++++++++++++ gui/consolewindow.h | 2 +- gui/instancemodel.cpp | 4 +- gui/instancemodel.h | 2 +- gui/legacymodeditdialog.cpp | 35 ------ gui/legacymodeditdialog.h | 62 ---------- gui/legacymodeditdialog.ui | 281 -------------------------------------------- gui/lwjglselectdialog.cpp | 2 +- gui/mainwindow.cpp | 31 +++-- gui/mainwindow.h | 6 +- gui/modeditdialog.cpp | 2 +- gui/modeditdialog.h | 2 +- gui/modeditdialog.ui | 2 +- gui/newinstancedialog.cpp | 12 +- gui/newinstancedialog.h | 2 +- gui/taskdialog.cpp | 2 +- gui/versionselectdialog.cpp | 6 +- gui/versionselectdialog.h | 2 +- 21 files changed, 413 insertions(+), 420 deletions(-) create mode 100644 gui/LegacyModEditDialog.cpp create mode 100644 gui/LegacyModEditDialog.h create mode 100644 gui/LegacyModEditDialog.ui delete mode 100644 gui/legacymodeditdialog.cpp delete mode 100644 gui/legacymodeditdialog.h delete mode 100644 gui/legacymodeditdialog.ui (limited to 'gui') diff --git a/gui/IconPickerDialog.cpp b/gui/IconPickerDialog.cpp index 27e7f3b6..d80673a8 100644 --- a/gui/IconPickerDialog.cpp +++ b/gui/IconPickerDialog.cpp @@ -1,7 +1,7 @@ #include "IconPickerDialog.h" #include "instancedelegate.h" #include "ui_IconPickerDialog.h" -#include +#include "logic/IconListModel.h" IconPickerDialog::IconPickerDialog(QWidget *parent) : QDialog(parent), diff --git a/gui/LegacyModEditDialog.cpp b/gui/LegacyModEditDialog.cpp new file mode 100644 index 00000000..a6becd7d --- /dev/null +++ b/gui/LegacyModEditDialog.cpp @@ -0,0 +1,36 @@ +/* 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 "LegacyModEditDialog.h" +#include "ui_LegacyModEditDialog.h" + +LegacyModEditDialog::LegacyModEditDialog( LegacyInstance* inst, QWidget* parent ) : + m_inst(inst), + QDialog(parent), + ui(new Ui::LegacyModEditDialog) +{ + ui->setupUi(this); + +} + +LegacyModEditDialog::~LegacyModEditDialog() +{ + delete ui; +} + +void LegacyModEditDialog::on_buttonBox_rejected() +{ + close(); +} \ No newline at end of file diff --git a/gui/LegacyModEditDialog.h b/gui/LegacyModEditDialog.h new file mode 100644 index 00000000..3af6c8d7 --- /dev/null +++ b/gui/LegacyModEditDialog.h @@ -0,0 +1,59 @@ +/* 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. + */ + +#pragma once + +#include +#include "logic/LegacyInstance.h" + +namespace Ui { +class LegacyModEditDialog; +} + +class LegacyModEditDialog : public QDialog +{ + Q_OBJECT + +public: + explicit LegacyModEditDialog(LegacyInstance* inst, QWidget *parent = 0); + ~LegacyModEditDialog(); + +private slots: + /* Mapped for implementation + void on_addJarBtn_clicked(); + void on_rmJarBtn_clicked(); + void on_addForgeBtn_clicked(); + void on_moveJarUpBtn_clicked(); + void on_moveJarDownBtn_clicked(); + + void on_addCoreBtn_clicked(); + void on_rmCoreBtn_clicked(); + void on_viewCoreBtn_clicked(); + + void on_addModBtn_clicked(); + void on_rmModBtn_clicked(); + void on_viewModBtn_clicked(); + + void on_addTexPackBtn_clicked(); + void on_rmTexPackBtn_clicked(); + void on_viewTexPackBtn_clicked(); + */ + // Questionable: SettingsDialog doesn't need this for some reason? + void on_buttonBox_rejected(); + +private: + Ui::LegacyModEditDialog *ui; + LegacyInstance * m_inst; +}; diff --git a/gui/LegacyModEditDialog.ui b/gui/LegacyModEditDialog.ui new file mode 100644 index 00000000..d55c3e1c --- /dev/null +++ b/gui/LegacyModEditDialog.ui @@ -0,0 +1,281 @@ + + + LegacyModEditDialog + + + + 0 + 0 + 540 + 420 + + + + Dialog + + + + + + false + + + 0 + + + + Jar Mods + + + + + + true + + + QAbstractItemView::DropOnly + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + MCForge + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Move &Up + + + + + + + Move &Down + + + + + + + + + + Core Mods + + + + + + true + + + QAbstractItemView::DropOnly + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + + + + + Mods + + + + + + true + + + QAbstractItemView::DropOnly + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + + + + + false + + + Texture Packs + + + + + + true + + + false + + + QAbstractItemView::DropOnly + + + Qt::IgnoreAction + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + + + + + + + + QDialogButtonBox::Close + + + + + + + + diff --git a/gui/consolewindow.h b/gui/consolewindow.h index 3ea02ad9..60bec69f 100644 --- a/gui/consolewindow.h +++ b/gui/consolewindow.h @@ -2,7 +2,7 @@ #define CONSOLEWINDOW_H #include -#include "MinecraftProcess.h" +#include "logic/MinecraftProcess.h" namespace Ui { class ConsoleWindow; diff --git a/gui/instancemodel.cpp b/gui/instancemodel.cpp index 3cbb0fb9..39dea34b 100644 --- a/gui/instancemodel.cpp +++ b/gui/instancemodel.cpp @@ -1,6 +1,6 @@ #include "instancemodel.h" -#include -#include +#include +#include #include //#include "iconcache.h" diff --git a/gui/instancemodel.h b/gui/instancemodel.h index fe05744f..52b58081 100644 --- a/gui/instancemodel.h +++ b/gui/instancemodel.h @@ -2,7 +2,7 @@ #include #include "categorizedsortfilterproxymodel.h" -#include "lists/InstanceList.h" +#include "logic/lists/InstanceList.h" #include class InstanceModel : public QAbstractListModel diff --git a/gui/legacymodeditdialog.cpp b/gui/legacymodeditdialog.cpp deleted file mode 100644 index 319705f9..00000000 --- a/gui/legacymodeditdialog.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* 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 "legacymodeditdialog.h" -#include "ui_legacymodeditdialog.h" -#include "BaseInstance.h" - -LegacyModEditDialog::LegacyModEditDialog(QWidget *parent, BaseInstance* m_inst) : - QDialog(parent), - ui(new Ui::LegacyModEditDialog) -{ - ui->setupUi(this); -} - -LegacyModEditDialog::~LegacyModEditDialog() -{ - delete ui; -} - -void LegacyModEditDialog::on_buttonBox_rejected() -{ - close(); -} \ No newline at end of file diff --git a/gui/legacymodeditdialog.h b/gui/legacymodeditdialog.h deleted file mode 100644 index 54dceffe..00000000 --- a/gui/legacymodeditdialog.h +++ /dev/null @@ -1,62 +0,0 @@ -/* 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 LEGACYMODEDITDIALOG_H -#define LEGACYMODEDITDIALOG_H - -#include - -#include "BaseInstance.h" - -namespace Ui { -class LegacyModEditDialog; -} - -class LegacyModEditDialog : public QDialog -{ - Q_OBJECT - -public: - explicit LegacyModEditDialog(QWidget *parent = 0, BaseInstance* m_inst = 0); - ~LegacyModEditDialog(); - -private slots: - /* Mapped for implementation - void on_addJarBtn_clicked(); - void on_rmJarBtn_clicked(); - void on_addForgeBtn_clicked(); - void on_moveJarUpBtn_clicked(); - void on_moveJarDownBtn_clicked(); - - void on_addCoreBtn_clicked(); - void on_rmCoreBtn_clicked(); - void on_viewCoreBtn_clicked(); - - void on_addModBtn_clicked(); - void on_rmModBtn_clicked(); - void on_viewModBtn_clicked(); - - void on_addTexPackBtn_clicked(); - void on_rmTexPackBtn_clicked(); - void on_viewTexPackBtn_clicked(); - */ - // Questionable: SettingsDialog doesn't need this for some reason? - void on_buttonBox_rejected(); - -private: - Ui::LegacyModEditDialog *ui; -}; - -#endif // LEGACYMODEDITDIALOG_H diff --git a/gui/legacymodeditdialog.ui b/gui/legacymodeditdialog.ui deleted file mode 100644 index d8b09bfe..00000000 --- a/gui/legacymodeditdialog.ui +++ /dev/null @@ -1,281 +0,0 @@ - - - LegacyModEditDialog - - - - 0 - 0 - 540 - 420 - - - - Dialog - - - - - - false - - - 3 - - - - Jar Mods - - - - - - true - - - QAbstractItemView::DropOnly - - - - - - - - - &Add - - - - - - - &Remove - - - - - - - MCForge - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Move &Up - - - - - - - Move &Down - - - - - - - - - - Core Mods - - - - - - true - - - QAbstractItemView::DropOnly - - - - - - - - - &Add - - - - - - - &Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - &View Folder - - - - - - - - - - Mods - - - - - - true - - - QAbstractItemView::DropOnly - - - - - - - - - &Add - - - - - - - &Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - &View Folder - - - - - - - - - - false - - - Texture Packs - - - - - - true - - - false - - - QAbstractItemView::DropOnly - - - Qt::IgnoreAction - - - - - - - - - &Add - - - - - - - &Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - &View Folder - - - - - - - - - - - - - QDialogButtonBox::Close - - - - - - - - diff --git a/gui/lwjglselectdialog.cpp b/gui/lwjglselectdialog.cpp index d4a42b59..9de92754 100644 --- a/gui/lwjglselectdialog.cpp +++ b/gui/lwjglselectdialog.cpp @@ -16,7 +16,7 @@ #include "lwjglselectdialog.h" #include "ui_lwjglselectdialog.h" -#include "lists/LwjglVersionList.h" +#include "logic/lists/LwjglVersionList.h" LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent) : QDialog(parent), diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 6176c079..5087b38f 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -33,6 +33,9 @@ #include "userutils.h" #include "pathutils.h" +#include "categorizedview.h" +#include "categorydrawer.h" + #include "gui/settingsdialog.h" #include "gui/newinstancedialog.h" #include "gui/logindialog.h" @@ -42,31 +45,25 @@ #include "gui/versionselectdialog.h" #include "gui/lwjglselectdialog.h" #include "gui/consolewindow.h" -#include "gui/legacymodeditdialog.h" #include "gui/instancesettings.h" -#include "categorizedview.h" -#include "categorydrawer.h" - -#include "lists/InstanceList.h" #include "AppSettings.h" #include "AppVersion.h" -#include "tasks/LoginTask.h" - -#include "BaseInstance.h" -#include "InstanceFactory.h" -#include "MinecraftProcess.h" -#include "OneSixAssets.h" -#include "OneSixUpdate.h" +#include "logic/lists/InstanceList.h" +#include "logic/tasks/LoginTask.h" +#include "logic/BaseInstance.h" +#include "logic/InstanceFactory.h" +#include "logic/MinecraftProcess.h" +#include "logic/OneSixAssets.h" +#include "logic/OneSixUpdate.h" +#include "logic/lists/MinecraftVersionList.h" +#include "logic/lists/LwjglVersionList.h" #include "instancemodel.h" #include "instancedelegate.h" #include "IconPickerDialog.h" -#include "lists/MinecraftVersionList.h" -#include "lists/LwjglVersionList.h" - // Opens the given file in the default application. // TODO: Move this somewhere. void openFileInDefaultProgram ( QString filename ); @@ -378,8 +375,8 @@ void MainWindow::on_actionEditInstMods_triggered() BaseInstance* inst = selectedInstance(); if (inst) { - LegacyModEditDialog dialog ( this, inst ); - dialog.exec(); + auto dialog = inst->createModEditDialog(this); + dialog->exec(); } } diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 62115e1d..79716e5e 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -18,9 +18,9 @@ #include -#include "lists/InstanceList.h" -#include "tasks/LoginTask.h" -#include "BaseInstance.h" +#include "logic/lists/InstanceList.h" +#include "logic/tasks/LoginTask.h" +#include "logic/BaseInstance.h" class InstanceModel; class InstanceProxyModel; diff --git a/gui/modeditdialog.cpp b/gui/modeditdialog.cpp index 2f437101..011de53d 100644 --- a/gui/modeditdialog.cpp +++ b/gui/modeditdialog.cpp @@ -15,7 +15,7 @@ #include "modeditdialog.h" #include "ui_modeditdialog.h" -#include "BaseInstance.h" +#include "logic/BaseInstance.h" ModEditDialog::ModEditDialog(QWidget *parent, BaseInstance* m_inst) : QDialog(parent), diff --git a/gui/modeditdialog.h b/gui/modeditdialog.h index 329a1b4e..94272a32 100644 --- a/gui/modeditdialog.h +++ b/gui/modeditdialog.h @@ -18,7 +18,7 @@ #include -#include "BaseInstance.h" +#include "logic/BaseInstance.h" namespace Ui { class ModEditDialog; diff --git a/gui/modeditdialog.ui b/gui/modeditdialog.ui index 380aec39..dfc59d21 100644 --- a/gui/modeditdialog.ui +++ b/gui/modeditdialog.ui @@ -26,7 +26,7 @@ - 2 + 0 Qt::ElideNone diff --git a/gui/newinstancedialog.cpp b/gui/newinstancedialog.cpp index 4f19e9a2..3a4adbc1 100644 --- a/gui/newinstancedialog.cpp +++ b/gui/newinstancedialog.cpp @@ -16,13 +16,11 @@ #include "newinstancedialog.h" #include "ui_newinstancedialog.h" -#include "InstanceFactory.h" - -#include -#include "InstanceVersion.h" - -#include "tasks/Task.h" -#include +#include "logic/InstanceFactory.h" +#include "logic/InstanceVersion.h" +#include "logic/IconListModel.h" +#include "logic/lists/MinecraftVersionList.h" +#include "logic/tasks/Task.h" #include "versionselectdialog.h" #include "taskdialog.h" diff --git a/gui/newinstancedialog.h b/gui/newinstancedialog.h index 07267e19..e8c57024 100644 --- a/gui/newinstancedialog.h +++ b/gui/newinstancedialog.h @@ -17,7 +17,7 @@ #define NEWINSTANCEDIALOG_H #include -#include "InstanceVersion.h" +#include "logic/InstanceVersion.h" namespace Ui { class NewInstanceDialog; diff --git a/gui/taskdialog.cpp b/gui/taskdialog.cpp index f61614e8..8c745b38 100644 --- a/gui/taskdialog.cpp +++ b/gui/taskdialog.cpp @@ -18,7 +18,7 @@ #include -#include "tasks/Task.h" +#include "logic/tasks/Task.h" TaskDialog::TaskDialog(QWidget *parent) : QDialog(parent), diff --git a/gui/versionselectdialog.cpp b/gui/versionselectdialog.cpp index 33aedc71..afe112f4 100644 --- a/gui/versionselectdialog.cpp +++ b/gui/versionselectdialog.cpp @@ -22,9 +22,9 @@ #include -#include -#include -#include +#include +#include +#include VersionSelectDialog::VersionSelectDialog(InstVersionList *vlist, QWidget *parent) : QDialog(parent), diff --git a/gui/versionselectdialog.h b/gui/versionselectdialog.h index 752c937b..b864aee1 100644 --- a/gui/versionselectdialog.h +++ b/gui/versionselectdialog.h @@ -19,7 +19,7 @@ #include #include -#include +#include "logic/InstanceVersion.h" class InstVersionList; -- cgit