Changed Play Console to right of toolbar.

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;

Code/Sandbox/Editor/MainWindow.h

@@ -228,6 +228,7 @@ private:
 
     QWidget* CreateSnapToGridWidget();
     QWidget* CreateSnapToAngleWidget();
+    QWidget* CreateSpacerRightWidget();
 
     QComboBox* CreateRefCoordComboBox();
 

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

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

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