From e43cc3586b6f8033186aa1ed8385b532e9c9052e Mon Sep 17 00:00:00 2001 From: parax0 Date: Mon, 21 Mar 2016 18:24:12 -0600 Subject: [PATCH] Finalized the About dialog, made it accessible through the start window --- src/Editor/{WorldEditor => }/CAboutDialog.cpp | 0 src/Editor/{WorldEditor => }/CAboutDialog.h | 0 src/Editor/CAboutDialog.ui | 40 +++++++++++++++++++ src/Editor/CStartWindow.cpp | 9 +++++ src/Editor/CStartWindow.h | 2 + src/Editor/CStartWindow.ui | 12 ++++++ src/Editor/Editor.pro | 12 +++--- src/Editor/WorldEditor/CAboutDialog.ui | 37 ----------------- 8 files changed, 69 insertions(+), 43 deletions(-) rename src/Editor/{WorldEditor => }/CAboutDialog.cpp (100%) rename src/Editor/{WorldEditor => }/CAboutDialog.h (100%) create mode 100644 src/Editor/CAboutDialog.ui delete mode 100644 src/Editor/WorldEditor/CAboutDialog.ui diff --git a/src/Editor/WorldEditor/CAboutDialog.cpp b/src/Editor/CAboutDialog.cpp similarity index 100% rename from src/Editor/WorldEditor/CAboutDialog.cpp rename to src/Editor/CAboutDialog.cpp diff --git a/src/Editor/WorldEditor/CAboutDialog.h b/src/Editor/CAboutDialog.h similarity index 100% rename from src/Editor/WorldEditor/CAboutDialog.h rename to src/Editor/CAboutDialog.h diff --git a/src/Editor/CAboutDialog.ui b/src/Editor/CAboutDialog.ui new file mode 100644 index 00000000..fb798226 --- /dev/null +++ b/src/Editor/CAboutDialog.ui @@ -0,0 +1,40 @@ + + + CAboutDialog + + + + 0 + 0 + 429 + 306 + + + + About + + + + + + <html><head/><body><p><span style=" font-size:12pt; font-weight:600;">Prime World Editor v1.0.0</span></p><p>Prime World Editor is developed by <span style=" font-weight:600;">Parax</span>.<br/>All the games it edits are developed by <span style=" font-weight:600;">Retro Studios</span> and published by <span style=" font-weight:600;">Nintendo</span>.</p><p>Special thanks to:</p><p><ul><li> The community at <span style=" font-weight:600;">Metroid2002</span> that contributed to reverse engineering the game and documenting its internals and file formats; in particular, <span style=" font-weight:600;">Antidote</span> and <span style=" font-weight:600;">jackoalan</span>, among others!</li><li> <span style=" font-weight:600;">Miles: </span>In addition to helping reverse engineer a few formats (in particular MLVL and MREA), also contributed greatly to putting together the script object templates and documenting object properties.</li><li> <span style=" font-weight:600;">Bearborg:</span> Lots of testing and feedback, plus the UI icons and some script object assets.</li><li> <span style=" font-weight:600;">Omega: </span>Script object assets.</li></ul>Check the <a href="http://www.metroid2002.com/retromodding/wiki/Retro_Modding_Wiki">Retro Modding Wiki</a> for file format documentation.</p><p>Prime World Editor uses <span style=" font-weight:600;">Assimp</span> (Open Asset Import Library).<br/>Copyright © 2006-2015 assimp team<br/>All rights reserved.</p></body></html> + + + true + + + 0 + + + -1 + + + true + + + + + + + + diff --git a/src/Editor/CStartWindow.cpp b/src/Editor/CStartWindow.cpp index 42170a75..02003341 100644 --- a/src/Editor/CStartWindow.cpp +++ b/src/Editor/CStartWindow.cpp @@ -1,5 +1,6 @@ #include "CStartWindow.h" #include "ui_CStartWindow.h" +#include "CAboutDialog.h" #include "CErrorLogDialog.h" #include "CPakToolDialog.h" #include "UICommon.h" @@ -20,6 +21,8 @@ CStartWindow::CStartWindow(QWidget *parent) : mpWorld = nullptr; mpWorldEditor = new CWorldEditor(0); mpModelEditor = new CModelEditorWindow(this); + + connect(ui->ActionAbout, SIGNAL(triggered()), this, SLOT(About())); } CStartWindow::~CStartWindow() @@ -232,3 +235,9 @@ void CStartWindow::on_actionExtract_PAK_triggered() QMessageBox::warning(this, "Error", "Unable to extract pak."); } } + +void CStartWindow::About() +{ + CAboutDialog Dialog(this); + Dialog.exec(); +} diff --git a/src/Editor/CStartWindow.h b/src/Editor/CStartWindow.h index bd26a1a2..fea920d5 100644 --- a/src/Editor/CStartWindow.h +++ b/src/Editor/CStartWindow.h @@ -41,6 +41,8 @@ private slots: void on_actionExtract_PAK_triggered(); + void About(); + private: void FillWorldUI(); void FillAreaUI(); diff --git a/src/Editor/CStartWindow.ui b/src/Editor/CStartWindow.ui index c26dab3b..35d2f5d6 100644 --- a/src/Editor/CStartWindow.ui +++ b/src/Editor/CStartWindow.ui @@ -230,8 +230,15 @@ + + + Help + + + + @@ -253,6 +260,11 @@ Launch model viewer + + + About + + diff --git a/src/Editor/Editor.pro b/src/Editor/Editor.pro index 4aea1dac..48b49a1d 100644 --- a/src/Editor/Editor.pro +++ b/src/Editor/Editor.pro @@ -107,7 +107,6 @@ HEADERS += \ Widgets/WTextureGLWidget.h \ Widgets/WTexturePreviewPanel.h \ Widgets/WVectorEditor.h \ - WorldEditor/CAboutDialog.h \ WorldEditor/CLayerEditor.h \ WorldEditor/CLayerModel.h \ WorldEditor/CLinkModel.h \ @@ -159,7 +158,8 @@ HEADERS += \ CNodeCopyMimeData.h \ Undo/CPasteNodesCommand.h \ CPakToolDialog.h \ - WorldEditor/CRepackInfoDialog.h + WorldEditor/CRepackInfoDialog.h \ + CAboutDialog.h # Source Files SOURCES += \ @@ -181,7 +181,6 @@ SOURCES += \ Widgets/WTextureGLWidget.cpp \ Widgets/WTexturePreviewPanel.cpp \ Widgets/WVectorEditor.cpp \ - WorldEditor/CAboutDialog.cpp \ WorldEditor/CLayerEditor.cpp \ WorldEditor/CLayerModel.cpp \ WorldEditor/CLinkModel.cpp \ @@ -219,7 +218,8 @@ SOURCES += \ Undo/CCreateInstanceCommand.cpp \ Undo/CCloneSelectionCommand.cpp \ Undo/CPasteNodesCommand.cpp \ - WorldEditor/CRepackInfoDialog.cpp + WorldEditor/CRepackInfoDialog.cpp \ + CAboutDialog.cpp # UI Files FORMS += \ @@ -228,7 +228,6 @@ FORMS += \ ModelEditor/CModelEditorWindow.ui \ Widgets/WScanPreviewPanel.ui \ Widgets/WTexturePreviewPanel.ui \ - WorldEditor/CAboutDialog.ui \ WorldEditor/CLayerEditor.ui \ WorldEditor/CWorldEditor.ui \ WorldEditor/WCreateTab.ui \ @@ -239,4 +238,5 @@ FORMS += \ WorldEditor/CTemplateEditDialog.ui \ WorldEditor/CLinkDialog.ui \ WorldEditor/CSelectInstanceDialog.ui \ - WorldEditor/CRepackInfoDialog.ui + WorldEditor/CRepackInfoDialog.ui \ + CAboutDialog.ui diff --git a/src/Editor/WorldEditor/CAboutDialog.ui b/src/Editor/WorldEditor/CAboutDialog.ui deleted file mode 100644 index 850abdfb..00000000 --- a/src/Editor/WorldEditor/CAboutDialog.ui +++ /dev/null @@ -1,37 +0,0 @@ - - - CAboutDialog - - - - 0 - 0 - 429 - 210 - - - - Dialog - - - - - - <html><head/><body><p>Prime World Editor is developed by <span style=" font-weight:600;">Parax0</span>.<br/>All the games it edits are developed by <span style=" font-weight:600;">Retro Studios</span> and published by <span style=" font-weight:600;">Nintendo</span>.</p><p>Special thanks to:</p><p><span style=" font-weight:600;">Dario FF</span>: Various programming help and design feedback<span style=" font-weight:600;"><br/>Bearborg</span>: UI icons<br/>Thanks to the community at <span style=" font-weight:600;">Metroid2002</span>, who worked collaboratively on reverse engineering the games and documenting their file formats.</p><p>Check the <a href="http://www.metroid2002.com/retromodding/wiki/Retro_Modding_Wiki"><span style=" text-decoration: underline; color:#0000ff;">Retro Modding Wiki</span></a> for file format documentation.</p><p>Prime World Editor uses Assimp (Open Asset Import Library).<br/>Copyright © 2006-2012 assimp team<br/>All rights reserved.</p></body></html> - - - true - - - 0 - - - -1 - - - - - - - -