AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-05-25 16:51:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added/updated some icons and made some UI changes - added/changed some UI actions and removed some UI elements that aren't being used

Browse Source
This commit is contained in:
parax0 2016-02-20 04:41:07 -07:00
parent 8c722c8308
commit 5fbdfc8298
14 changed files with 52 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Editor/CStartWindow.ui
View File

@ -221,7 +221,6 @@
<property name="title"> <property name="title">
<string>File</string> <string>File</string>
</property> </property>
<addaction name="actionOpen_pak"/>
<addaction name="actionOpen_MLVL"/> <addaction name="actionOpen_MLVL"/>
<addaction name="actionExtract_PAK"/> <addaction name="actionExtract_PAK"/>
</widget> </widget>

5
src/Editor/Icons.qrc
View File

@ -31,5 +31,10 @@
<file>icons/POI Important.png</file> <file>icons/POI Important.png</file>
<file>icons/POI Normal.png</file> <file>icons/POI Normal.png</file>
<file>icons/AppIcon.ico</file> <file>icons/AppIcon.ico</file>
<file>icons/New.png</file>
<file>icons/Open.png</file>
<file>icons/Redo.png</file>
<file>icons/Save.png</file>
<file>icons/Undo.png</file>
</qresource> </qresource>
</RCC> </RCC>

29
src/Editor/WorldEditor/CWorldEditor.cpp
View File

@ -59,10 +59,19 @@ CWorldEditor::CWorldEditor(QWidget *parent) :
ui->menuEdit->insertActions(ui->ActionSelectAll, mUndoActions); ui->menuEdit->insertActions(ui->ActionSelectAll, mUndoActions);
ui->menuEdit->insertSeparator(ui->ActionSelectAll); ui->menuEdit->insertSeparator(ui->ActionSelectAll);
// Initialize offscreen actions // Initialize actions
addAction(ui->ActionIncrementGizmo); addAction(ui->ActionIncrementGizmo);
addAction(ui->ActionDecrementGizmo); addAction(ui->ActionDecrementGizmo);
QAction *pToolBarUndo = mUndoStack.createUndoAction(this);
pToolBarUndo->setIcon(QIcon(":/icons/Undo.png"));
ui->MainToolBar->insertAction(ui->ActionLink, pToolBarUndo);
QAction *pToolBarRedo = mUndoStack.createRedoAction(this);
pToolBarRedo->setIcon(QIcon(":/icons/Redo.png"));
ui->MainToolBar->insertAction(ui->ActionLink, pToolBarRedo);
ui->MainToolBar->insertSeparator(ui->ActionLink);
// Connect signals and slots // Connect signals and slots
connect(ui->MainViewport, SIGNAL(ViewportClick(SRayIntersection,QMouseEvent*)), this, SLOT(OnViewportClick(SRayIntersection,QMouseEvent*))); connect(ui->MainViewport, SIGNAL(ViewportClick(SRayIntersection,QMouseEvent*)), this, SLOT(OnViewportClick(SRayIntersection,QMouseEvent*)));
connect(ui->MainViewport, SIGNAL(InputProcessed(SRayIntersection,QMouseEvent*)), this, SLOT(OnViewportInputProcessed(SRayIntersection,QMouseEvent*))); connect(ui->MainViewport, SIGNAL(InputProcessed(SRayIntersection,QMouseEvent*)), this, SLOT(OnViewportInputProcessed(SRayIntersection,QMouseEvent*)));
@ -85,8 +94,6 @@ CWorldEditor::CWorldEditor(QWidget *parent) :
ui->CreateTabEditorProperties->SyncToEditor(this); ui->CreateTabEditorProperties->SyncToEditor(this);
ui->ModifyTabEditorProperties->SyncToEditor(this); ui->ModifyTabEditorProperties->SyncToEditor(this);
ui->InstancesTabEditorProperties->SyncToEditor(this); ui->InstancesTabEditorProperties->SyncToEditor(this);
ui->DisplayTabEditorProperties->SyncToEditor(this);
ui->WorldTabEditorProperties->SyncToEditor(this);
} }
CWorldEditor::~CWorldEditor() CWorldEditor::~CWorldEditor()
@ -155,21 +162,13 @@ void CWorldEditor::SetArea(CWorld *pWorld, CGameArea *pArea, u32 AreaIndex)
UpdateCameraOrbit(); UpdateCameraOrbit();
// Default bloom to Fake Bloom for Metroid Prime 3; disable for other games // Default bloom to Fake Bloom for Metroid Prime 3; disable for other games
if (mpWorld->Version() == eCorruption) bool AllowBloom = (mpWorld->Version() == eCorruptionProto || mpWorld->Version() == eCorruption);
{ AllowBloom ? on_ActionFakeBloom_triggered() : on_ActionNoBloom_triggered();
ui->menuBloom->setVisible(true); ui->menuBloom->setEnabled(AllowBloom);
on_ActionFakeBloom_triggered();
}
else
{
ui->menuBloom->setVisible(false);
on_ActionNoBloom_triggered();
}
// Disable EGMC editing for Prime 1 and DKCR // Disable EGMC editing for Prime 1 and DKCR
bool AllowEGMC = ( (mpWorld->Version() >= eEchoesDemo) && (mpWorld->Version() <= eCorruption) ); bool AllowEGMC = ( (mpWorld->Version() >= eEchoesDemo) && (mpWorld->Version() <= eCorruption) );
ui->ActionEditPoiToWorldMap->setVisible(AllowEGMC); ui->ActionEditPoiToWorldMap->setEnabled(AllowEGMC);
// Set up sidebar tabs // Set up sidebar tabs
CMasterTemplate *pMaster = CMasterTemplate::GetMasterForGame(mpArea->Version()); CMasterTemplate *pMaster = CMasterTemplate::GetMasterForGame(mpArea->Version());

