Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 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.
@@ -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>

@@ -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>

@@ -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));

@@ -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
 )