Finalized the About dialog, made it accessible through the start window

This commit is contained in:
parax0 2016-03-21 18:24:12 -06:00
parent b8b9426411
commit e43cc3586b
8 changed files with 69 additions and 43 deletions

View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CAboutDialog</class>
<widget class="QDialog" name="CAboutDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>429</width>
<height>306</height>
</rect>
</property>
<property name="windowTitle">
<string>About</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Prime World Editor v1.0.0&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Prime World Editor is developed by &lt;span style=&quot; font-weight:600;&quot;&gt;Parax&lt;/span&gt;.&lt;br/&gt;All the games it edits are developed by &lt;span style=&quot; font-weight:600;&quot;&gt;Retro Studios&lt;/span&gt; and published by &lt;span style=&quot; font-weight:600;&quot;&gt;Nintendo&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;Special thanks to:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt; The community at &lt;span style=&quot; font-weight:600;&quot;&gt;Metroid2002&lt;/span&gt; that contributed to reverse engineering the game and documenting its internals and file formats; in particular, &lt;span style=&quot; font-weight:600;&quot;&gt;Antidote&lt;/span&gt; and &lt;span style=&quot; font-weight:600;&quot;&gt;jackoalan&lt;/span&gt;, among others!&lt;/li&gt;&lt;li&gt; &lt;span style=&quot; font-weight:600;&quot;&gt;Miles: &lt;/span&gt;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.&lt;/li&gt;&lt;li&gt; &lt;span style=&quot; font-weight:600;&quot;&gt;Bearborg:&lt;/span&gt; Lots of testing and feedback, plus the UI icons and some script object assets.&lt;/li&gt;&lt;li&gt; &lt;span style=&quot; font-weight:600;&quot;&gt;Omega: &lt;/span&gt;Script object assets.&lt;/li&gt;&lt;/ul&gt;Check the &lt;a href=&quot;http://www.metroid2002.com/retromodding/wiki/Retro_Modding_Wiki&quot;&gt;Retro Modding Wiki&lt;/a&gt; for file format documentation.&lt;/p&gt;&lt;p&gt;Prime World Editor uses &lt;span style=&quot; font-weight:600;&quot;&gt;Assimp&lt;/span&gt; (Open Asset Import Library).&lt;br/&gt;Copyright © 2006-2015 assimp team&lt;br/&gt;All rights reserved.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>0</number>
</property>
<property name="indent">
<number>-1</number>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

View File

@ -1,5 +1,6 @@
#include "CStartWindow.h" #include "CStartWindow.h"
#include "ui_CStartWindow.h" #include "ui_CStartWindow.h"
#include "CAboutDialog.h"
#include "CErrorLogDialog.h" #include "CErrorLogDialog.h"
#include "CPakToolDialog.h" #include "CPakToolDialog.h"
#include "UICommon.h" #include "UICommon.h"
@ -20,6 +21,8 @@ CStartWindow::CStartWindow(QWidget *parent) :
mpWorld = nullptr; mpWorld = nullptr;
mpWorldEditor = new CWorldEditor(0); mpWorldEditor = new CWorldEditor(0);
mpModelEditor = new CModelEditorWindow(this); mpModelEditor = new CModelEditorWindow(this);
connect(ui->ActionAbout, SIGNAL(triggered()), this, SLOT(About()));
} }
CStartWindow::~CStartWindow() CStartWindow::~CStartWindow()
@ -232,3 +235,9 @@ void CStartWindow::on_actionExtract_PAK_triggered()
QMessageBox::warning(this, "Error", "Unable to extract pak."); QMessageBox::warning(this, "Error", "Unable to extract pak.");
} }
} }
void CStartWindow::About()
{
CAboutDialog Dialog(this);
Dialog.exec();
}

View File

@ -41,6 +41,8 @@ private slots:
void on_actionExtract_PAK_triggered(); void on_actionExtract_PAK_triggered();
void About();
private: private:
void FillWorldUI(); void FillWorldUI();
void FillAreaUI(); void FillAreaUI();

View File

