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

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
monroegm-disable-blank-issue-2
chcurran 4 years ago
parent afc010215f
commit 5969c94d22

@ -34,8 +34,8 @@
#include <ScriptCanvas/Bus/EditorScriptCanvasBus.h> #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
#include <ScriptCanvas/Components/EditorGraph.h> #include <ScriptCanvas/Components/EditorGraph.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ui_Controller.h> #include <Editor/View/Windows/Tools/UpgradeTool/ui_View.h>
#include <Editor/View/Windows/Tools/UpgradeTool/moc_Controller.cpp> // #include <Editor/View/Windows/Tools/UpgradeTool/moc_View.cpp>
namespace ScriptCanvasEditor namespace ScriptCanvasEditor
{ {
@ -43,7 +43,7 @@ namespace ScriptCanvasEditor
{ {
Controller::Controller(QWidget* parent) Controller::Controller(QWidget* parent)
: AzQtComponents::StyledDialog(parent) : AzQtComponents::StyledDialog(parent)
, m_view(new Ui::Controller()) , m_view(new Ui::View())
{ {
m_view->setupUi(this); m_view->setupUi(this);
m_view->tableWidget->horizontalHeader()->setVisible(false); m_view->tableWidget->horizontalHeader()->setVisible(false);

@ -11,6 +11,7 @@
#if !defined(Q_MOC_RUN) #if !defined(Q_MOC_RUN)
#include <AzCore/Component/EntityId.h> #include <AzCore/Component/EntityId.h>
#include <AzCore/PlatformDef.h> #include <AzCore/PlatformDef.h>
#include <AzCore/std/smart_ptr/unique_ptr.h>
#include <AzQtComponents/Components/StyledDialog.h> #include <AzQtComponents/Components/StyledDialog.h>
#include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h> #include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
#include <ISystem.h> #include <ISystem.h>
@ -26,7 +27,7 @@ class QTableWidgetItem;
namespace Ui namespace Ui
{ {
class Controller; class View;
} }
namespace AzQtComponents namespace AzQtComponents
@ -58,7 +59,7 @@ namespace ScriptCanvasEditor
static constexpr int ColumnBrowse = 2; static constexpr int ColumnBrowse = 2;
static constexpr int ColumnStatus = 3; static constexpr int ColumnStatus = 3;
AZStd::unique_ptr<Ui::Controller> m_view; AZStd::unique_ptr<Ui::View> m_view;
int m_handledAssetCount = 0; int m_handledAssetCount = 0;
void AddLogEntries(); void AddLogEntries();

@ -21,7 +21,7 @@ namespace ScriptCanvasEditor
{ {
namespace VersionExplorer 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 //! the upgrade tool to work even if the editor is not in the foreground
class EditorKeepAlive class EditorKeepAlive
{ {

@ -8,11 +8,6 @@
#include <Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h> #include <Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h>
namespace LoggerCpp
{
}
namespace ScriptCanvasEditor namespace ScriptCanvasEditor
{ {
namespace VersionExplorer namespace VersionExplorer

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>Controller</class> <class>View</class>
<widget class="QWidget" name="Controller"> <widget class="QWidget" name="View">
<property name="windowModality"> <property name="windowModality">
<enum>Qt::WindowModal</enum> <enum>Qt::WindowModal</enum>
</property> </property>

@ -261,7 +261,6 @@ set(FILES
Editor/View/Windows/ScriptCanvasEditorResources.qrc Editor/View/Windows/ScriptCanvasEditorResources.qrc
Editor/View/Windows/Tools/UpgradeTool/Controller.cpp Editor/View/Windows/Tools/UpgradeTool/Controller.cpp
Editor/View/Windows/Tools/UpgradeTool/Controller.h 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.cpp
Editor/View/Windows/Tools/UpgradeTool/FileSaver.h Editor/View/Windows/Tools/UpgradeTool/FileSaver.h
Editor/View/Windows/Tools/UpgradeTool/LogTraits.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/UpgradeHelper.ui
Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.cpp
Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h Editor/View/Windows/Tools/UpgradeTool/VersionExplorerLog.h
Editor/View/Windows/Tools/UpgradeTool/View.ui
Editor/Framework/ScriptCanvasGraphUtilities.inl Editor/Framework/ScriptCanvasGraphUtilities.inl
Editor/Framework/ScriptCanvasGraphUtilities.h Editor/Framework/ScriptCanvasGraphUtilities.h
Editor/Framework/ScriptCanvasTraceUtilities.h Editor/Framework/ScriptCanvasTraceUtilities.h

Loading…
Cancel
Save