birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed controller.ui --> view.ui, minor tweaks in response to PR

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-10-05 17:46:55 -07:00
parent afc010215f
commit 5969c94d22
6 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
+3 -3
View File
@@ -34,8 +34,8 @@
#include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
#include <ScriptCanvas/Components/EditorGraph.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ui_Controller.h>
#include <Editor/View/Windows/Tools/UpgradeTool/moc_Controller.cpp>
#include <Editor/View/Windows/Tools/UpgradeTool/ui_View.h>
// #include <Editor/View/Windows/Tools/UpgradeTool/moc_View.cpp>
namespace ScriptCanvasEditor
{
@@ -43,7 +43,7 @@ namespace ScriptCanvasEditor
{
Controller::Controller(QWidget* parent)
: AzQtComponents::StyledDialog(parent)
, m_view(new Ui::Controller())
, m_view(new Ui::View())
{
m_view->setupUi(this);
m_view->tableWidget->horizontalHeader()->setVisible(false);
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.h
+3 -2
View File
@@ -11,6 +11,7 @@
#if !defined(Q_MOC_RUN)
#include <AzCore/Component/EntityId.h>
#include <AzCore/PlatformDef.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzQtComponents/Components/StyledDialog.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
#include <ISystem.h>
@@ -26,7 +27,7 @@ class QTableWidgetItem;
namespace Ui
{
class Controller;
class View;
}
namespace AzQtComponents
@@ -58,7 +59,7 @@ namespace ScriptCanvasEditor
static constexpr int ColumnBrowse = 2;
static constexpr int ColumnStatus = 3;
AZStd::unique_ptr<Ui::Controller> m_view;
AZStd::unique_ptr<Ui::View> m_view;
int m_handledAssetCount = 0;
void AddLogEntries();
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.h
+1 -1
View File
@@ -21,7 +21,7 @@ namespace ScriptCanvasEditor
{
namespace VersionExplorer
{
//!Scoped utility to set and restore the "ed_KeepEditorActive" CVar in order to allow
//! Scoped utility to set and restore the "ed_KeepEditorActive" CVar in order to allow
//! the upgrade tool to work even if the editor is not in the foreground
class EditorKeepAlive
{
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
-5
View File
@@ -8,11 +8,6 @@
#include <Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h>
namespace LoggerCpp
{
}
namespace ScriptCanvasEditor
{
namespace VersionExplorer
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.ui → Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/View.ui
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Controller</class>
<widget class="QWidget" name="Controller">
<class>View</class>
<widget class="QWidget" name="View">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
+1 -1
View File
@@ -261,7 +261,6 @@ set(FILES
Editor/View/Windows/ScriptCanvasEditorResources.qrc
Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
Editor/View/Windows/Tools/UpgradeTool/Controller.h
Editor/View/Windows/Tools/UpgradeTool/Controller.ui
Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
Editor/View/Windows/Tools/UpgradeTool/FileSaver.h
Editor/View/Windows/Tools/UpgradeTool/LogTraits.h
@@ -277,6 +276,7 @@ set(FILES
Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.ui
Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h
Editor/View/Windows/Tools/UpgradeTool/View.ui
Editor/Framework/ScriptCanvasGraphUtilities.inl
Editor/Framework/ScriptCanvasGraphUtilities.h
Editor/Framework/ScriptCanvasTraceUtilities.h