Merge branch 'main' into LY-113714

2021-04-16 10:00:04 +01:00
parent a947007861 c2f9019f7c
commit fece27b1b0
2723 changed files with 46265 additions and 543702 deletions
@@ -14,19 +14,17 @@
 /**
 * \mainpage
 * 
- * Introduced with Amazon Lumberyard version 1.25 and the release of UI 2.0, Lumberyard's
- * custom Qt widget library provides developers with access to the same UI components used
- * throughout Lumberyard. Using this library, UI developers can build their own tools and
- * extensions for Lumberyard, while maintaining a coherent and standardized UI experience.
+ * Using this library, UI developers can build their own tools and
+ * extensions for Open 3D Engine, while maintaining a coherent and standardized UI experience.
 * This custom library provides new and extended widgets, and includes a set of styles and
 * user interaction patterns that are applied on top of the Qt framework - the C++ library
- * that Lumberyard relies on for its UI. The library can be extended to support your own customizations and modifications. 
+ * that Open 3D Engine relies on for its UI. The library can be extended to support your own customizations and modifications. 
 * 
 * With this UI 2.0 API reference guide, we're working towards offering a full and comprehensive
- * API refernce for all tools developers that are extending Lumberyard. The API reference
+ * API refernce for all tools developers that are extending Open 3D Engine. The API reference
 * is intended for C++ programmers building tools. For UX designers looking to understand
 * the best patterns and practices when making a tool to comfortably integrate with
- * the Lumberyard editor, see the [UI 2.0 design guide](https://docs.aws.amazon.com/lumberyard/latest/ui/).
+ * the Open 3D Engine editor, see the [UI 2.0 design guide](https://docs.aws.amazon.com/lumberyard/latest/ui/).
 */
 #include <AzCore/PlatformDef.h>

@@ -17,7 +17,7 @@
 #include <AzQtComponents/Components/Widgets/LineEdit.h>
 #include <AzQtComponents/Utilities/ScreenUtilities.h>

-#include "Components/ui_FilteredSearchWidget.h"
+#include <AzQtComponents/Components/ui_FilteredSearchWidget.h>

 #include <AzQtComponents/Components/FlowLayout.h>

@@ -16,10 +16,10 @@
 namespace AzQtComponents
 {
    // Here for backwards compatibility with the old name of this class
-    class LumberyardStylesheet : public StyleManager
+    class O3DEStylesheet : public StyleManager
    {
    public:
-        LumberyardStylesheet(QObject* parent) : StyleManager(parent) {}
+        O3DEStylesheet(QObject* parent) : StyleManager(parent) {}
    };

 } // namespace AzQtComponents
