From 6a0257b5090415d6b059361a8a6536bc9ff5e270 Mon Sep 17 00:00:00 2001 From: Dayo Lawal Date: Thu, 15 Jul 2021 16:23:46 -0500 Subject: [PATCH] Reverting changes to AtomTools windows Signed-off-by: Dayo Lawal --- .../Source/Window/MaterialEditorWindow.cpp | 5 +- .../Code/Source/Window/MaterialEditorWindow.h | 6 +-- .../Window/ShaderManagementConsoleWindow.cpp | 49 +++++++++---------- .../Window/ShaderManagementConsoleWindow.h | 4 +- 4 files changed, 30 insertions(+), 34 deletions(-) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp index 34962806cc..7c3a912b95 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp @@ -116,11 +116,11 @@ namespace MaterialEditor vl->addWidget(m_materialViewport); m_centralWidget->setLayout(vl); setCentralWidget(m_centralWidget); - + m_statusBar = new StatusBarWidget(this); m_statusBar->setObjectName("StatusBar"); statusBar()->addPermanentWidget(m_statusBar, 1); - + SetupMenu(); SetupTabs(); @@ -754,7 +754,6 @@ namespace MaterialEditor m_tabWidget->setCurrentIndex((m_tabWidget->currentIndex() + 1) % m_tabWidget->count()); } } - } // namespace MaterialEditor #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h index 8c288abca9..165767ecc5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.h @@ -75,13 +75,13 @@ namespace MaterialEditor void OnDocumentSaved(const AZ::Uuid& documentId) override; void SetupMenu(); - void SetupTabs(); + void SetupTabs(); void AddTabForDocumentId(const AZ::Uuid& documentId); void RemoveTabForDocumentId(const AZ::Uuid& documentId); void UpdateTabForDocumentId(const AZ::Uuid& documentId); - AZ::Uuid GetDocumentIdFromTab(const int tabIndex) const; QString GetDocumentPath(const AZ::Uuid& documentId) const; + AZ::Uuid GetDocumentIdFromTab(const int tabIndex) const; void OpenTabContextMenu(); void SelectPreviousTab(); @@ -90,8 +90,8 @@ namespace MaterialEditor void closeEvent(QCloseEvent* closeEvent) override; AzQtComponents::FancyDocking* m_advancedDockManager = nullptr; - QMenuBar* m_menuBar = nullptr; QWidget* m_centralWidget = nullptr; + QMenuBar* m_menuBar = nullptr; AzQtComponents::TabWidget* m_tabWidget = nullptr; MaterialViewportWidget* m_materialViewport = nullptr; MaterialEditorToolBar* m_toolBar = nullptr; diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp index fea10dfb7a..103299a361 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp @@ -39,10 +39,10 @@ namespace ShaderManagementConsole ShaderManagementConsoleWindow::ShaderManagementConsoleWindow(QWidget* parent /* = 0 */) : AzQtComponents::DockMainWindow(parent) { - m_advancedDockManager = new AzQtComponents::FancyDocking(this); - setWindowTitle("Shader Management Console"); - setObjectName("ShaderManagementConsoleWindow"); + + m_advancedDockManager = new AzQtComponents::FancyDocking(this); + setDockNestingEnabled(true); setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); @@ -50,16 +50,13 @@ namespace ShaderManagementConsole setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); m_menuBar = new QMenuBar(this); - m_menuBar->setObjectName("MenuBar"); setMenuBar(m_menuBar); m_toolBar = new ShaderManagementConsoleToolBar(this); - m_toolBar->setObjectName("ToolBar"); addToolBar(m_toolBar); m_centralWidget = new QWidget(this); m_tabWidget = new AzQtComponents::TabWidget(m_centralWidget); - m_tabWidget->setObjectName("TabWidget"); m_tabWidget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Preferred); m_tabWidget->setContentsMargins(0, 0, 0, 0); @@ -146,7 +143,7 @@ namespace ShaderManagementConsole m_actionUndo->setEnabled(canUndo); m_actionRedo->setEnabled(canRedo); - m_actionSettings->setEnabled(false); + m_actionPreferences->setEnabled(false); m_actionAssetBrowser->setEnabled(true); m_actionPythonTerminal->setEnabled(true); @@ -266,9 +263,9 @@ namespace ShaderManagementConsole m_menuEdit->addSeparator(); - m_actionSettings = m_menuEdit->addAction("&Preferences...", [this]() { + m_actionPreferences = m_menuEdit->addAction("&Preferences...", [this]() { }, QKeySequence::Preferences); - m_actionSettings->setEnabled(false); + m_actionPreferences->setEnabled(false); m_menuView = m_menuBar->addMenu("&View"); @@ -474,6 +471,23 @@ namespace ShaderManagementConsole } } + void ShaderManagementConsoleWindow::SelectPreviousTab() + { + if (m_tabWidget->count() > 1) + { + // Adding count to wrap around when index <= 0 + m_tabWidget->setCurrentIndex((m_tabWidget->currentIndex() + m_tabWidget->count() - 1) % m_tabWidget->count()); + } + } + + void ShaderManagementConsoleWindow::SelectNextTab() + { + if (m_tabWidget->count() > 1) + { + m_tabWidget->setCurrentIndex((m_tabWidget->currentIndex() + 1) % m_tabWidget->count()); + } + } + void ShaderManagementConsoleWindow::SelectDocumentForTab(const int tabIndex) { const AZ::Uuid documentId = GetDocumentIdFromTab(tabIndex); @@ -554,23 +568,6 @@ namespace ShaderManagementConsole } } } - - void ShaderManagementConsoleWindow::SelectPreviousTab() - { - if (m_tabWidget->count() > 1) - { - // Adding count to wrap around when index <= 0 - m_tabWidget->setCurrentIndex((m_tabWidget->currentIndex() + m_tabWidget->count() - 1) % m_tabWidget->count()); - } - } - - void ShaderManagementConsoleWindow::SelectNextTab() - { - if (m_tabWidget->count() > 1) - { - m_tabWidget->setCurrentIndex((m_tabWidget->currentIndex() + 1) % m_tabWidget->count()); - } - } } // namespace ShaderManagementConsole #include diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h index f35000ce26..0f8824f809 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.h @@ -60,8 +60,8 @@ namespace ShaderManagementConsole void OnDocumentSaved(const AZ::Uuid& documentId) override; void SetupMenu(); - void SetupTabs(); + void SetupTabs(); void AddTabForDocumentId(const AZ::Uuid& documentId); void RemoveTabForDocumentId(const AZ::Uuid& documentId); void UpdateTabForDocumentId(const AZ::Uuid& documentId); @@ -105,7 +105,7 @@ namespace ShaderManagementConsole QMenu* m_menuEdit = {}; QAction* m_actionUndo = {}; QAction* m_actionRedo = {}; - QAction* m_actionSettings = {}; + QAction* m_actionPreferences = {}; QMenu* m_menuView = {}; QAction* m_actionAssetBrowser = {};