From 012ab89a23f9f453512fbcf581e209a668573881 Mon Sep 17 00:00:00 2001 From: jjjoness <82226755+jjjoness@users.noreply.github.com> Date: Thu, 22 Apr 2021 15:45:55 +0100 Subject: [PATCH 1/4] Changed Play Console to right of toolbar. --- Code/Sandbox/Editor/MainWindow.cpp | 16 ++++++++++++++-- Code/Sandbox/Editor/MainWindow.h | 1 + Code/Sandbox/Editor/Resource.h | 1 + Code/Sandbox/Editor/ToolbarManager.cpp | 17 ++++++++++++++--- Code/Sandbox/Editor/ToolbarManager.h | 1 + 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp index d7659c2512..e6f30cc6d3 100644 --- a/Code/Sandbox/Editor/MainWindow.cpp +++ b/Code/Sandbox/Editor/MainWindow.cpp @@ -761,6 +761,7 @@ void MainWindow::InitActions() am->AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, QString()); am->AddAction(ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE, QString()); am->AddAction(ID_TOOLBAR_WIDGET_DEBUG_MODE, QString()); + am->AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, QString()); // File actions am->AddAction(ID_FILE_NEW, tr("New Level")) @@ -1252,9 +1253,9 @@ void MainWindow::InitActions() .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem); // Fame actions - am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game")) + am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play Console")) .SetShortcut(tr("Ctrl+G")) - .SetToolTip(tr("Play Game (Ctrl+G)")) + .SetToolTip(tr("Play Console (Ctrl+G)")) .SetStatusTip(tr("Activate the game input mode")) .SetApplyHoverEffect() .SetCheckable(true) @@ -1626,6 +1627,14 @@ QToolButton* MainWindow::CreateDebugModeButton() return debugModeButton; } +QWidget* MainWindow::CreateSpacerRightWidget() +{ + QWidget* spacer = new QWidget(); + spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + spacer->setVisible(true); + return spacer; +} + void MainWindow::InitEnvironmentModeMenu(CVarMenu* environmentModeMenu) { environmentModeMenu->clear(); @@ -2535,6 +2544,9 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId) case ID_TOOLBAR_WIDGET_DEBUG_MODE: w = CreateDebugModeButton(); break; + case ID_TOOLBAR_WIDGET_SPACER_RIGHT: + w = CreateSpacerRightWidget(); + break; default: qWarning() << Q_FUNC_INFO << "Unknown id " << actionId; return nullptr; diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h index c40d732cee..e5936f7c42 100644 --- a/Code/Sandbox/Editor/MainWindow.h +++ b/Code/Sandbox/Editor/MainWindow.h @@ -228,6 +228,7 @@ private: QWidget* CreateSnapToGridWidget(); QWidget* CreateSnapToAngleWidget(); + QWidget* CreateSpacerRightWidget(); QComboBox* CreateRefCoordComboBox(); diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Sandbox/Editor/Resource.h index d72c2d76d4..fcb8b57a1e 100644 --- a/Code/Sandbox/Editor/Resource.h +++ b/Code/Sandbox/Editor/Resource.h @@ -408,4 +408,5 @@ #define ID_TOOLBAR_WIDGET_SNAP_GRID 50008 #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE 50011 #define ID_TOOLBAR_WIDGET_DEBUG_MODE 50012 +#define ID_TOOLBAR_WIDGET_SPACER_RIGHT 50013 #define ID_TOOLBAR_WIDGET_LAST 50020 diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp index 12fd9b1a03..f855c33c41 100644 --- a/Code/Sandbox/Editor/ToolbarManager.cpp +++ b/Code/Sandbox/Editor/ToolbarManager.cpp @@ -511,6 +511,7 @@ void ToolbarManager::InitializeStandardToolbars() m_standardToolbars.reserve(5 + macroToolbars.size()); m_standardToolbars.push_back(GetEditModeToolbar()); m_standardToolbars.push_back(GetObjectToolbar()); + m_standardToolbars.push_back(GetPlayConsoleToolbar()); IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}"); IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}"); @@ -519,6 +520,7 @@ void ToolbarManager::InitializeStandardToolbars() m_standardToolbars.push_back(GetMiscToolbar()); } + std::copy(std::begin(macroToolbars), std::end(macroToolbars), std::back_inserter(m_standardToolbars)); // Save that default state to future versions can reason about updating modified standard toolbars @@ -597,8 +599,6 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_EDITMODE_SELECTAREA, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); - t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_TOOLBAR_WIDGET_REF_COORD, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_SELECT_AXIS_X, ORIGINAL_TOOLBAR_VERSION); @@ -636,6 +636,17 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const return t; } +AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const +{ + AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console Toolbar")); + t.SetMainToolbar(true); + + t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); + t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION); + t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); + return t; +} + AmazonToolbar ToolbarManager::GetEditorsToolbar() const { AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar")); @@ -767,7 +778,7 @@ void ToolbarManager::InstantiateToolbars() for (int i = 0; i < numToolbars; ++i) { InstantiateToolbar(i); - if (i == 1) + if (i == 2) { // Hack. Just copying how it was m_mainWindow->addToolBarBreak(); diff --git a/Code/Sandbox/Editor/ToolbarManager.h b/Code/Sandbox/Editor/ToolbarManager.h index a0a9c83029..70228636f5 100644 --- a/Code/Sandbox/Editor/ToolbarManager.h +++ b/Code/Sandbox/Editor/ToolbarManager.h @@ -167,6 +167,7 @@ public: AmazonToolbar GetObjectToolbar() const; AmazonToolbar GetEditorsToolbar() const; AmazonToolbar GetMiscToolbar() const; + AmazonToolbar GetPlayConsoleToolbar() const; private: Q_DISABLE_COPY(ToolbarManager); From 73df05529ceeaa7672076a0ec10bfa79374bb9a0 Mon Sep 17 00:00:00 2001 From: jjjoness <82226755+jjjoness@users.noreply.github.com> Date: Mon, 26 Apr 2021 13:59:05 +0100 Subject: [PATCH 2/4] Completed new Play Console button. --- .../Editor/Core/LevelEditorMenuHandler.cpp | 2 +- Code/Sandbox/Editor/CryEdit.cpp | 2 +- Code/Sandbox/Editor/MainWindow.cpp | 26 +++++++++++++++++-- Code/Sandbox/Editor/MainWindow.h | 1 + Code/Sandbox/Editor/Resource.h | 2 +- Code/Sandbox/Editor/ToolbarManager.cpp | 2 +- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp index aed53d6e8b..10d9928259 100644 --- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp +++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp @@ -685,7 +685,7 @@ QMenu* LevelEditorMenuHandler::CreateGameMenu() auto gameMenu = m_actionManager->AddMenu(tr("&Game"), s_gameMenuId); // Play Game - gameMenu.AddAction(ID_VIEW_SWITCHTOGAME); + gameMenu.AddAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME); // Enable Physics/AI gameMenu.AddAction(ID_SWITCH_PHYSICS); diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp index a474706910..d27450fc88 100644 --- a/Code/Sandbox/Editor/CryEdit.cpp +++ b/Code/Sandbox/Editor/CryEdit.cpp @@ -384,7 +384,7 @@ void CCryEditApp::RegisterActionHandlers() ON_COMMAND(ID_EDIT_FETCH, OnEditFetch) ON_COMMAND(ID_GENERATORS_STATICOBJECTS, OnGeneratorsStaticobjects) ON_COMMAND(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, OnFileExportToGameNoSurfaceTexture) - ON_COMMAND(ID_VIEW_SWITCHTOGAME, OnViewSwitchToGame) + ON_COMMAND(ID_TOOLBAR_WIDGET_SWITCHTOGAME, OnViewSwitchToGame) ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectAll) ON_COMMAND(ID_EDIT_SELECTNONE, OnEditSelectNone) ON_COMMAND(ID_EDIT_DELETE, OnEditDelete) diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp index 5411511eb8..5c710f318a 100644 --- a/Code/Sandbox/Editor/MainWindow.cpp +++ b/Code/Sandbox/Editor/MainWindow.cpp @@ -1172,7 +1172,8 @@ void MainWindow::InitActions() .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem); // Fame actions - am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play Console")) + am->AddAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME, tr("Play Console")) + .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg")) .SetShortcut(tr("Ctrl+G")) .SetToolTip(tr("Play Console (Ctrl+G)")) .SetStatusTip(tr("Activate the game input mode")) @@ -1498,6 +1499,24 @@ QWidget* MainWindow::CreateSpacerRightWidget() return spacer; } +QWidget* MainWindow::CreateSwitchToGameButton() +{ + QWidget* playConsole = new QWidget(); + QHBoxLayout* layout = new QHBoxLayout(); + playConsole->setLayout(layout); + + QLabel* label = new QLabel(); + label->setText(tr("Play Console")); + + QToolButton*play = new QToolButton(); + play->setAutoRaise(true); + play->setDefaultAction(m_actionManager->GetAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME)); + layout->addWidget(label); + layout->addWidget(play); + return playConsole; +} + + void MainWindow::InitEnvironmentModeMenu(CVarMenu* environmentModeMenu) { environmentModeMenu->clear(); @@ -1705,7 +1724,7 @@ void MainWindow::OnGameModeChanged(bool inGameMode) { menuBar()->setDisabled(inGameMode); m_toolbarManager->SetEnabled(!inGameMode); - QAction* action = m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME); + QAction* action = m_actionManager->GetAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME); action->blockSignals(true); // avoid a loop action->setChecked(inGameMode); action->blockSignals(false); @@ -2406,6 +2425,9 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId) break; case ID_TOOLBAR_WIDGET_SPACER_RIGHT: w = CreateSpacerRightWidget(); + break; + case ID_TOOLBAR_WIDGET_SWITCHTOGAME: + w = CreateSwitchToGameButton(); break; default: qWarning() << Q_FUNC_INFO << "Unknown id " << actionId; diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h index cafa719589..05cc6e7640 100644 --- a/Code/Sandbox/Editor/MainWindow.h +++ b/Code/Sandbox/Editor/MainWindow.h @@ -216,6 +216,7 @@ private: QWidget* CreateSnapToGridWidget(); QWidget* CreateSnapToAngleWidget(); QWidget* CreateSpacerRightWidget(); + QWidget* CreateSwitchToGameButton(); QToolButton* CreateUndoRedoButton(int command); diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Sandbox/Editor/Resource.h index 56f1fc86a1..e2944a3e14 100644 --- a/Code/Sandbox/Editor/Resource.h +++ b/Code/Sandbox/Editor/Resource.h @@ -132,7 +132,6 @@ #define ID_EDIT_HOLD 33464 #define ID_EDIT_FETCH 33465 #define ID_FILE_EXPORTTOGAMENOSURFACETEXTURE 33473 -#define ID_VIEW_SWITCHTOGAME 33477 #define ID_EDIT_DELETE 33480 #define ID_MOVE_OBJECT 33481 #define ID_RENAME_OBJ 33483 @@ -398,4 +397,5 @@ #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE 50011 #define ID_TOOLBAR_WIDGET_DEBUG_MODE 50012 #define ID_TOOLBAR_WIDGET_SPACER_RIGHT 50013 +#define ID_TOOLBAR_WIDGET_SWITCHTOGAME 50014 #define ID_TOOLBAR_WIDGET_LAST 50020 diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp index 9d2f57f44b..cdeee570ca 100644 --- a/Code/Sandbox/Editor/ToolbarManager.cpp +++ b/Code/Sandbox/Editor/ToolbarManager.cpp @@ -629,7 +629,7 @@ AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); + t.AddAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); return t; } From 0607f6efa650a11b426da90d0156931e64d4fdd0 Mon Sep 17 00:00:00 2001 From: jjjoness <82226755+jjjoness@users.noreply.github.com> Date: Tue, 27 Apr 2021 18:37:14 +0100 Subject: [PATCH 3/4] Changed Play Console from comments in PR. --- .../Editor/Core/LevelEditorMenuHandler.cpp | 2 +- Code/Sandbox/Editor/CryEdit.cpp | 2 +- Code/Sandbox/Editor/MainWindow.cpp | 31 ++++--------------- Code/Sandbox/Editor/MainWindow.h | 1 - Code/Sandbox/Editor/Resource.h | 3 +- Code/Sandbox/Editor/ToolbarManager.cpp | 8 ++--- 6 files changed, 14 insertions(+), 33 deletions(-) diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp index 10d9928259..aed53d6e8b 100644 --- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp +++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp @@ -685,7 +685,7 @@ QMenu* LevelEditorMenuHandler::CreateGameMenu() auto gameMenu = m_actionManager->AddMenu(tr("&Game"), s_gameMenuId); // Play Game - gameMenu.AddAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME); + gameMenu.AddAction(ID_VIEW_SWITCHTOGAME); // Enable Physics/AI gameMenu.AddAction(ID_SWITCH_PHYSICS); diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp index a18c839bdd..c6a2ece984 100644 --- a/Code/Sandbox/Editor/CryEdit.cpp +++ b/Code/Sandbox/Editor/CryEdit.cpp @@ -384,7 +384,7 @@ void CCryEditApp::RegisterActionHandlers() ON_COMMAND(ID_EDIT_FETCH, OnEditFetch) ON_COMMAND(ID_GENERATORS_STATICOBJECTS, OnGeneratorsStaticobjects) ON_COMMAND(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, OnFileExportToGameNoSurfaceTexture) - ON_COMMAND(ID_TOOLBAR_WIDGET_SWITCHTOGAME, OnViewSwitchToGame) + ON_COMMAND(ID_VIEW_SWITCHTOGAME, OnViewSwitchToGame) ON_COMMAND(ID_EDIT_SELECTALL, OnEditSelectAll) ON_COMMAND(ID_EDIT_SELECTNONE, OnEditSelectNone) ON_COMMAND(ID_EDIT_DELETE, OnEditDelete) diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp index 5c710f318a..e96723a1b8 100644 --- a/Code/Sandbox/Editor/MainWindow.cpp +++ b/Code/Sandbox/Editor/MainWindow.cpp @@ -1171,15 +1171,17 @@ void MainWindow::InitActions() am->AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM, tr("Refresh Audio")) .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem); - // Fame actions - am->AddAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME, tr("Play Console")) + // Game actions + am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play Game")) .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg")) .SetShortcut(tr("Ctrl+G")) - .SetToolTip(tr("Play Console (Ctrl+G)")) + .SetToolTip(tr("Play Game (Ctrl+G)")) .SetStatusTip(tr("Activate the game input mode")) .SetApplyHoverEffect() .SetCheckable(true) .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame); + am->AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, tr("Play Console")) + .SetText(tr("Play Console")); am->AddAction(ID_SWITCH_PHYSICS, tr("Simulate")) .SetShortcut(tr("Ctrl+P")) .SetToolTip(tr("Simulate (Ctrl+P)")) @@ -1499,24 +1501,6 @@ QWidget* MainWindow::CreateSpacerRightWidget() return spacer; } -QWidget* MainWindow::CreateSwitchToGameButton() -{ - QWidget* playConsole = new QWidget(); - QHBoxLayout* layout = new QHBoxLayout(); - playConsole->setLayout(layout); - - QLabel* label = new QLabel(); - label->setText(tr("Play Console")); - - QToolButton*play = new QToolButton(); - play->setAutoRaise(true); - play->setDefaultAction(m_actionManager->GetAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME)); - layout->addWidget(label); - layout->addWidget(play); - return playConsole; -} - - void MainWindow::InitEnvironmentModeMenu(CVarMenu* environmentModeMenu) { environmentModeMenu->clear(); @@ -1724,7 +1708,7 @@ void MainWindow::OnGameModeChanged(bool inGameMode) { menuBar()->setDisabled(inGameMode); m_toolbarManager->SetEnabled(!inGameMode); - QAction* action = m_actionManager->GetAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME); + QAction* action = m_actionManager->GetAction(ID_VIEW_SWITCHTOGAME); action->blockSignals(true); // avoid a loop action->setChecked(inGameMode); action->blockSignals(false); @@ -2426,9 +2410,6 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId) case ID_TOOLBAR_WIDGET_SPACER_RIGHT: w = CreateSpacerRightWidget(); break; - case ID_TOOLBAR_WIDGET_SWITCHTOGAME: - w = CreateSwitchToGameButton(); - break; default: qWarning() << Q_FUNC_INFO << "Unknown id " << actionId; return nullptr; diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h index 05cc6e7640..cafa719589 100644 --- a/Code/Sandbox/Editor/MainWindow.h +++ b/Code/Sandbox/Editor/MainWindow.h @@ -216,7 +216,6 @@ private: QWidget* CreateSnapToGridWidget(); QWidget* CreateSnapToAngleWidget(); QWidget* CreateSpacerRightWidget(); - QWidget* CreateSwitchToGameButton(); QToolButton* CreateUndoRedoButton(int command); diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Sandbox/Editor/Resource.h index e2944a3e14..143b4fc0c4 100644 --- a/Code/Sandbox/Editor/Resource.h +++ b/Code/Sandbox/Editor/Resource.h @@ -132,6 +132,7 @@ #define ID_EDIT_HOLD 33464 #define ID_EDIT_FETCH 33465 #define ID_FILE_EXPORTTOGAMENOSURFACETEXTURE 33473 +#define ID_VIEW_SWITCHTOGAME 33477 #define ID_EDIT_DELETE 33480 #define ID_MOVE_OBJECT 33481 #define ID_RENAME_OBJ 33483 @@ -397,5 +398,5 @@ #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE 50011 #define ID_TOOLBAR_WIDGET_DEBUG_MODE 50012 #define ID_TOOLBAR_WIDGET_SPACER_RIGHT 50013 -#define ID_TOOLBAR_WIDGET_SWITCHTOGAME 50014 +#define ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL 50014 #define ID_TOOLBAR_WIDGET_LAST 50020 diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp index cdeee570ca..c1758405ca 100644 --- a/Code/Sandbox/Editor/ToolbarManager.cpp +++ b/Code/Sandbox/Editor/ToolbarManager.cpp @@ -520,7 +520,6 @@ void ToolbarManager::InitializeStandardToolbars() m_standardToolbars.push_back(GetMiscToolbar()); } - std::copy(std::begin(macroToolbars), std::end(macroToolbars), std::back_inserter(m_standardToolbars)); // Save that default state to future versions can reason about updating modified standard toolbars @@ -624,12 +623,13 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const { - AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console Toolbar")); + AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console")); t.SetMainToolbar(true); - t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); + t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_TOOLBAR_WIDGET_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); + t.AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, ORIGINAL_TOOLBAR_VERSION); + t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); return t; } From 1fd69385199a79ffd25602e1c8099ed734eacecf Mon Sep 17 00:00:00 2001 From: jjjoness <82226755+jjjoness@users.noreply.github.com> Date: Wed, 28 Apr 2021 08:56:02 +0100 Subject: [PATCH 4/4] Replaced missing & --- Code/Sandbox/Editor/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp index e96723a1b8..2915ca9c2e 100644 --- a/Code/Sandbox/Editor/MainWindow.cpp +++ b/Code/Sandbox/Editor/MainWindow.cpp @@ -1172,7 +1172,7 @@ void MainWindow::InitActions() .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem); // Game actions - am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play Game")) + am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game")) .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg")) .SetShortcut(tr("Ctrl+G")) .SetToolTip(tr("Play Game (Ctrl+G)"))