diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/legacymodeditdialog.cpp | 35 | ||||
| -rw-r--r-- | gui/legacymodeditdialog.h | 62 | ||||
| -rw-r--r-- | gui/legacymodeditdialog.ui | 281 | ||||
| -rw-r--r-- | gui/mainwindow.cpp | 5 | ||||
| -rw-r--r-- | gui/modeditdialog.cpp | 35 | ||||
| -rw-r--r-- | gui/modeditdialog.h | 52 | ||||
| -rw-r--r-- | gui/modeditdialog.ui | 167 | ||||
| -rw-r--r-- | gui/modeditwindow.h | 62 | ||||
| -rw-r--r-- | gui/newmodeditwindow.ui | 159 |
9 files changed, 794 insertions, 64 deletions
diff --git a/gui/legacymodeditdialog.cpp b/gui/legacymodeditdialog.cpp new file mode 100644 index 00000000..83d36218 --- /dev/null +++ b/gui/legacymodeditdialog.cpp @@ -0,0 +1,35 @@ +/* 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 "instance.h" + +LegacyModEditDialog::LegacyModEditDialog(QWidget *parent, Instance* 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 new file mode 100644 index 00000000..5310f769 --- /dev/null +++ b/gui/legacymodeditdialog.h @@ -0,0 +1,62 @@ +/* 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 <QDialog> + +#include "instance.h" + +namespace Ui { +class LegacyModEditDialog; +} + +class LegacyModEditDialog : public QDialog +{ + Q_OBJECT + +public: + explicit LegacyModEditDialog(QWidget *parent = 0, Instance* 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 new file mode 100644 index 00000000..d8b09bfe --- /dev/null +++ b/gui/legacymodeditdialog.ui @@ -0,0 +1,281 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>LegacyModEditDialog</class> + <widget class="QDialog" name="LegacyModEditDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>540</width> + <height>420</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="acceptDrops"> + <bool>false</bool> + </property> + <property name="currentIndex"> + <number>3</number> + </property> + <widget class="QWidget" name="jarTab"> + <attribute name="title"> + <string>Jar Mods</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QListView" name="jarModsListView"> + <property name="acceptDrops"> + <bool>true</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DropOnly</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="jarModsButtonBox"> + <item> + <widget class="QPushButton" name="addJarBtn"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="rmJarBtn"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addForgeBtn"> + <property name="text"> + <string>MCForge</string> + </property> + </widget> + </item> + <item> + <spacer name="jarModsButtonSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="moveJarUpBtn"> + <property name="text"> + <string>Move &Up</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="moveJarDownBtn"> + <property name="text"> + <string>Move &Down</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="coreTab"> + <attribute name="title"> + <string>Core Mods</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QListView" name="coreModsListView"> + <property name="acceptDrops"> + <bool>true</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DropOnly</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="coreModsButtonBox"> + <item> + <widget class="QPushButton" name="addCoreBtn"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="rmCoreBtn"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="coreModsButtonSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="viewCoreBtn"> + <property name="text"> + <string>&View Folder</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="modTab"> + <attribute name="title"> + <string>Mods</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QListView" name="mlModListView"> + <property name="acceptDrops"> + <bool>true</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DropOnly</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="mlModsButtonBox"> + <item> + <widget class="QPushButton" name="addModBtn"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="rmModBtn"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="mlModsButtonSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="viewModBtn"> + <property name="text"> + <string>&View Folder</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="texPackTab"> + <property name="acceptDrops"> + <bool>false</bool> + </property> + <attribute name="title"> + <string>Texture Packs</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QListView" name="texPackListView"> + <property name="acceptDrops"> + <bool>true</bool> + </property> + <property name="dragEnabled"> + <bool>false</bool> + </property> + <property name="dragDropMode"> + <enum>QAbstractItemView::DropOnly</enum> + </property> + <property name="defaultDropAction"> + <enum>Qt::IgnoreAction</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="texturePacksButtonBox"> + <item> + <widget class="QPushButton" name="addTexPackBtn"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="rmTexPackBtn"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="texturePacksButtonSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="viewTexPackBtn"> + <property name="text"> + <string>&View Folder</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 901f70b3..341fa7bf 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -42,7 +42,7 @@ #include "gui/versionselectdialog.h" #include "gui/lwjglselectdialog.h" #include "gui/consolewindow.h" -#include "gui/modeditwindow.h" +#include "gui/legacymodeditdialog.h" #include "gui/instancesettings.h" #include "kcategorizedview.h" @@ -334,10 +334,11 @@ void MainWindow::on_actionViewSelectedInstFolder_triggered() void MainWindow::on_actionEditInstMods_triggered() { + //TODO: Needs to do current ModEditDialog too Instance* inst = selectedInstance(); if (inst) { - ModEditWindow dialog ( this, inst ); + LegacyModEditDialog dialog ( this, inst ); dialog.exec(); } } diff --git a/gui/modeditdialog.cpp b/gui/modeditdialog.cpp new file mode 100644 index 00000000..945a5a91 --- /dev/null +++ b/gui/modeditdialog.cpp @@ -0,0 +1,35 @@ +/* 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 "modeditdialog.h" +#include "ui_modeditdialog.h" +#include "instance.h" + +ModEditDialog::ModEditDialog(QWidget *parent, Instance* m_inst) : +QDialog(parent), +ui(new Ui::ModEditDialog) +{ + ui->setupUi(this); +} + +ModEditDialog::~ModEditDialog() +{ + delete ui; +} + +void ModEditDialog::on_buttonBox_rejected() +{ + close(); +}
\ No newline at end of file diff --git a/gui/modeditdialog.h b/gui/modeditdialog.h new file mode 100644 index 00000000..648b9c08 --- /dev/null +++ b/gui/modeditdialog.h @@ -0,0 +1,52 @@ +/* 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 MODEDITDIALOG_H +#define MODEDITDIALOG_H + +#include <QDialog> + +#include "instance.h" + +namespace Ui { + class ModEditDialog; +} + +class ModEditDialog : public QDialog +{ + Q_OBJECT + +public: + explicit ModEditDialog(QWidget *parent = 0, Instance* m_inst = 0); + ~ModEditDialog(); + +private slots: + /* Mapped for implementation + void on_addModBtn_clicked(); + void on_rmModBtn_clicked(); + void on_viewModBtn_clicked(); + + void on_addResPackBtn_clicked(); + void on_rmResPackBtn_clicked(); + void on_viewResPackBtn_clicked(); + */ + // Questionable: SettingsDialog doesn't need this for some reason? + void on_buttonBox_rejected(); + +private: + Ui::ModEditDialog *ui; +}; + +#endif // MODEDITDIALOG_H
\ No newline at end of file diff --git a/gui/modeditdialog.ui b/gui/modeditdialog.ui new file mode 100644 index 00000000..380aec39 --- /dev/null +++ b/gui/modeditdialog.ui @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ModEditDialog</class> + <widget class="QDialog" name="ModEditDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>543</width> + <height>423</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="currentIndex"> + <number>2</number> + </property> + <property name="elideMode"> + <enum>Qt::ElideNone</enum> + </property> + <property name="tabsClosable"> + <bool>false</bool> + </property> + <widget class="QWidget" name="libTab"> + <attribute name="title"> + <string>Library</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QTreeView" name="treeView"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="modTab"> + <attribute name="title"> + <string>Mods</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QListView" name="listView"> + <property name="acceptDrops"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QPushButton" name="addModBtn"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="rmModBtn"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="viewModBtn"> + <property name="text"> + <string>&View Folder</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="resPackTab"> + <attribute name="title"> + <string>Resource Pack</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QListView" name="listView_2"> + <property name="acceptDrops"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QPushButton" name="addResPackBtn"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="rmRedPackBtn"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="viewResPackBtn"> + <property name="text"> + <string>&View Folder</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/gui/modeditwindow.h b/gui/modeditwindow.h index 87b02938..e69de29b 100644 --- a/gui/modeditwindow.h +++ b/gui/modeditwindow.h @@ -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 MODEDITWINDOW_H -#define MODEDITWINDOW_H - -#include <QDialog> - -#include "instance.h" - -namespace Ui { -class ModEditWindow; -} - -class ModEditWindow : public QDialog -{ - Q_OBJECT - -public: - explicit ModEditWindow(QWidget *parent = 0, Instance* m_inst = 0); - ~ModEditWindow(); - -private slots: - /* Mapped for implementation - void on_addTPackButton_clicked(); - void on_delTPackButton_clicked(); - void on_viewTPackButton_clicked(); - - void on_addMlModButton_clicked(); - void on_delMlModButton_clicked(); - void on_viewMlModbutton_clicked(); - - void on_addCoreModButton_clicked(); - void on_delCoreModButton_clicked(); - void on_viewCoreModButton_clicked(); - - void on_addJarModButton_clicked(); - void on_delJarModButton_clicked(); - void on_mcforgeButton_clicked(); - void on_jarModMoveUpButton_clicked(); - void on_jarModMoveDownButton_clicked(); - */ - // Questionable: SettingsDialog doesn't need this for some reason? - void on_buttonBox_rejected(); - -private: - Ui::ModEditWindow *ui; -}; - -#endif // MODEDITWINDOW_H diff --git a/gui/newmodeditwindow.ui b/gui/newmodeditwindow.ui new file mode 100644 index 00000000..a7587d11 --- /dev/null +++ b/gui/newmodeditwindow.ui @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Dialog</class> + <widget class="QDialog" name="Dialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>569</width> + <height>420</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="currentIndex"> + <number>2</number> + </property> + <property name="elideMode"> + <enum>Qt::ElideNone</enum> + </property> + <property name="tabsClosable"> + <bool>false</bool> + </property> + <widget class="QWidget" name="libraryTab"> + <attribute name="title"> + <string>Library</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QTreeView" name="treeView"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="modTab"> + <attribute name="title"> + <string>Mods</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QListView" name="listView"/> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QPushButton" name="addModButton"> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="removeModButton"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="viewModButton"> + <property name="text"> + <string>&View Folder</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="resourcePackTab"> + <attribute name="title"> + <string>Resource Pack</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QListView" name="listView_2"/> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>PushButton</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>PushButton</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton_3"> + <property name="text"> + <string>PushButton</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="autoFillBackground"> + <bool>false</bool> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> |