Merge pull request #1250 from aws-lumberyard-dev/lawalfua/commonToolsApplication

Addition of a base AzQtToolsApplication class
This commit is contained in:
Guthrie Adams
2021-07-19 13:32:09 -05:00
committed by GitHub
14 changed files with 220 additions and 86 deletions
+1 -3
View File
@@ -243,7 +243,7 @@ namespace Editor
}
EditorQtApplication::EditorQtApplication(int& argc, char** argv)
: QApplication(argc, argv)
: AzQtApplication(argc, argv)
, m_inWinEventFilter(false)
, m_stylesheet(new AzQtComponents::O3DEStylesheet(this))
, m_idleTimer(new QTimer(this))
@@ -253,8 +253,6 @@ namespace Editor
setWindowIcon(QIcon(":/Application/res/o3de_editor.ico"));
// set the default key store for our preferences:
setOrganizationName("O3DE");
setOrganizationDomain("o3de.org");
setApplicationName("O3DE Editor");
connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle);
+2 -2
View File
@@ -8,7 +8,6 @@
#pragma once
#if !defined(Q_MOC_RUN)
#include <QApplication>
#include <QAbstractNativeEventFilter>
#include <QColor>
#include <QMap>
@@ -20,6 +19,7 @@
#include <AzCore/PlatformDef.h>
#include <AzCore/UserSettings/UserSettingsProvider.h>
#include <IEditor.h>
#include <AzQtComponents/Application/AzQtApplication.h>
#endif
class QFileInfo;
@@ -48,7 +48,7 @@ namespace Editor
void ScanDirectories(QFileInfoList& directoryList, const QStringList& filters, QFileInfoList& files, ScanDirectoriesUpdateCallBack updateCallback = nullptr);
class EditorQtApplication
: public QApplication
: public AzQtComponents::AzQtApplication
, public QAbstractNativeEventFilter
, public IEditorNotifyListener
, public AZ::UserSettingsOwnerRequestBus::Handler