@@ -39,7 +39,7 @@ namespace AzQtComponents
    } // namespace Internal

    /**
-    * The UI 2.0 Lumberyard Qt Style.
+    * The UI 2.0 Open 3D Engine Qt Style.
    * 
    * Should not need to be used directly; use the AzQtComponents::StyleManager instead.
    *
@@ -37,7 +37,7 @@ namespace AzQtComponents
    class AutoCustomWindowDecorations;

    /**
-     * Wrapper around classes dealing with Lumberyard style.
+     * Wrapper around classes dealing with Open 3D Engine style.
     *
     * New applications should work like this:
     *   
@@ -24,7 +24,7 @@ class QMimeData;
 namespace AzQtComponents
 {

-    static const QString MIME_TYPE_PALETTE = QStringLiteral("application/x-lumberyard-color-palette+xml");
+    static const QString MIME_TYPE_PALETTE = QStringLiteral("application/x-o3de-color-palette+xml");

    class PaletteModel;

@@ -19,7 +19,7 @@
 #include <QPushButton>
 #include <QMessageBox>
 #include <AzCore/Casting/numeric_cast.h>
-#include <Components/Widgets/Internal/ui_OverlayWidgetLayer.h>
+#include <AzQtComponents/Components/Widgets/Internal/ui_OverlayWidgetLayer.h>
 #include <AzCore/Debug/Trace.h>

 namespace AzQtComponents
@@ -264,4 +264,4 @@ namespace AzQtComponents
    } // namespace Internal
 } // namespace AzQtComponents

-#include "Components/Widgets/Internal/moc_OverlayWidgetLayer.cpp"
+#include "Components/Widgets/Internal/moc_OverlayWidgetLayer.cpp"
@@ -20,7 +20,7 @@ namespace AzQtComponents
    class Style;

    /**
-     * Lumberyard specific wrapper to do MessageBox type stuff, specifically to automatically handle
+     * Open 3D Engine specific wrapper to do MessageBox type stuff, specifically to automatically handle
     * checking/writing "do not ask this question again" checkbox/settings.
     *
     * Called AzMessageBox instead of MessageBox because for windows.h does #define MessageBox MessageBoxA / MessageBoxW
@@ -179,7 +179,7 @@ namespace AzQtComponents
        {
            m_guestWidget = nullptr;

-            // the Lumberyard Editor has code that checks for Modal widgets, and blocks on doing other things
+            // the Open 3D Engine Editor has code that checks for Modal widgets, and blocks on doing other things
            // if there are still active Modal dialogs.
            // So we need to ensure that this WindowDecorationWrapper doesn't report itself as being modal
            // after the guest widget has been deleted.
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c103b1259ce2203c4af26f4e4f4fa9bf06af50614c949d7e59e0bdd688e7562
+size 1979
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3082c3a282d8578b1ba9c9fe74857d7155ee918721d9bfed4ef3d00ee09211c
+size 1890
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7f859801eca4bb6cac2566000a2bbae7a597c0d50caa00a83c4e15dc739f1d4
+size 1917
@@ -383,6 +383,9 @@
    <file>img/UI20/toolbar/Y_axis.svg</file>
    <file>img/UI20/toolbar/Z_axis.svg</file>
    <file>img/UI20/toolbar/XY2_copy.svg</file>
+    <file>img/triangle0.png</file>
+    <file>img/triangle0_highlighted.png</file>
+    <file>img/line.png</file>
 </qresource>
 <qresource>
    <file alias="Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
@@ -10,7 +10,7 @@
 *
 */
 #include "AssetBrowserFolderPage.h"
-#include "Gallery/ui_AssetBrowserFolderPage.h"
+#include <AzQtComponents/Gallery/ui_AssetBrowserFolderPage.h>

 #include <AzToolsFramework/AssetBrowser/Views/AssetBrowserFolderWidget.h>
 #include <AzCore/Casting/numeric_cast.h>
@@ -11,7 +11,7 @@
 */

 #include "BreadCrumbsPage.h"
-#include "Gallery/ui_BreadCrumbsPage.h"
+#include <AzQtComponents/Gallery/ui_BreadCrumbsPage.h>

 #include <QDebug>
 #include <QStyle>
@@ -107,4 +107,4 @@ BreadCrumbsPage::~BreadCrumbsPage()
 {
 }

-#include "Gallery/moc_BreadCrumbsPage.cpp"
+#include "Gallery/moc_BreadCrumbsPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "BrowseEditPage.h"
-#include "Gallery/ui_BrowseEditPage.h"
+#include <AzQtComponents/Gallery/ui_BrowseEditPage.h>

 #include <AzQtComponents/Components/Widgets/BrowseEdit.h>
 #include <QIntValidator>
@@ -12,7 +12,7 @@

 #include "ButtonPage.h"
 #include "FixedStateButton.h"
-#include "Gallery/ui_ButtonPage.h"
+#include <AzQtComponents/Gallery/ui_ButtonPage.h>

 #include <AzQtComponents/Components/Widgets/PushButton.h>

@@ -110,4 +110,4 @@ ButtonPage::~ButtonPage()
 {
 }

-#include "Gallery/moc_ButtonPage.cpp"
+#include "Gallery/moc_ButtonPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "CardPage.h"
-#include "Gallery/ui_CardPage.h"
+#include <AzQtComponents/Gallery/ui_CardPage.h>

 #include <AzQtComponents/Components/Widgets/Card.h>
 #include <AzQtComponents/Components/Widgets/CardNotification.h>
@@ -11,7 +11,7 @@
 */

 #include "CheckBoxPage.h"
-#include "Gallery/ui_CheckBoxPage.h"
+#include <AzQtComponents/Gallery/ui_CheckBoxPage.h>

 #include <AzQtComponents/Components/Widgets/CheckBox.h>

@@ -71,4 +71,4 @@ CheckBoxPage::~CheckBoxPage()
 {
 }