168
src/Editor/WorldEditor/CWorldEditor.ui
View File

@ -370,94 +370,36 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="DisplayTab"> </widget>
<attribute name="icon"> </widget>
<iconset resource="../Icons.qrc">
<normaloff>:/icons/Display.png</normaloff>:/icons/Display.png</iconset>
</attribute>
<attribute name="title">
<string/>
</attribute>
<attribute name="toolTip">
<string>Display</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="WEditorProperties" name="DisplayTabEditorProperties" native="true"/>
</item> </item>
<item> </layout>
<spacer name="verticalSpacer_2"> </widget>
<property name="orientation"> <widget class="QStatusBar" name="statusbar"/>
<enum>Qt::Vertical</enum> <widget class="QToolBar" name="MainToolBar">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="windowTitle">
<string>toolBar</string>
</property>
<property name="iconSize">
<size> <size>
<width>20</width> <width>32</width>
<height>40</height> <height>32</height>
</size> </size>
</property> </property>
</spacer> <attribute name="toolBarArea">
</item> <enum>TopToolBarArea</enum>
</layout>
</widget>
<widget class="QWidget" name="WorldTab">
<attribute name="icon">
<iconset resource="../Icons.qrc">
<normaloff>:/icons/World.png</normaloff>:/icons/World.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="toolBarBreak">
<string/> <bool>false</bool>
</attribute> </attribute>
<attribute name="toolTip"> <addaction name="ActionSave"/>
<string>World</string> <addaction name="separator"/>
</attribute> <addaction name="ActionLink"/>
<layout class="QVBoxLayout" name="verticalLayout_8"> <addaction name="ActionUnlink"/>
<property name="leftMargin"> <addaction name="separator"/>
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="WEditorProperties" name="WorldTabEditorProperties" native="true"/>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">
@ -472,20 +414,8 @@
<property name="title"> <property name="title">
<string>File</string> <string>File</string>
</property> </property>
<addaction name="ActionOpen"/>
<addaction name="ActionSave"/> <addaction name="ActionSave"/>
</widget> </widget>
<widget class="QMenu" name="menuWindow">
<property name="title">
<string>Window</string>
</property>
</widget>
<widget class="QMenu" name="menuModels">
<property name="title">
<string>Models</string>
</property>
<addaction name="actionOpen_model_viewer"/>
</widget>
<widget class="QMenu" name="menuEdit"> <widget class="QMenu" name="menuEdit">
<property name="title"> <property name="title">
<string>Edit</string> <string>Edit</string>
@ -540,51 +470,6 @@
<addaction name="menuEdit"/> <addaction name="menuEdit"/>
<addaction name="menuTools"/> <addaction name="menuTools"/>
<addaction name="menuView"/> <addaction name="menuView"/>
<addaction name="menuModels"/>
<addaction name="menuWindow"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="FileToolBar">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="windowTitle">
<string>toolBar_2</string>
</property>
<property name="movable">
<bool>false</bool>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="ActionOpen"/>
<addaction name="ActionSave"/>
</widget>
<widget class="QToolBar" name="MainToolBar">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
</property>
<property name="windowTitle">
<string>toolBar</string>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>true</bool>
</attribute>
<addaction name="ActionLink"/>
<addaction name="ActionUnlink"/>
<addaction name="separator"/>
</widget> </widget>
<action name="ActionOpen"> <action name="ActionOpen">
<property name="text"> <property name="text">
@ -592,9 +477,16 @@
</property> </property>
</action> </action>
<action name="ActionSave"> <action name="ActionSave">
<property name="icon">
<iconset resource="../Icons.qrc">
<normaloff>:/icons/Save.png</normaloff>:/icons/Save.png</iconset>
</property>
<property name="text"> <property name="text">
<string>Save</string> <string>Save</string>
</property> </property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action> </action>
<action name="actionOpen_model_viewer"> <action name="actionOpen_model_viewer">
<property name="text"> <property name="text">

BIN
src/Editor/icons/Create.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
src/Editor/icons/Display.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
src/Editor/icons/Instances.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/Editor/icons/Modify.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
src/Editor/icons/New.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/Editor/icons/Open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
src/Editor/icons/Redo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
src/Editor/icons/Save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
src/Editor/icons/Undo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
src/Editor/icons/World.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB