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

Addition of a base AzQtToolsApplication class

Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp

@@ -73,9 +73,9 @@ namespace MaterialEditor
 
     MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv)
         : Application(argc, argv)
-        , QApplication(*argc, *argv)
+        , AzQtApplication(*argc, *argv)
     {
-        AZ::Debug::TraceMessageBus::Handler::BusConnect();
+        QApplication::setApplicationName("O3DE Material Editor");
 
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
             *AZ::SettingsRegistry::Get(), GetBuildTargetName());
@@ -89,10 +89,9 @@ namespace MaterialEditor
 
     MaterialEditorApplication::~MaterialEditorApplication()
     {
-        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
         AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
         MaterialEditorWindowNotificationBus::Handler::BusDisconnect();
-        AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
+        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
     }
 
     void MaterialEditorApplication::CreateReflectionManager()
@@ -357,42 +356,6 @@ namespace MaterialEditor
         }
     }
 
-    void MaterialEditorApplication::WriteStartupLog()
-    {
-        using namespace AzFramework;
-
-        AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
-        AZ_Assert(fileIO != nullptr, "FileIO should be running at this point");
-
-        // There is no log system online so we have to create your own log file.
-        char resolveBuffer[AZ_MAX_PATH_LEN] = { 0 };
-        fileIO->ResolvePath("@user@", resolveBuffer, AZ_MAX_PATH_LEN);
-
-        // Note: @log@ hasn't been set at this point
-        AZStd::string logDirectory;
-        StringFunc::Path::Join(resolveBuffer, "log", logDirectory);
-        fileIO->SetAlias("@log@", logDirectory.c_str());
-
-        fileIO->CreatePath("@root@");
-        fileIO->CreatePath("@user@");
-        fileIO->CreatePath("@log@");
-
-        AZStd::string logPath;
-        StringFunc::Path::Join(logDirectory.c_str(), "MaterialEditor.log", logPath);
-
-        m_logFile.reset(aznew LogFile(logPath.c_str()));
-        if (m_logFile)
-        {
-            m_logFile->SetMachineReadable(false);
-            for (const LogMessage& message : m_startupLogSink)
-            {
-                m_logFile->AppendLog(LogFile::SEV_NORMAL, message.window.c_str(), message.message.c_str());
-            }
-            m_startupLogSink = {};
-            m_logFile->FlushLog();
-        }
-    }
-
     void MaterialEditorApplication::LoadSettings()
     {
         AZ::SerializeContext* context = nullptr;
@@ -480,7 +443,7 @@ namespace MaterialEditor
             return;
         }
 
-        WriteStartupLog();
+        m_traceLogger.WriteStartupLog("MaterialEditor.log");
 
         if (!LaunchDiscoveryService())
         {

Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h

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

Gems/Atom/Tools/MaterialEditor/Code/Source/main.cpp

@@ -25,21 +25,7 @@
 
 int main(int argc, char** argv)
 {
-    QApplication::setOrganizationName("O3DE");
-    QApplication::setOrganizationDomain("o3de.org");
-    QApplication::setApplicationName("O3DE Material Editor");
-
-    AzQtComponents::PrepareQtPaths();
-
-    QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
-
-    // Must be set before QApplication is initialized, so that we support HighDpi monitors, like the Retina displays
-    // on Windows 10
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-    QCoreApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-    AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
+    AzQtComponents::AzQtApplication::InitializeDpiScaling();
 
     MaterialEditor::MaterialEditorApplication app(&argc, &argv);