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

Fix missing user_tags exception and configure gems button

Browse Source
This commit is contained in:
Alex Peterson
2021-06-07 19:50:40 -07:00
committed by GitHub
parent 29eb61aaf5
commit 7ca7ad9b72
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/ProjectManager/Resources/ProjectManager.qss
+24
View File
@@ -291,6 +291,30 @@ QTabBar::tab:pressed
height:50px;
}
#projectSettingsTab::tab-bar > QPushButton {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #888888, stop: 1.0 #555555);
qproperty-flat: true;
margin-right:30px;
margin-bottom:12px;
margin-top:0px;
min-width:170px;
max-width:170px;
min-height:26px;
max-height:26px;
border-radius: 3px;
text-align:center;
font-size:13px;
}
#projectSettingsTab::tab-bar > QPushButton:hover {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #999999, stop: 1.0 #666666);
}
#projectSettingsTab::tab-bar > QPushButton:pressed {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #555555, stop: 1.0 #777777);
}
#projectSettingsTopFrame {
background-color:#1E252F;
}
Code/Tools/ProjectManager/Source/PythonBindings.cpp
+5 -2
View File
@@ -682,9 +682,12 @@ namespace O3DE::ProjectManager
projectInfo.m_displayName = Py_To_String_Optional(projectData, "display_name", projectInfo.m_projectName);
projectInfo.m_origin = Py_To_String_Optional(projectData, "origin", projectInfo.m_origin);
projectInfo.m_summary = Py_To_String_Optional(projectData, "summary", projectInfo.m_summary);
for (auto tag : projectData["user_tags"])
if (projectData.contains("user_tags"))
{
projectInfo.m_userTags.append(Py_To_String(tag));
for (auto tag : projectData["user_tags"])
{
projectInfo.m_userTags.append(Py_To_String(tag));
}
}
}
catch ([[maybe_unused]] const std::exception& e)
Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+2 -2
View File
@@ -58,7 +58,7 @@ namespace O3DE::ProjectManager
tabWidget->tabBar()->setObjectName("projectSettingsTabBar");
tabWidget->addTab(m_updateSettingsScreen, tr("General"));
QPushButton* gemsButton = new QPushButton(tr("Add More Gems"), this);
QPushButton* gemsButton = new QPushButton(tr("Configure Gems"), this);
topBarHLayout->addWidget(gemsButton);
tabWidget->setCornerWidget(gemsButton);
@@ -189,7 +189,7 @@ namespace O3DE::ProjectManager
{
if (m_stack->currentIndex() == ScreenOrder::Gems)
{
m_header->setSubTitle(QString(tr("Add More Gems to \"%1\"")).arg(m_projectInfo.m_projectName));
m_header->setSubTitle(QString(tr("Configure Gems for \"%1\"")).arg(m_projectInfo.m_projectName));
m_nextButton->setText(tr("Confirm"));
}
else