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
@@ -21,8 +21,9 @@
#include <AzFramework/Logging/LogFile.h>
#include <AzToolsFramework/API/AssetDatabaseBus.h>
#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
#include <AzToolsFramework/Logger/TraceLogger.h>
#include <AzQtComponents/Application/AzQtApplication.h>
#include <QApplication>
#include <QTimer>
namespace MaterialEditor
@@ -31,7 +32,7 @@ namespace MaterialEditor
class MaterialEditorApplication
: public AzFramework::Application
, public QApplication
, public AzQtComponents::AzQtApplication
, private AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler
, private MaterialEditorWindowNotificationBus::Handler
, private AzFramework::AssetSystemStatusBus::Handler
@@ -100,12 +101,11 @@ namespace MaterialEditor
//////////////////////////////////////////////////////////////////////////
// AZ::Debug::TraceMessageBus::Handler overrides...
bool OnOutput(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
void CompileCriticalAssets();
void ProcessCommandLine(const AZ::CommandLine& commandLine);
void WriteStartupLog();
void LoadSettings();
void UnloadSettings();
@@ -125,6 +125,8 @@ namespace MaterialEditor
AZStd::vector<LogMessage> m_startupLogSink;
AZStd::unique_ptr<AzFramework::LogFile> m_logFile;
AzToolsFramework::TraceLogger m_traceLogger;
//! Local user settings are used to store material browser tree expansion state
AZ::UserSettingsProvider m_localUserSettings;