birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing some class names and other download UI feedback.

Browse Source 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
This commit is contained in:
AMZN-Phil
2021-10-20 14:55:08 -07:00
parent 023e8fcff2
commit 9aa9ed8c8e
10 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
+5 -5
View File
@@ -17,7 +17,7 @@
namespace O3DE::ProjectManager
{
CartOverlayWidget::CartOverlayWidget(GemModel* gemModel, O3DEObjectDownloadController* downloadController, QWidget* parent)
CartOverlayWidget::CartOverlayWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent)
: QWidget(parent)
, m_gemModel(gemModel)
, m_downloadController(downloadController)
@@ -252,8 +252,8 @@ namespace O3DE::ProjectManager
update(0); // update the list to remove the gem that has finished
};
// connect to download controller data changed
connect(m_downloadController, &O3DEObjectDownloadController::GemDownloadProgress, this, update);
connect(m_downloadController, &O3DEObjectDownloadController::Done, this, downloadEnded);
connect(m_downloadController, &DownloadController::GemDownloadProgress, this, update);
connect(m_downloadController, &DownloadController::Done, this, downloadEnded);
update(0);
}
@@ -268,7 +268,7 @@ namespace O3DE::ProjectManager
return gemNames;
}
CartButton::CartButton(GemModel* gemModel, O3DEObjectDownloadController* downloadController, QWidget* parent)
CartButton::CartButton(GemModel* gemModel, DownloadController* downloadController, QWidget* parent)
: QWidget(parent)
, m_gemModel(gemModel)
, m_downloadController(downloadController)
@@ -374,7 +374,7 @@ namespace O3DE::ProjectManager
}
}
GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, O3DEObjectDownloadController* downloadController, QWidget* parent)
GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, DownloadController* downloadController, QWidget* parent)
: QFrame(parent)
{
QHBoxLayout* hLayout = new QHBoxLayout();
Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
+6 -6
View File
@@ -21,7 +21,7 @@
#include <QMoveEvent>
#include <QHideEvent>
#include <QVBoxLayout>
#include <O3DEObjectDownloadController.h>
#include <DownloadController.h>
#endif
namespace O3DE::ProjectManager
@@ -32,7 +32,7 @@ namespace O3DE::ProjectManager
Q_OBJECT // AUTOMOC
public:
CartOverlayWidget(GemModel* gemModel, O3DEObjectDownloadController* downloadController, QWidget* parent = nullptr);
CartOverlayWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr);
private:
QStringList ConvertFromModelIndices(const QVector<QModelIndex>& gems) const;
@@ -43,7 +43,7 @@ namespace O3DE::ProjectManager
QVBoxLayout* m_layout = nullptr;
GemModel* m_gemModel = nullptr;
O3DEObjectDownloadController* m_downloadController = nullptr;
DownloadController* m_downloadController = nullptr;
inline constexpr static int s_width = 240;
};
@@ -54,7 +54,7 @@ namespace O3DE::ProjectManager
Q_OBJECT // AUTOMOC
public:
CartButton(GemModel* gemModel, O3DEObjectDownloadController* downloadController, QWidget* parent = nullptr);
CartButton(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr);
~CartButton();
void ShowOverlay();
@@ -67,7 +67,7 @@ namespace O3DE::ProjectManager
QLabel* m_countLabel = nullptr;
QPushButton* m_dropDownButton = nullptr;
CartOverlayWidget* m_cartOverlay = nullptr;
O3DEObjectDownloadController* m_downloadController = nullptr;
DownloadController* m_downloadController = nullptr;
inline constexpr static int s_iconSize = 24;
inline constexpr static int s_arrowDownIconSize = 8;
@@ -79,7 +79,7 @@ namespace O3DE::ProjectManager
Q_OBJECT // AUTOMOC
public:
explicit GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, O3DEObjectDownloadController* downloadController, QWidget* parent = nullptr);
explicit GemCatalogHeaderWidget(GemModel* gemModel, GemSortFilterProxyModel* filterProxyModel, DownloadController* downloadController, QWidget* parent = nullptr);
~GemCatalogHeaderWidget() = default;
void ReinitForProject();
Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+2 -2
View File
@@ -12,7 +12,7 @@
#include <GemCatalog/GemSortFilterProxyModel.h>
#include <GemCatalog/GemRequirementDialog.h>
#include <GemCatalog/GemDependenciesDialog.h>
#include <O3DEObjectDownloadController.h>
#include <DownloadController.h>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QPushButton>
@@ -33,7 +33,7 @@ namespace O3DE::ProjectManager
vLayout->setSpacing(0);
setLayout(vLayout);
m_downloadController = new O3DEObjectDownloadController();
m_downloadController = new DownloadController();
m_downloadController->Start();
m_headerWidget = new GemCatalogHeaderWidget(m_gemModel, m_proxModel, m_downloadController);
Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
+2 -2
View File
@@ -39,7 +39,7 @@ namespace O3DE::ProjectManager
EnableDisableGemsResult EnableDisableGemsForProject(const QString& projectPath);
GemModel* GetGemModel() const { return m_gemModel; }
O3DEObjectDownloadController* GetDownloadController() const { return m_downloadController; }
DownloadController* GetDownloadController() const { return m_downloadController; }
private:
void FillModel(const QString& projectPath);
@@ -51,6 +51,6 @@ namespace O3DE::ProjectManager
GemSortFilterProxyModel* m_proxModel = nullptr;
QVBoxLayout* m_filterWidgetLayout = nullptr;
GemFilterWidget* m_filterWidget = nullptr;
O3DEObjectDownloadController* m_downloadController = nullptr;
DownloadController* m_downloadController = nullptr;
};
} // namespace O3DE::ProjectManager