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

[LYN-2515] Project Manager Gem List (#642)

Browse Source 
* [LYN-2515] Project Manager Gem List Base

* Added gem model based on a standard item model
* Added list view using the gem model
* Added item delegate for a gem according to the UX design
* Removed th gem catalog ui file and replaced it with code
* Moved the gem catalog files into a sub folder
* Added drawing the Added/Get button and the platform icons
main
Benjamin Jillich 5 years ago committed by GitHub
parent 727bedf18d
commit d03f946609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 178 additions and 23 deletions
Show Stats Download Patch File Download Diff File

10
Code/Tools/ProjectManager/Resources/Android.svg
Unescape Escape View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icons / Platform / Android</title>
<g id="Icons-/-Platform-/-Android" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M1.74272,3.887 C1.53596,3.887 1.36053,3.9591 1.21633,4.1033 C1.07212,4.24751 1,4.42055 1,4.62251 L1,7.72344 C1,7.93046 1.0721,8.10574 1.21633,8.24996 C1.36053,8.39417 1.53596,8.46629 1.74272,8.46629 C1.94933,8.46629 2.12369,8.39419 2.26566,8.24996 C2.40735,8.10576 2.47839,7.93046 2.47839,7.72344 L2.47839,4.62251 C2.47839,4.42052 2.40629,4.24751 2.26206,4.1033 C2.11783,3.9591 1.94468,3.887 1.74272,3.887 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M7.71395,1.10327 L8.22598,0.158715 C8.25959,0.096182 8.24763,0.0482297 8.19,0.0145111 C8.12745,-0.0145641 8.07938,0.000168761 8.0458,0.0576682 L7.52661,1.00977 C7.06976,0.807787 6.58657,0.70661 6.07704,0.70661 C5.5674,0.70661 5.08416,0.807809 4.62749,1.00977 L4.10828,0.0576682 C4.07454,0.000168761 4.02647,-0.0144339 3.96407,0.0145111 C3.90631,0.0483815 3.89436,0.096182 3.9281,0.158715 L4.44015,1.10327 C3.92094,1.36805 3.50742,1.73681 3.19974,2.21034 C2.89206,2.68414 2.73816,3.20189 2.73816,3.76452 L9.40866,3.76452 C9.40866,3.20202 9.25474,2.68424 8.94708,2.21034 C8.63939,1.73681 8.22825,1.36805 7.71395,1.10327 Z M4.75364,2.47714 C4.69826,2.53264 4.63213,2.56026 4.55525,2.56026 C4.47822,2.56026 4.41343,2.53264 4.36058,2.47714 C4.30772,2.4219 4.28129,2.35602 4.28129,2.27888 C4.28129,2.20201 4.30772,2.136 4.36058,2.08063 C4.41343,2.02539 4.47838,1.99777 4.55525,1.99777 C4.63213,1.99777 4.69826,2.02539 4.75364,2.08063 C4.80888,2.13613 4.83663,2.20201 4.83663,2.27888 C4.83648,2.35589 4.80875,2.4219 4.75364,2.47714 Z M7.79321,2.47714 C7.74025,2.53264 7.6753,2.56026 7.59856,2.56026 C7.52151,2.56026 7.4554,2.53264 7.40013,2.47714 C7.34478,2.4219 7.31716,2.35602 7.31716,2.27888 C7.31716,2.20201 7.34478,2.136 7.40013,2.08063 C7.4554,2.02539 7.52151,1.99777 7.59856,1.99777 C7.67543,1.99777 7.74022,2.02539 7.79321,2.08063 C7.84611,2.13613 7.87249,2.20201 7.87249,2.27888 C7.87249,2.35589 7.84609,2.4219 7.79321,2.47714 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M2.76681,8.82679 C2.76681,9.04815 2.84369,9.23553 2.99746,9.38931 C3.15137,9.54308 3.33875,9.61996 3.55996,9.61996 L4.09364,9.61996 L4.10095,11.2572 C4.10095,11.4639 4.17306,11.6394 4.31726,11.7837 C4.46147,11.9279 4.63464,12 4.83647,12 C5.0431,12 5.21864,11.9279 5.36286,11.7837 C5.50709,11.6394 5.57919,11.4639 5.57919,11.2572 L5.57919,9.62011 L6.57434,9.62011 L6.57434,11.2572 C6.57434,11.4639 6.64642,11.6394 6.79065,11.7837 C6.93488,11.9279 7.11026,12 7.31704,12 C7.52367,12 7.69921,11.9279 7.84343,11.7837 C7.98766,11.6394 8.05974,11.4639 8.05974,11.2572 L8.05974,9.62011 L8.60063,9.62011 C8.81693,9.62011 9.00191,9.54321 9.15596,9.38944 C9.30971,9.23566 9.38663,9.04828 9.38663,8.82694 L9.38663,4.02387 L2.76681,4.02387 L2.76681,8.82679 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M10.411,3.887 C10.2091,3.887 10.036,3.95803 9.89182,4.09972 C9.74761,4.24167 9.67551,4.41603 9.67551,4.62251 L9.67551,7.72344 C9.67551,7.93046 9.74759,8.10574 9.89182,8.24996 C10.036,8.39419 10.2092,8.46629 10.411,8.46629 C10.6177,8.46629 10.7932,8.39419 10.9374,8.24996 C11.0817,8.10574 11.1537,7.93046 11.1537,7.72344 L11.1537,4.62251 C11.1537,4.41601 11.0817,4.24167 10.9374,4.09972 C10.7932,3.95803 10.6177,3.887 10.411,3.887 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

14
Code/Tools/ProjectManager/Resources/Linux.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

7
Code/Tools/ProjectManager/Resources/Windows.svg
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Icons / Platform / Windows</title>
<g id="Icons-/-Platform-/-Windows" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M-1.42108547e-14,1.69898 L4.88896,1.03321 L4.89106,5.74899 L0.00443941,5.77679 L-1.42108547e-14,1.69903 L-1.42108547e-14,1.69898 Z M4.88662,6.29228 L4.89036,11.0122 L0.00378518,10.3403 L0.0035048,6.26064 L4.88657,6.29228 L4.88662,6.29228 Z M5.47926,0.946061 L11.9615,0 L11.9615,5.68898 L5.47926,5.74039 L5.47926,0.946108 L5.47926,0.946061 Z M11.963,6.33667 L11.9615,12 L5.47921,11.0851 L5.47015,6.32606 L11.963,6.33667 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 841 B

3
Code/Tools/ProjectManager/Resources/iOS.svg
Unescape Escape View File

@ -0,0 +1,3 @@
<svg width="18" height="12" viewBox="0 0 18 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.07438 9.87142H2.3975V4.19547H1.07438V9.87142ZM1.73329 3.45112C2.14776 3.45112 2.47189 3.12983 2.47189 2.72824C2.47189 2.32128 2.14776 2 1.73329 2C1.32413 2 1 2.32129 1 2.72824C1 3.12984 1.32413 3.45112 1.73329 3.45112ZM6.80274 2.01602C4.56572 2.01602 3.16283 3.55283 3.16283 6.01068C3.16283 8.46854 4.56558 10 6.80274 10C9.03446 10 10.4373 8.46854 10.4373 6.01068C10.4373 3.55283 9.03459 2.01602 6.80274 2.01602ZM6.80274 3.19407C8.16835 3.19407 9.03976 4.28643 9.03976 6.01066C9.03976 7.72951 8.16832 8.8219 6.80274 8.8219C5.43182 8.8219 4.56572 7.72954 4.56572 6.01066C4.56572 4.28646 5.43185 3.19407 6.80274 3.19407ZM10.9955 7.69743C11.0539 9.12184 12.2123 9.99997 13.9764 9.99997C15.831 9.99997 17 9.07896 17 7.61176C17 6.4605 16.3411 5.81258 14.7842 5.45384L13.9021 5.25035C12.9616 5.02546 12.5737 4.7256 12.5737 4.21155C12.5737 3.56898 13.1582 3.1406 14.0243 3.1406C14.9011 3.1406 15.5015 3.57434 15.5653 4.29722H16.8725C16.8406 2.93712 15.7247 2.01607 14.035 2.01607C12.3664 2.01607 11.1815 2.94243 11.1815 4.31326C11.1815 5.41633 11.851 6.10175 13.2644 6.42841L14.258 6.66402C15.2251 6.89428 15.6184 7.21555 15.6184 7.77244C15.6184 8.41501 14.9754 8.87552 14.0509 8.87552C13.1157 8.87552 12.409 8.40966 12.324 7.69747H10.9955L10.9955 7.69743Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

3
Code/Tools/ProjectManager/Resources/macOS.svg
Unescape Escape View File

@ -0,0 +1,3 @@
<svg width="37" height="12" viewBox="0 0 37 12" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.00003 9.87115H2.3489V6.38891C2.3489 5.70213 2.80394 5.20315 3.45401 5.20315C4.08239 5.20315 4.47244 5.59483 4.47244 6.22794V9.87102H5.78339V6.35664C5.78339 5.67524 6.22759 5.20308 6.87765 5.20308C7.53854 5.20308 7.90692 5.60012 7.90692 6.29764V9.87108H9.25579V5.97045C9.25579 4.83299 8.51364 4.07646 7.3814 4.07646C6.55257 4.07646 5.87008 4.51642 5.59369 5.2193H5.56119C5.34992 4.4896 4.77029 4.07646 3.95778 4.07646C3.17771 4.07646 2.57099 4.51107 2.32178 5.17102H2.2947V4.18377H1V9.87112L1.00003 9.87115ZM12.2084 8.95365C11.6233 8.95365 11.2333 8.65856 11.2333 8.19176C11.2333 7.74106 11.6071 7.45133 12.2571 7.4084L13.5843 7.32792V7.76253C13.5843 8.44931 12.9722 8.95366 12.2084 8.95366V8.95365ZM11.8021 9.96237C12.5388 9.96237 13.2593 9.58142 13.5898 8.96439H13.6169V9.87116H14.917V5.95433C14.917 4.81149 13.9906 4.06569 12.566 4.06569C11.1033 4.06569 10.1879 4.82759 10.1283 5.88991H11.3796C11.4663 5.41775 11.8726 5.11191 12.5118 5.11191C13.1781 5.11191 13.5844 5.4553 13.5844 6.05086V6.45864L12.0675 6.54449C10.6699 6.63034 9.88444 7.23664 9.88444 8.24537C9.88444 9.27016 10.6916 9.96231 11.8021 9.96231L11.8021 9.96237ZM20.8381 6.21187C20.746 5.01538 19.8089 4.06569 18.2921 4.06569C16.6237 4.06569 15.5402 5.20853 15.5402 7.02735C15.5402 8.87314 16.6236 9.98365 18.3029 9.98365C19.7439 9.98365 20.7352 9.14664 20.8435 7.87497H19.5705C19.4459 8.51883 19.0017 8.90514 18.3191 8.90514C17.4632 8.90514 16.9107 8.21836 16.9107 7.02721C16.9107 5.85755 17.4578 5.14929 18.3083 5.14929C19.0288 5.14929 19.4568 5.60535 19.5651 6.21165H20.8381L20.8381 6.21187ZM25.0042 2C22.7236 2 21.2934 3.53989 21.2934 6.00268C21.2934 8.46546 22.7235 10 25.0042 10C27.2794 10 28.7096 8.46546 28.7096 6.00268C28.7096 3.53989 27.2795 2 25.0042 2ZM25.0042 3.18041C26.3964 3.18041 27.2848 4.27497 27.2848 6.00265C27.2848 7.72495 26.3964 8.81954 25.0042 8.81954C23.6066 8.81954 22.7236 7.72498 22.7236 6.00265C22.7236 4.27499 23.6066 3.18041 25.0042 3.18041ZM29.2786 7.69281C29.3381 9.12007 30.5191 9.99997 32.3176 9.99997C34.2082 9.99997 35.4 9.07711 35.4 7.60696C35.4 6.4534 34.7283 5.80417 33.1411 5.44471L32.2418 5.24082C31.283 5.01548 30.8875 4.71501 30.8875 4.19993C30.8875 3.55607 31.4834 3.12684 32.3664 3.12684C33.2602 3.12684 33.8723 3.56144 33.9373 4.28577H35.27C35.2375 2.92295 34.0999 2.00004 32.3773 2.00004C30.6762 2.00004 29.4682 2.92826 29.4682 4.30185C29.4682 5.40713 30.1508 6.09392 31.5916 6.42124L32.6047 6.65733C33.5906 6.88805 33.9914 7.20997 33.9914 7.76797C33.9914 8.41183 33.336 8.87326 32.3934 8.87326C31.44 8.87326 30.7196 8.40647 30.6329 7.69285H29.2786L29.2786 7.69281Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

18
Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.cpp
Unescape Escape View File

@ -21,8 +21,6 @@ namespace O3DE::ProjectManager
GemCatalog::GemCatalog(ProjectManagerWindow* window) GemCatalog::GemCatalog(ProjectManagerWindow* window)
: ScreenWidget(window) : ScreenWidget(window)
{ {
ConnectSlotsAndSignals();
m_gemModel = new GemModel(this); m_gemModel = new GemModel(this);
QVBoxLayout* vLayout = new QVBoxLayout(); QVBoxLayout* vLayout = new QVBoxLayout();
@ -56,36 +54,36 @@ namespace O3DE::ProjectManager
m_gemModel->AddGem(GemInfo("EMotion FX", m_gemModel->AddGem(GemInfo("EMotion FX",
"O3DE Foundation", "O3DE Foundation",
"EMFX is a real-time character animation system. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", "EMFX is a real-time character animation system. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
(GemInfo::Android | GemInfo::iOS | GemInfo::Windows | GemInfo::Linux), (GemInfo::Android | GemInfo::iOS | GemInfo::macOS | GemInfo::Windows | GemInfo::Linux),
true)); true));
m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Atom", m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Atom",
"O3DE Foundation", "O3DE Foundation",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
GemInfo::Android | GemInfo::Windows | GemInfo::Linux, GemInfo::Android | GemInfo::Windows | GemInfo::Linux | GemInfo::macOS,
true)); true));
m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("PhysX", m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("PhysX",
"O3DE Foundation", "O3DE London",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
GemInfo::Android | GemInfo::Linux, GemInfo::Android | GemInfo::Linux | GemInfo::macOS,
false)); false));
m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Certificate Manager", m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Certificate Manager",
"O3DE Foundation", "O3DE Irvine",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
GemInfo::Windows, GemInfo::Windows,
false)); false));
m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Cloud Gem Framework", m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Cloud Gem Framework",
"O3DE Foundation", "O3DE Seattle",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
GemInfo::iOS | GemInfo::Linux, GemInfo::iOS | GemInfo::Linux,
false)); false));
m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Achievements", m_gemModel->AddGem(O3DE::ProjectManager::GemInfo("Achievements",
"O3DE Foundation", "O3DE Foundation",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
GemInfo::Android | GemInfo::Windows | GemInfo::Linux, GemInfo::Android | GemInfo::Windows | GemInfo::Linux,
false)); false));
} }