-#include "Gallery/moc_CheckBoxPage.cpp"
+#include "Gallery/moc_CheckBoxPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "ColorLabelPage.h"
-#include "Gallery/ui_ColorLabelPage.h"
+#include <AzQtComponents/Gallery/ui_ColorLabelPage.h>

 #include <AzQtComponents/Utilities/Conversions.h>

@@ -11,7 +11,7 @@
 */

 #include "ColorPickerPage.h"
-#include "Gallery/ui_ColorPickerPage.h"
+#include <AzQtComponents/Gallery/ui_ColorPickerPage.h>

 #include <AzQtComponents/Components/Widgets/ColorPicker.h>
 #include <AzQtComponents/Utilities/Conversions.h>
@@ -11,7 +11,7 @@
 */

 #include "ComboBoxPage.h"
-#include "Gallery/ui_ComboBoxPage.h"
+#include <AzQtComponents/Gallery/ui_ComboBoxPage.h>

 #include <AzQtComponents/Components/Widgets/CheckBox.h>
 #include <AzQtComponents/Components/Widgets/ComboBox.h>
@@ -11,7 +11,7 @@
 */

 #include "ComponentDemoWidget.h"
-#include "Gallery/ui_ComponentDemoWidget.h"
+#include "AzQtComponents/Gallery/ui_ComponentDemoWidget.h"
 #include "AssetBrowserFolderPage.h"
 #include "BreadCrumbsPage.h"
 #include "BrowseEditPage.h"
@@ -11,7 +11,7 @@
 */

 #include "DragAndDropPage.h"
-#include <Gallery/ui_DragAndDropPage.h>
+#include <AzQtComponents/Gallery/ui_DragAndDropPage.h>

 #include <QLabel>
 #include <AzQtComponents/Components/Style.h>
@@ -11,7 +11,7 @@
 */

 #include "FilteredSearchWidgetPage.h"
-#include "Gallery/ui_FilteredSearchWidgetPage.h"
+#include <AzQtComponents/Gallery/ui_FilteredSearchWidgetPage.h>

 FilteredSearchWidgetPage::FilteredSearchWidgetPage(QWidget* parent)
    : QWidget(parent)
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe52372c907d680df52dbf32d863a4007a15db90e9ad35fbe153870a72e2d0ef
+size 108402
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "Gallery.ico"
@@ -12,7 +12,7 @@

 #include "GradientSliderPage.h"
 #include <AzQtComponents/Utilities/Conversions.h>
-#include "Gallery/ui_GradientSliderPage.h"
+#include <AzQtComponents/Gallery/ui_GradientSliderPage.h>

 #include <AzQtComponents/Components/Widgets/GradientSlider.h>
 #include <AzCore/Casting/numeric_cast.h>
@@ -11,7 +11,7 @@
 */

 #include "HyperlinkPage.h"
-#include <Gallery/ui_HyperlinkPage.h>
+#include <AzQtComponents/Gallery/ui_HyperlinkPage.h>

 #include <QLabel>
 #include <AzQtComponents/Components/Style.h>
@@ -11,7 +11,7 @@
 */

 #include "LineEditPage.h"
-#include "Gallery/ui_LineEditPage.h"
+#include <AzQtComponents/Gallery/ui_LineEditPage.h>

 #include <QValidator>
 #include <QDoubleValidator>
@@ -11,7 +11,7 @@
 */

 #include "MenuPage.h"
-#include <Gallery/ui_MenuPage.h>
+#include <AzQtComponents/Gallery/ui_MenuPage.h>

 #include <QMenu>

@@ -27,7 +27,7 @@ MenuPage::MenuPage(QWidget* parent)

    const auto actionText = QStringLiteral("Option");
    menu->addAction(actionText);
-    auto searchAction = menu->addAction(QIcon(QStringLiteral(":/stylesheet/img/search.svg")), QStringLiteral("Search"));
+    menu->addAction(QIcon(QStringLiteral(":/stylesheet/img/search.svg")), QStringLiteral("Search"));
    menu->addSeparator();

    auto shortcutAction = menu->addAction(actionText);
@@ -83,7 +83,7 @@ action->setChecked(true);
 auto submenu = menu->addMenu(QStringLiteral("Submenu"));
 submenu->addAction(actionText);

-// Note: some Lumberyard menus (like the one in the MainWindow) forcefully hide icons by design.
+// Note: some Open 3D Engine menus (like the one in the MainWindow) forcefully hide icons by design.

 </pre>

