Changed Play Console from comments in PR.

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);

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)

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;

Code/Sandbox/Editor/MainWindow.h

@@ -216,7 +216,6 @@ private:
     QWidget* CreateSnapToGridWidget();
     QWidget* CreateSnapToAngleWidget();
     QWidget* CreateSpacerRightWidget();
-    QWidget* CreateSwitchToGameButton();
 
     QToolButton* CreateUndoRedoButton(int command);
 

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

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;
 }