11
Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
Unescape Escape View File

@ -26,11 +26,12 @@ namespace O3DE::ProjectManager
public: public:
enum Platform enum Platform
{ {
Android = 0x0, Android = 1 << 0,
iOS = 0x1, iOS = 1 << 1,
Linux = 0x2, Linux = 1 << 2,
macOS = 0x3, macOS = 1 << 3,
Windows = 0x4 Windows = 1 << 4,
NumPlatforms = 5
}; };
Q_DECLARE_FLAGS(Platforms, Platform) Q_DECLARE_FLAGS(Platforms, Platform)

101
Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
Unescape Escape View File

@ -22,6 +22,18 @@ namespace O3DE::ProjectManager
: QStyledItemDelegate(parent) : QStyledItemDelegate(parent)
, m_gemModel(gemModel) , m_gemModel(gemModel)
{ {
AddPlatformIcon(GemInfo::Android, ":/Resources/Android.svg");
AddPlatformIcon(GemInfo::iOS, ":/Resources/iOS.svg");
AddPlatformIcon(GemInfo::Linux, ":/Resources/Linux.svg");
AddPlatformIcon(GemInfo::macOS, ":/Resources/macOS.svg");
AddPlatformIcon(GemInfo::Windows, ":/Resources/Windows.svg");
}
void GemItemDelegate::AddPlatformIcon(GemInfo::Platform platform, const QString& iconPath)
{
QPixmap pixmap(iconPath);
qreal aspectRatio = static_cast<qreal>(pixmap.width()) / pixmap.height();
m_platformIcons.insert(platform, QIcon(iconPath).pixmap(s_platformIconSize * aspectRatio, s_platformIconSize));
} }
void GemItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const void GemItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) const
@ -87,7 +99,7 @@ namespace O3DE::ProjectManager
painter->drawText(gemCreatorRect, Qt::TextSingleLine, gemCreator); painter->drawText(gemCreatorRect, Qt::TextSingleLine, gemCreator);
// Gem summary // Gem summary
const QSize summarySize = QSize(contentRect.width() - s_summaryStartX - s_itemMargins.right() * 4, contentRect.height()); const QSize summarySize = QSize(contentRect.width() - s_summaryStartX - s_buttonWidth - s_itemMargins.right() * 4, contentRect.height());
const QRect summaryRect = QRect(/*topLeft=*/QPoint(contentRect.left() + s_summaryStartX, contentRect.top()), summarySize); const QRect summaryRect = QRect(/*topLeft=*/QPoint(contentRect.left() + s_summaryStartX, contentRect.top()), summarySize);
painter->setFont(standardFont); painter->setFont(standardFont);
@ -96,6 +108,10 @@ namespace O3DE::ProjectManager
const QString summary = m_gemModel->GetSummary(modelIndex); const QString summary = m_gemModel->GetSummary(modelIndex);
painter->drawText(summaryRect, Qt::AlignLeft | Qt::TextWordWrap, summary); painter->drawText(summaryRect, Qt::AlignLeft | Qt::TextWordWrap, summary);
DrawButton(painter, contentRect, modelIndex);
DrawPlatformIcons(painter, contentRect, modelIndex);
painter->restore(); painter->restore();
} }
@ -105,7 +121,7 @@ namespace O3DE::ProjectManager
initStyleOption(&options, modelIndex); initStyleOption(&options, modelIndex);
int marginsHorizontal = s_itemMargins.left() + s_itemMargins.right() + s_contentMargins.left() + s_contentMargins.right(); int marginsHorizontal = s_itemMargins.left() + s_itemMargins.right() + s_contentMargins.left() + s_contentMargins.right();
return QSize(marginsHorizontal + s_summaryStartX, s_height); return QSize(marginsHorizontal + s_buttonWidth + s_summaryStartX, s_height);
} }
bool GemItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex) bool GemItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& modelIndex)
@ -132,4 +148,85 @@ namespace O3DE::ProjectManager
font.setPixelSize(fontSize); font.setPixelSize(fontSize);
return QFontMetrics(font).boundingRect(text); return QFontMetrics(font).boundingRect(text);
} }
QRect GemItemDelegate::CalcButtonRect(const QRect& contentRect) const
{
const QPoint topLeft = QPoint(contentRect.right() - s_buttonWidth - s_itemMargins.right(), contentRect.top() + contentRect.height() / 2 - s_buttonHeight / 2);
const QSize size = QSize(s_buttonWidth, s_buttonHeight);
return QRect(topLeft, size);
}
void GemItemDelegate::DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const
{
const GemInfo::Platforms platforms = m_gemModel->GetPlatforms(modelIndex);
int startX = 0;
// Iterate and draw the platforms in the order they are defined in the enum.
for (int i = 0; i < GemInfo::NumPlatforms; ++i)
{
// Check if the platform is supported by the given gem.
const GemInfo::Platform platform = static_cast<GemInfo::Platform>(1 << i);
if (platforms & platform)
{
// Get the icon for the platform and draw it.
const auto iterator = m_platformIcons.find(platform);
if (iterator != m_platformIcons.end())
{
const QPixmap& pixmap = iterator.value();
painter->drawPixmap(contentRect.left() + startX, contentRect.bottom() - s_platformIconSize, pixmap);
qreal aspectRatio = static_cast<qreal>(pixmap.width()) / pixmap.height();
startX += s_platformIconSize * aspectRatio + s_platformIconSize / 2.5;
}
}
}
}
void GemItemDelegate::DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const
{
painter->save();
const QRect buttonRect = CalcButtonRect(contentRect);
QPoint circleCenter;
QString buttonText;
const bool isAdded = m_gemModel->IsAdded(modelIndex);
if (isAdded)
{
painter->setBrush(m_buttonEnabledColor);
painter->setPen(m_buttonEnabledColor);
circleCenter = buttonRect.center() + QPoint(buttonRect.width() / 2 - s_buttonBorderRadius, 1);
buttonText = "Added";
}
else
{
circleCenter = buttonRect.center() + QPoint(-buttonRect.width() / 2 + s_buttonBorderRadius + 1, 1);
buttonText = "Get";
}
// Rounded rect
painter->drawRoundedRect(buttonRect, s_buttonBorderRadius, s_buttonBorderRadius);
// Text
QFont font;
QRect textRect = GetTextRect(font, buttonText, s_buttonFontSize);
if (isAdded)
{
textRect = QRect(buttonRect.left(), buttonRect.top(), buttonRect.width() - s_buttonCircleRadius * 2.0, buttonRect.height());
}
else
{
textRect = QRect(buttonRect.left() + s_buttonCircleRadius * 2.0, buttonRect.top(), buttonRect.width() - s_buttonCircleRadius * 2.0, buttonRect.height());
}
font.setPixelSize(s_buttonFontSize);
painter->setFont(font);
painter->setPen(m_textColor);
painter->drawText(textRect, Qt::AlignCenter, buttonText);
// Circle
painter->setBrush(m_textColor);
painter->drawEllipse(circleCenter, s_buttonCircleRadius, s_buttonCircleRadius);
painter->restore();
}
} // namespace O3DE::ProjectManager } // namespace O3DE::ProjectManager