@@ -96,4 +96,4 @@ MenuPage::~MenuPage()
 {
 }

-#include <Gallery/moc_MenuPage.cpp>
+#include <Gallery/moc_MenuPage.cpp>
@@ -11,7 +11,7 @@
 */

 #include "ProgressIndicatorPage.h"
-#include "Gallery/ui_ProgressIndicatorPage.h"
+#include <AzQtComponents/Gallery/ui_ProgressIndicatorPage.h>

 ProgressIndicatorPage::ProgressIndicatorPage(QWidget* parent)
 : QWidget(parent)
@@ -75,4 +75,4 @@ ProgressIndicatorPage::~ProgressIndicatorPage()
 {
 }

-#include "Gallery/moc_ProgressIndicatorPage.cpp"
+#include "Gallery/moc_ProgressIndicatorPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "RadioButtonPage.h"
-#include "Gallery/ui_RadioButtonPage.h"
+#include <AzQtComponents/Gallery/ui_RadioButtonPage.h>

 #include <AzQtComponents/Components/Widgets/RadioButton.h>

@@ -59,4 +59,4 @@ RadioButtonPage::~RadioButtonPage()
 {
 }

-#include "Gallery/moc_RadioButtonPage.cpp"
+#include "Gallery/moc_RadioButtonPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "ReflectedPropertyEditorPage.h"
-#include <Gallery/ui_ReflectedPropertyEditorPage.h>
+#include <AzQtComponents/Gallery/ui_ReflectedPropertyEditorPage.h>

 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
@@ -11,7 +11,7 @@
 */

 #include "ScrollBarPage.h"
-#include <Gallery/ui_ScrollBarPage.h>
+#include <AzQtComponents/Gallery/ui_ScrollBarPage.h>

 #include <AzQtComponents/Components/Widgets/ScrollBar.h>

@@ -11,7 +11,7 @@
 */

 #include "SegmentControlPage.h"
-#include "Gallery/ui_SegmentControlPage.h"
+#include <AzQtComponents/Gallery/ui_SegmentControlPage.h>

 #include <AzQtComponents/Components/Widgets/SegmentBar.h>
 #include <AzQtComponents/Components/Widgets/SegmentControl.h>
@@ -11,7 +11,7 @@
 */

 #include "SliderComboPage.h"
-#include <Gallery/ui_SliderComboPage.h>
+#include <AzQtComponents/Gallery/ui_SliderComboPage.h>

 #include <AzQtComponents/Components/Widgets/Slider.h>
 #include <AzQtComponents/Components/Widgets/SliderCombo.h>
@@ -11,7 +11,7 @@
 */

 #include "SliderPage.h"
-#include "Gallery/ui_SliderPage.h"
+#include <AzQtComponents/Gallery/ui_SliderPage.h>

 #include <AzQtComponents/Components/Widgets/Slider.h>

@@ -155,4 +155,4 @@ SliderPage::~SliderPage()
 {
 }

-#include "Gallery/moc_SliderPage.cpp"
+#include "Gallery/moc_SliderPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "SpinBoxPage.h"
-#include "Gallery/ui_SpinBoxPage.h"
+#include <AzQtComponents/Gallery/ui_SpinBoxPage.h>

 #include <AzQtComponents/Components/Widgets/SpinBox.h>
 #include <QUndoCommand>
@@ -11,7 +11,7 @@
 */

 #include "SplitterPage.h"
-#include <Gallery/ui_SplitterPage.h>
+#include <AzQtComponents/Gallery/ui_SplitterPage.h>

 SplitterPage::SplitterPage(QWidget* parent)
    : QWidget(parent)
@@ -11,7 +11,7 @@
 */

 #include "StyleSheetPage.h"
-#include "Gallery/ui_StyleSheetPage.h"
+#include <AzQtComponents/Gallery/ui_StyleSheetPage.h>

 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
@@ -11,7 +11,7 @@
 */

 #include "StyledDockWidgetPage.h"
-#include "Gallery/ui_StyledDockWidgetPage.h"
+#include <AzQtComponents/Gallery/ui_StyledDockWidgetPage.h>

 #include <AzQtComponents/Components/DockMainWindow.h>
 #include <AzQtComponents/Components/FancyDocking.h>
