From b371ee1de22be6d846aa53ae5574555ca012f1c3 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 15 Jan 2013 19:04:10 -0600 Subject: [PATCH] Added mod edit window. --- MultiMC.pro | 9 +- MultiMC.pro.user | 2 +- gui/modeditwindow.cpp | 29 +++++ gui/modeditwindow.h | 37 +++++++ gui/modeditwindow.ui | 241 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 314 insertions(+), 4 deletions(-) create mode 100644 gui/modeditwindow.cpp create mode 100644 gui/modeditwindow.h create mode 100644 gui/modeditwindow.ui diff --git a/MultiMC.pro b/MultiMC.pro index 34d297c08..0ca6daee6 100644 --- a/MultiMC.pro +++ b/MultiMC.pro @@ -19,7 +19,8 @@ SOURCES += main.cpp\ data/instancelist.cpp \ data/stdinstance.cpp \ data/inifile.cpp \ - gui/settingsdialog.cpp + gui/settingsdialog.cpp \ + gui/modeditwindow.cpp HEADERS += gui/mainwindow.h \ data/instancebase.h \ @@ -27,10 +28,12 @@ HEADERS += gui/mainwindow.h \ data/instancelist.h \ data/stdinstance.h \ data/inifile.h \ - gui/settingsdialog.h + gui/settingsdialog.h \ + gui/modeditwindow.h FORMS += gui/mainwindow.ui \ - gui/settingsdialog.ui + gui/settingsdialog.ui \ + gui/modeditwindow.ui RESOURCES += \ multimc.qrc diff --git a/MultiMC.pro.user b/MultiMC.pro.user index 84f78217e..21852a101 100644 --- a/MultiMC.pro.user +++ b/MultiMC.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/gui/modeditwindow.cpp b/gui/modeditwindow.cpp new file mode 100644 index 000000000..e457252a3 --- /dev/null +++ b/gui/modeditwindow.cpp @@ -0,0 +1,29 @@ +/* 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 "modeditwindow.h" +#include "ui_modeditwindow.h" + +ModEditWindow::ModEditWindow(QWidget *parent) : + QDialog(parent), + ui(new Ui::ModEditWindow) +{ + ui->setupUi(this); +} + +ModEditWindow::~ModEditWindow() +{ + delete ui; +} diff --git a/gui/modeditwindow.h b/gui/modeditwindow.h new file mode 100644 index 000000000..c669e0b1b --- /dev/null +++ b/gui/modeditwindow.h @@ -0,0 +1,37 @@ +/* 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 MODEDITWINDOW_H +#define MODEDITWINDOW_H + +#include + +namespace Ui { +class ModEditWindow; +} + +class ModEditWindow : public QDialog +{ + Q_OBJECT + +public: + explicit ModEditWindow(QWidget *parent = 0); + ~ModEditWindow(); + +private: + Ui::ModEditWindow *ui; +}; + +#endif // MODEDITWINDOW_H diff --git a/gui/modeditwindow.ui b/gui/modeditwindow.ui new file mode 100644 index 000000000..c35c35d1e --- /dev/null +++ b/gui/modeditwindow.ui @@ -0,0 +1,241 @@ + + + ModEditWindow + + + + 0 + 0 + 540 + 420 + + + + Dialog + + + + + + 0 + + + + Jar Mods + + + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + MCForge + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Move &Up + + + + + + + Move &Down + + + + + + + + + + Mods + + + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + + + + + Core Mods + + + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + + + + + Texture Packs + + + + + + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + + + + + + + + QDialogButtonBox::Close + + + + + + + +