19
Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
Unescape Escape View File

@ -16,6 +16,7 @@
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include "GemInfo.h" #include "GemInfo.h"
#include "GemModel.h" #include "GemModel.h"
#include <QHash>
#endif #endif
QT_FORWARD_DECLARE_CLASS(QEvent) QT_FORWARD_DECLARE_CLASS(QEvent)
@ -38,6 +39,9 @@ namespace O3DE::ProjectManager
private: private:
void CalcRects(const QStyleOptionViewItem& option, const QModelIndex& modelIndex, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const; void CalcRects(const QStyleOptionViewItem& option, const QModelIndex& modelIndex, QRect& outFullRect, QRect& outItemRect, QRect& outContentRect) const;
QRect GetTextRect(QFont& font, const QString& text, qreal fontSize) const; QRect GetTextRect(QFont& font, const QString& text, qreal fontSize) const;
QRect CalcButtonRect(const QRect& contentRect) const;
void DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
void DrawButton(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const;
GemModel* m_gemModel = nullptr; GemModel* m_gemModel = nullptr;
@ -47,9 +51,10 @@ namespace O3DE::ProjectManager
const QColor m_backgroundColor = QColor("#333333"); // Outside of the actual gem item const QColor m_backgroundColor = QColor("#333333"); // Outside of the actual gem item
const QColor m_itemBackgroundColor = QColor("#404040"); // Background color of the gem item const QColor m_itemBackgroundColor = QColor("#404040"); // Background color of the gem item
const QColor m_borderColor = QColor("#1E70EB"); const QColor m_borderColor = QColor("#1E70EB");
const QColor m_buttonEnabledColor = QColor("#00B931");
// Item // Item
inline constexpr static int s_height = 140; // Gem item total height inline constexpr static int s_height = 135; // Gem item total height
inline constexpr static qreal s_gemNameFontSize = 16.0; inline constexpr static qreal s_gemNameFontSize = 16.0;
inline constexpr static qreal s_fontSize = 15.0; inline constexpr static qreal s_fontSize = 15.0;
inline constexpr static int s_summaryStartX = 200; inline constexpr static int s_summaryStartX = 200;
@ -58,5 +63,17 @@ namespace O3DE::ProjectManager
inline constexpr static QMargins s_itemMargins = QMargins(/*left=*/20, /*top=*/10, /*right=*/20, /*bottom=*/10); // Item border distances inline constexpr static QMargins s_itemMargins = QMargins(/*left=*/20, /*top=*/10, /*right=*/20, /*bottom=*/10); // Item border distances
inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/15, /*top=*/12, /*right=*/12, /*bottom=*/12); // Distances of the elements within an item to the item borders inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/15, /*top=*/12, /*right=*/12, /*bottom=*/12); // Distances of the elements within an item to the item borders
inline constexpr static int s_borderWidth = 4; inline constexpr static int s_borderWidth = 4;
// Button
inline constexpr static int s_buttonWidth = 70;
inline constexpr static int s_buttonHeight = 24;
inline constexpr static int s_buttonBorderRadius = 12;
inline constexpr static int s_buttonCircleRadius = s_buttonBorderRadius - 3;
inline constexpr static qreal s_buttonFontSize = 12.0;
// Platform icons
void AddPlatformIcon(GemInfo::Platform platform, const QString& iconPath);
inline constexpr static int s_platformIconSize = 16;
QHash<GemInfo::Platform, QPixmap> m_platformIcons;
}; };
} // namespace O3DE::ProjectManager } // namespace O3DE::ProjectManager

