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

Aftermath for PR-1956 and PR-2025 (#2035)

Browse Source 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
This commit is contained in:
Benjamin Jillich
2021-07-11 23:30:07 -07:00
committed by GitHub
parent b4cee8c3c5
commit c9ff634080
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/ProjectManager/Source/GemCatalog/GemFilterTagWidget.cpp
+2 -4
View File
@@ -10,7 +10,6 @@
#include <QLabel>
#include <QPushButton>
#include <QSpacerItem>
#include <QWidget>
namespace O3DE::ProjectManager
{
@@ -72,10 +71,9 @@ namespace O3DE::ProjectManager
hLayout->setMargin(0);
hLayout->setSpacing(8);
const int numTags = tags.count();
for (int i = 0; i < numTags; ++i)
for(const QString& tag : tags)
{
FilterTagWidget* tagWidget = new FilterTagWidget(tags[i]);
FilterTagWidget* tagWidget = new FilterTagWidget(tag);
// Add the tag widget to the current row.
hLayout->addWidget(tagWidget);
Code/Tools/ProjectManager/Source/ProjectUtils.cpp
+8 -3
View File
@@ -250,7 +250,7 @@ namespace O3DE::ProjectManager
progressDialog->setValue(0);
progressDialog->setRange(0, 1000);
progressDialog->setModal(true);
progressDialog->setWindowTitle("Copying project ...");
progressDialog->setWindowTitle(QObject::tr("Copying project ..."));
progressDialog->show();
QLocale locale;
@@ -259,7 +259,12 @@ namespace O3DE::ProjectManager
// Create a human-readable version of the file size.
const QString fileSizeString = locale.formattedDataSize(sizeInBytes);
progressDialog->setLabelText(QString("Indexing files ... %1 files found, %2 to copy.").arg(fileCount).arg(fileSizeString));
progressDialog->setLabelText(QString("%1 ... %2 %3, %4 %5.")
.arg(QObject::tr("Indexing files"))
.arg(QString::number(fileCount))
.arg(QObject::tr("files found"))
.arg(fileSizeString)
.arg(QObject::tr("to copy")));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
});
@@ -277,7 +282,7 @@ namespace O3DE::ProjectManager
if (!success)
{
progressDialog->setLabelText("Duplicating project failed/cancelled, removing already copied files ...");
progressDialog->setLabelText(QObject::tr("Duplicating project failed/cancelled, removing already copied files ..."));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
DeleteProjectFiles(newPath, true);