Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/FixingEOOrdering_signofffix

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

Code/Editor/AssetImporter/AssetImporterManager/AssetImporterManager.cpp

@@ -191,6 +191,7 @@ void AssetImporterManager::OnBrowseDestinationFilePath(QLineEdit* destinationLin
     fileDialog.setViewMode(QFileDialog::List);
     fileDialog.setWindowModality(Qt::WindowModality::ApplicationModal);
     fileDialog.setWindowTitle(tr("Select import destination"));
+    fileDialog.setFileMode(QFileDialog::Directory);
 
     QSettings settings;
     QString currentDestination = settings.value(AssetImporterManagerPrivate::g_selectDestinationFilesPath).toString();

Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp

@@ -32,6 +32,15 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
 
 AZ_CVAR_EXTERNED(bool, ed_useNewAssetBrowserTableView);
 
+namespace AzToolsFramework
+{
+    namespace AssetBrowser
+    {
+        static constexpr const char* CollapseAllIcon = "Assets/Editor/Icons/AssetBrowser/Collapse_All.svg";
+        static constexpr const char* MenuIcon = ":/Menu/menu.svg";
+    } // namespace AssetBrowser
+} // namespace AzToolsFramework
+
 class ListenerForShowAssetEditorEvent
     : public QObject
     , private AzToolsFramework::EditorEvents::Bus::Handler
@@ -87,10 +96,21 @@ AzAssetBrowserWindow::AzAssetBrowserWindow(QWidget* parent)
 
     m_assetBrowserModel->SetFilterModel(m_filterModel.data());
 
+    m_ui->m_collapseAllButton->setAutoRaise(true); // hover highlight
+    m_ui->m_collapseAllButton->setIcon(QIcon(AzAssetBrowser::CollapseAllIcon));
+
+    connect(
+        m_ui->m_collapseAllButton, &QToolButton::clicked, this,
+        [this]()
+        {
+            m_ui->m_assetBrowserTreeViewWidget->collapseAll();
+        });
+
     if (ed_useNewAssetBrowserTableView)
     {
         m_ui->m_toggleDisplayViewBtn->setVisible(true);
-        m_ui->m_toggleDisplayViewBtn->setIcon(QIcon(":/Menu/menu.svg"));
+        m_ui->m_toggleDisplayViewBtn->setAutoRaise(true);
+        m_ui->m_toggleDisplayViewBtn->setIcon(QIcon(AzAssetBrowser::MenuIcon));
 
         m_tableModel->setFilterRole(Qt::DisplayRole);
         m_tableModel->setSourceModel(m_filterModel.data());

Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui

@@ -72,6 +72,22 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QToolButton" name="m_collapseAllButton">
+           <property name="focusPolicy">
+            <enum>Qt::ClickFocus</enum>
+           </property>
+           <property name="toolTip">
+            <string extracomment="Collapse All"/>
+           </property>
+           <property name="toolTipDuration">
+            <number>3</number>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
        <item>
@@ -143,15 +159,6 @@
              <property name="sortingEnabled">
               <bool>true</bool>
              </property>
-             <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
-              <bool>false</bool>
-             </attribute>
-             <attribute name="horizontalHeaderStretchLastSection">
-              <bool>true</bool>
-             </attribute>
-             <attribute name="verticalHeaderVisible">
-              <bool>false</bool>
-             </attribute>
             </widget>
            </item>
            <item>

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -408,7 +408,7 @@ namespace O3DE::ProjectManager
             }
 
             // check if engine path is registered
-            auto allEngines = m_manifest.attr("get_engines")();
+            auto allEngines = m_manifest.attr("get_manifest_engines")();
             if (pybind11::isinstance<pybind11::list>(allEngines))
             {
                 const AZ::IO::FixedMaxPath enginePathFixed(Py_To_String(enginePath));
@@ -891,7 +891,7 @@ namespace O3DE::ProjectManager
 
         bool result = ExecuteWithLock([&] {
             // external projects
-            for (auto path : m_manifest.attr("get_projects")())
+            for (auto path : m_manifest.attr("get_manifest_projects")())
             {
                 projects.push_back(ProjectInfoFromPath(path));
             }