2
Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ namespace O3DE::ProjectManager
return modelIndex.data(RoleCreator).toString(); return modelIndex.data(RoleCreator).toString();
} }
int GemModel::GetPlatforms(const QModelIndex& modelIndex) const GemInfo::Platforms GemModel::GetPlatforms(const QModelIndex& modelIndex) const
{ {
return static_cast<GemInfo::Platforms>(modelIndex.data(RolePlatforms).toInt()); return static_cast<GemInfo::Platforms>(modelIndex.data(RolePlatforms).toInt());
} }

2
Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h
Unescape Escape View File

@ -34,7 +34,7 @@ namespace O3DE::ProjectManager
QString GetName(const QModelIndex& modelIndex) const; QString GetName(const QModelIndex& modelIndex) const;
QString GetCreator(const QModelIndex& modelIndex) const; QString GetCreator(const QModelIndex& modelIndex) const;
int GetPlatforms(const QModelIndex& modelIndex) const; GemInfo::Platforms GetPlatforms(const QModelIndex& modelIndex) const;
QString GetSummary(const QModelIndex& modelIndex) const; QString GetSummary(const QModelIndex& modelIndex) const;
bool IsAdded(const QModelIndex& modelIndex) const; bool IsAdded(const QModelIndex& modelIndex) const;

9
Code/Tools/ProjectManager/project_manager.qrc
Unescape Escape View File

@ -1,8 +1,13 @@
<!DOCTYPE RCC><RCC version="1.0"> <RCC>
<qresource> <qresource prefix="/">
<file>Resources/ProjectManager.qss</file> <file>Resources/ProjectManager.qss</file>
<file>Resources/Add.svg</file> <file>Resources/Add.svg</file>
<file>Resources/Select_Folder.svg</file> <file>Resources/Select_Folder.svg</file>
<file>Resources/o3de_editor.ico</file> <file>Resources/o3de_editor.ico</file>
<file>Resources/Windows.svg</file>
<file>Resources/Android.svg</file>
<file>Resources/iOS.svg</file>
<file>Resources/Linux.svg</file>
<file>Resources/macOS.svg</file>
</qresource> </qresource>
</RCC> </RCC>
Write Preview
Loading…
Cancel
Save