@@ -11,7 +11,7 @@
 */

 #include "SvgLabelPage.h"
-#include "Gallery/ui_SvgLabelPage.h"
+#include <AzQtComponents/Gallery/ui_SvgLabelPage.h>

 #include <QDragEnterEvent>
 #include <QMimeData>
@@ -118,4 +118,4 @@ void SvgLabelPage::dropEvent(QDropEvent *event)
    theImage->load(firstUrl.toLocalFile());
    m_initialSize = theImage->renderer()->defaultSize();
    onResetSize();
-}
+}
@@ -11,7 +11,7 @@
 */

 #include "TabWidgetPage.h"
-#include <Gallery/ui_TabWidgetPage.h>
+#include <AzQtComponents/Gallery/ui_TabWidgetPage.h>

 #include <AzQtComponents/Components/Widgets/TabWidget.h>
 #include <QAction>
@@ -19,7 +19,7 @@

 #include <AzQtComponents/Components/Widgets/Text.h>

-#include <Gallery/ui_TableViewPage.h>
+#include <AzQtComponents/Gallery/ui_TableViewPage.h>

 #include <QDateTime>
 #include <QFileSystemModel>
@@ -11,7 +11,7 @@
 */

 #include "TitleBarPage.h"
-#include <Gallery/ui_TitleBarPage.h>
+#include <AzQtComponents/Gallery/ui_TitleBarPage.h>

 TitleBarPage::TitleBarPage(QWidget* parent)
    : QWidget(parent)
@@ -11,7 +11,7 @@
 */

 #include "ToggleSwitchPage.h"
-#include <Gallery/ui_ToggleSwitchPage.h>
+#include <AzQtComponents/Gallery/ui_ToggleSwitchPage.h>

 #include <AzQtComponents/Components/Widgets/CheckBox.h>

@@ -59,4 +59,4 @@ ToggleSwitchPage::~ToggleSwitchPage()
 {
 }

-#include "Gallery/moc_ToggleSwitchPage.cpp"
+#include "Gallery/moc_ToggleSwitchPage.cpp"
@@ -11,7 +11,7 @@
 */

 #include "ToolBarPage.h"
-#include <Gallery/ui_ToolBarPage.h>
+#include <AzQtComponents/Gallery/ui_ToolBarPage.h>

 #include <AzQtComponents/Components/Widgets/Text.h>
 #include <AzQtComponents/Components/Widgets/ToolBar.h>
@@ -17,7 +17,7 @@
 #include <AzQtComponents/Components/Widgets/Text.h>
 #include <AzQtComponents/Components/Widgets/TreeView.h>