@ -230,8 +230,15 @@
</property> </property>
<addaction name="actionLaunch_model_viewer"/> <addaction name="actionLaunch_model_viewer"/>
</widget> </widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>Help</string>
</property>
<addaction name="ActionAbout"/>
</widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menuTools"/> <addaction name="menuTools"/>
<addaction name="menuHelp"/>
</widget> </widget>
<action name="actionOpen_pak"> <action name="actionOpen_pak">
<property name="text"> <property name="text">
@ -253,6 +260,11 @@
<string>Launch model viewer</string> <string>Launch model viewer</string>
</property> </property>
</action> </action>
<action name="ActionAbout">
<property name="text">
<string>About</string>
</property>
</action>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -107,7 +107,6 @@ HEADERS += \
Widgets/WTextureGLWidget.h \ Widgets/WTextureGLWidget.h \
Widgets/WTexturePreviewPanel.h \ Widgets/WTexturePreviewPanel.h \
Widgets/WVectorEditor.h \ Widgets/WVectorEditor.h \
WorldEditor/CAboutDialog.h \
WorldEditor/CLayerEditor.h \ WorldEditor/CLayerEditor.h \
WorldEditor/CLayerModel.h \ WorldEditor/CLayerModel.h \
WorldEditor/CLinkModel.h \ WorldEditor/CLinkModel.h \
@ -159,7 +158,8 @@ HEADERS += \
CNodeCopyMimeData.h \ CNodeCopyMimeData.h \
Undo/CPasteNodesCommand.h \ Undo/CPasteNodesCommand.h \
CPakToolDialog.h \ CPakToolDialog.h \
WorldEditor/CRepackInfoDialog.h WorldEditor/CRepackInfoDialog.h \
CAboutDialog.h
# Source Files # Source Files
SOURCES += \ SOURCES += \
@ -181,7 +181,6 @@ SOURCES += \
Widgets/WTextureGLWidget.cpp \ Widgets/WTextureGLWidget.cpp \
Widgets/WTexturePreviewPanel.cpp \ Widgets/WTexturePreviewPanel.cpp \
Widgets/WVectorEditor.cpp \ Widgets/WVectorEditor.cpp \
WorldEditor/CAboutDialog.cpp \
WorldEditor/CLayerEditor.cpp \ WorldEditor/CLayerEditor.cpp \
WorldEditor/CLayerModel.cpp \ WorldEditor/CLayerModel.cpp \
WorldEditor/CLinkModel.cpp \ WorldEditor/CLinkModel.cpp \
@ -219,7 +218,8 @@ SOURCES += \
Undo/CCreateInstanceCommand.cpp \ Undo/CCreateInstanceCommand.cpp \
Undo/CCloneSelectionCommand.cpp \ Undo/CCloneSelectionCommand.cpp \
Undo/CPasteNodesCommand.cpp \ Undo/CPasteNodesCommand.cpp \
WorldEditor/CRepackInfoDialog.cpp WorldEditor/CRepackInfoDialog.cpp \
CAboutDialog.cpp
# UI Files # UI Files
FORMS += \ FORMS += \
@ -228,7 +228,6 @@ FORMS += \
ModelEditor/CModelEditorWindow.ui \ ModelEditor/CModelEditorWindow.ui \
Widgets/WScanPreviewPanel.ui \ Widgets/WScanPreviewPanel.ui \
Widgets/WTexturePreviewPanel.ui \ Widgets/WTexturePreviewPanel.ui \
WorldEditor/CAboutDialog.ui \
WorldEditor/CLayerEditor.ui \ WorldEditor/CLayerEditor.ui \
WorldEditor/CWorldEditor.ui \ WorldEditor/CWorldEditor.ui \
WorldEditor/WCreateTab.ui \ WorldEditor/WCreateTab.ui \
@ -239,4 +238,5 @@ FORMS += \
WorldEditor/CTemplateEditDialog.ui \ WorldEditor/CTemplateEditDialog.ui \
WorldEditor/CLinkDialog.ui \ WorldEditor/CLinkDialog.ui \
WorldEditor/CSelectInstanceDialog.ui \ WorldEditor/CSelectInstanceDialog.ui \
WorldEditor/CRepackInfoDialog.ui WorldEditor/CRepackInfoDialog.ui \
CAboutDialog.ui

View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CAboutDialog</class>
<widget class="QDialog" name="CAboutDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>429</width>
<height>210</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prime World Editor is developed by &lt;span style=&quot; font-weight:600;&quot;&gt;Parax0&lt;/span&gt;.&lt;br/&gt;All the games it edits are developed by &lt;span style=&quot; font-weight:600;&quot;&gt;Retro Studios&lt;/span&gt; and published by &lt;span style=&quot; font-weight:600;&quot;&gt;Nintendo&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;Special thanks to:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dario FF&lt;/span&gt;: Various programming help and design feedback&lt;span style=&quot; font-weight:600;&quot;&gt;&lt;br/&gt;Bearborg&lt;/span&gt;: UI icons&lt;br/&gt;Thanks to the community at &lt;span style=&quot; font-weight:600;&quot;&gt;Metroid2002&lt;/span&gt;, who worked collaboratively on reverse engineering the games and documenting their file formats.&lt;/p&gt;&lt;p&gt;Check the &lt;a href=&quot;http://www.metroid2002.com/retromodding/wiki/Retro_Modding_Wiki&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Retro Modding Wiki&lt;/span&gt;&lt;/a&gt; for file format documentation.&lt;/p&gt;&lt;p&gt;Prime World Editor uses Assimp (Open Asset Import Library).&lt;br/&gt;Copyright © 2006-2012 assimp team&lt;br/&gt;All rights reserved.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>0</number>
</property>
<property name="indent">
<number>-1</number>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>