-#include <Gallery/ui_TreeViewPage.h>
+#include <AzQtComponents/Gallery/ui_TreeViewPage.h>

 namespace
 {
@@ -11,7 +11,7 @@
 */

 #include "TypographyPage.h"
-#include <Gallery/ui_TypographyPage.h>
+#include <AzQtComponents/Gallery/ui_TypographyPage.h>

 #include <QLabel>
 #include <AzQtComponents/Components/Style.h>
@@ -123,4 +123,4 @@ TypographyPage::~TypographyPage()
 {
 }

-#include "Gallery/moc_TypographyPage.cpp"
+#include "Gallery/moc_TypographyPage.cpp"
@@ -27,7 +27,7 @@

 #include <AzQtComponents/Components/GlobalEventFilter.h>
 #include <AzQtComponents/Components/StyledDockWidget.h>
-#include <AzQtComponents/Components/LumberyardStylesheet.h>
+#include <AzQtComponents/Components/O3DEStylesheet.h>
 #include <AzQtComponents/Utilities/HandleDpiAwareness.h>
 #include <AzQtComponents/Components/WindowDecorationWrapper.h>
 #include "ComponentDemoWidget.h"
@@ -136,7 +136,7 @@ int main(int argc, char **argv)

    QApplication::setOrganizationName("Amazon");
    QApplication::setOrganizationDomain("amazon.com");
-    QApplication::setApplicationName("LumberyardWidgetGallery");
+    QApplication::setApplicationName("O3DEWidgetGallery");

    QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Oval 6</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Inspector-2" transform="translate(-1724.000000, -285.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group" transform="translate(1714.000000, 255.000000)">
+                <path d="M17.75,30.25 C22.0302068,30.25 25.5,33.7197932 25.5,38 C25.5,42.2802068 22.0302068,45.75 17.75,45.75 C13.4697932,45.75 10,42.2802068 10,38 C10,33.7197932 13.4697932,30.25 17.75,30.25 Z M21.9230842,36.8875321 C21.590362,36.5777872 21.1499255,36.4637717 20.393435,36.8875321 L20.393435,36.8875321 L20.393435,39.1247335 C20.3078139,39.3862214 19.5880467,39.0740522 19.5880467,39.3471973 L19.5880467,39.3471973 L19.5880467,40.1832625 C19.5880467,40.5490163 20.373798,40.4179507 20.9265311,40.4179507 C21.2398827,40.5640832 21.1499255,41.1654284 21.1499255,41.3219178 C20.8009407,41.3219178 20.8107092,42.1358461 19.7108476,42.1358461 C19.4749079,42.1358461 19.2067566,42.3782747 18.9063936,42.8631318 C18.5774755,42.9572 18.3585318,42.9572 18.2495624,42.8631318 C17.9917698,42.6405913 18.0639002,42.5929236 18.0639002,42.1358461 C17.7490706,42.0583816 17.2421758,42.0157944 16.5432157,42.0080847 L16.5432157,42.0080847 L16.5432157,41.3219178 L16.5432157,41.3219178 L15.7192213,41.3219178 C15.4649524,41.467548 15.2659138,41.7388575 15.1221055,42.1358461 L15.1221055,42.1358461 L13.4562289,42.1358461 C13.4562289,42.8631318 14.2746545,42.6643305 14.2746545,43.4057505 C14.2746545,43.70763 15.5932808,43.3136142 15.7192213,44.0188584 C15.8451617,44.7241026 18.0966562,44.6297834 19.5880467,44.2327119 C22.4562289,43.4690805 23.8820008,41.1463376 24.2040243,39.5905304 C24.5260478,38.0347231 24.343851,37.5466972 23.6034998,37.5466972 L23.6034998,37.5466972 L22.6881842,37.5466972 C22.2173073,37.5466972 22.8191026,38.3115454 22.4884098,38.3115454 C22.157717,38.3115454 21.9230842,38.3612916 21.9230842,37.7457914 L21.9230842,37.7457914 Z M17.4663725,31.3904088 C15.1901696,31.3764381 13.5194447,31.7569095 11.3640944,36.6864363 C11.3640944,37.0394323 11.4375107,37.3715778 11.6947367,37.4223367 C11.9057364,37.4639736 12.6046349,37.4223367 12.8218274,37.4223367 C13.3401431,37.4223367 13.4562289,37.4223367 13.4562289,38.1786887 C13.4562289,38.5903116 14.2573076,38.7864722 14.2573076,39.3471973 C14.2573076,39.9079225 14.7600011,40.1509551 15.1221055,40.5685872 L15.8282319,40.5685872 L15.8282319,40.5685872 L15.8282319,39.0899479 L15.8282319,39.0899479 C15.8282319,38.9733116 16.5432157,38.9733116 16.9178106,39.0064924 C17.4032805,39.0064924 17.4032805,38.3483287 17.1722779,38.301168 C16.741164,38.2131535 15.8282319,38.301168 15.8282319,37.9037493 L15.8282319,36.3094851 L15.8282319,36.3094851 C15.8282319,35.6193344 16.5432157,36.2438976 16.5432157,35.553747 L16.5432157,33.4007819 L16.5432157,33.4007819 C16.5432157,32.7363875 16.8954156,32.83074 17.4663725,32.83074 C18.2495624,32.3799956 17.9300811,31.7569095 17.4663725,31.3904088 Z M18.9263619,34.4814505 C18.2495624,34.3404349 17.832423,34.3404349 17.2855835,34.4814505 C17.1345093,34.795806 17.1345093,34.9935976 17.2855835,35.1536992 C18.2495624,35.1450754 18.9263619,35.3316464 18.9263619,35.8792081 C19.0692871,36.0410209 19.4229255,36.0410209 19.7108476,35.8792081 C19.683443,35.3640449 19.683443,34.9051922 18.9263619,34.4814505 Z" id="Oval-6"></path>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -7,6 +7,9 @@
        <file alias="prefab.svg">Entity/prefab.svg</file>
        <file alias="prefab_edit.svg">Entity/prefab_edit.svg</file>
    </qresource>
+    <qresource prefix="/Level">
+        <file alias="level.svg">Level/level.svg</file>
+    </qresource>
    <qresource prefix="/Notifications">
        <file alias="checkmark.svg">Notifications/checkmark.svg</file>
        <file alias="download.svg">Notifications/download.svg</file>
@@ -13,7 +13,7 @@
 #include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
 #include <AzToolsFramework/Application/ToolsApplication.h>
 #include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <AzQtComponents/Components/LumberyardStylesheet.h>
+#include <AzQtComponents/Components/O3DEStylesheet.h>
 #include <AzQtComponents/Utilities/QtPluginPaths.h>
 #include <AzQtComponents/Utilities/HandleDpiAwareness.h>

@@ -14,7 +14,7 @@
 #define DEPLOYMENTSWIDGET_H

 #if !defined(Q_MOC_RUN)
-#include "StyleGallery/ui_deploymentswidget.h"
+#include <AzQtComponents/StyleGallery/ui_deploymentswidget.h>

 #include <QWidget>
 #include <QScopedPointer>
@@ -16,7 +16,7 @@

 #include "ViewportTitleDlg.h"

-#include "StyleGallery/ui_ViewportTitleDlg.h"
+#include <AzQtComponents/StyleGallery/ui_ViewportTitleDlg.h>
 #include <QAction>

 ViewportTitleDlg::ViewportTitleDlg(QWidget* pParent)
@@ -17,7 +17,7 @@
 #include <AzQtComponents/Components/ToolButtonComboBox.h>
 #include <AzQtComponents/Components/ToolButtonLineEdit.h>
 #include <AzQtComponents/Components/WindowDecorationWrapper.h>
-#include <AzQtComponents/Components/LumberyardStylesheet.h>
+#include <AzQtComponents/Components/O3DEStylesheet.h>
 #include "MyCombo.h"

 #include <QPushButton>
@@ -183,7 +183,7 @@ int main(int argc, char **argv)
    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);

    QApplication app(argc, argv);
-    AzQtComponents::LumberyardStylesheet stylesheet(&app);
+    AzQtComponents::O3DEStylesheet stylesheet(&app);
    AZ::IO::FixedMaxPath engineRootPath;
    {
        AZ::ComponentApplication componentApplication(argc, argv);
@@ -210,7 +210,7 @@ int main(int argc, char **argv)
    action->setMenu(fileMenu);
    auto openDock = fileMenu->addAction("Open dockwidget");
    QObject::connect(openDock, &QAction::triggered, w, [&w] {
-        auto dock = new AzQtComponents::StyledDockWidget(QLatin1String("Amazon Lumberyard"), w);
+        auto dock = new AzQtComponents::StyledDockWidget(QLatin1String("Open 3D Engine"), w);
        auto button = new QPushButton("Click to dock");
        auto wid = new QWidget();
        auto widLayout = new QVBoxLayout(wid);
@@ -10,7 +10,7 @@
 *
 */
 #include "mainwidget.h"
-#include <StyleGallery/ui_mainwidget.h>
+#include <AzQtComponents/StyleGallery/ui_mainwidget.h>
 #include <AzQtComponents/Components/ButtonStripe.h>
 #include <AzQtComponents/Components/DockBarButton.h>

@@ -117,7 +117,7 @@ namespace AzQtComponents
        // the correct size, but with garbage data in the last scanline. We crop this in the callback.
        m_magnifier = CreateWindowW(
            WC_MAGNIFIERW,
-            L"Lumberyard Color Picker Eyedropper Helper",
+            L"Open 3D Engine Color Picker Eyedropper Helper",
            WS_CHILD | WS_VISIBLE,
            0,
            0,
@@ -45,7 +45,7 @@ set(FILES
    Components/FilteredSearchWidget.ui
    Components/GlobalEventFilter.h
    Components/GlobalEventFilter.cpp
-    Components/LumberyardStylesheet.h
+    Components/O3DEStylesheet.h
    Components/Titlebar.cpp
    Components/Titlebar.h
    Components/TitleBarOverdrawHandler.cpp
@@ -124,4 +124,5 @@ set(FILES
    Gallery/TreeViewPage.ui
    Gallery/TreeViewPage.cpp
    Gallery/TreeViewPage.h
+    Gallery/Gallery.rc
 )