diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp index 7f63ec18d1..3ef86f1e46 100644 --- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp +++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp @@ -16,7 +16,7 @@ namespace AzFramework { AZStd::string GetPersistentName() { - AZStd::string persistentName = "Open 3D Engine"; + AZStd::string persistentName = "O3DE"; char procPath[AZ_MAX_PATH_LEN]; AZ::Utils::GetExecutablePathReturnType ret = AZ::Utils::GetExecutablePath(procPath, AZ_MAX_PATH_LEN); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp index d2063166a9..db8024b0e4 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp @@ -205,7 +205,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("Open 3D Engine"), w); + auto dock = new AzQtComponents::StyledDockWidget(QLatin1String("O3DE"), w); auto button = new QPushButton("Click to dock"); auto wid = new QWidget(); auto widLayout = new QVBoxLayout(wid); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp index 41e982e303..50e21bc84a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp @@ -183,8 +183,8 @@ namespace AzToolsFramework // if you want to run headlessly, do not call this function. void Framework::Run() { - pApplication->setOrganizationName("Amazon Games Studios"); - pApplication->setApplicationName("Editor"); + pApplication->setOrganizationName("O3DE"); + pApplication->setApplicationName("O3DE Editor"); bool GUIMode = true; EBUS_EVENT_RESULT(GUIMode, LegacyFramework::FrameworkApplicationMessages::Bus, IsRunningInGUIMode); diff --git a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp b/Code/Sandbox/Editor/Core/QtEditorApplication.cpp index 300bc28c15..5554498bfd 100644 --- a/Code/Sandbox/Editor/Core/QtEditorApplication.cpp +++ b/Code/Sandbox/Editor/Core/QtEditorApplication.cpp @@ -254,7 +254,7 @@ namespace Editor // set the default key store for our preferences: setOrganizationName("Amazon"); setOrganizationDomain("amazon.com"); - setApplicationName("Open 3D Engine"); + setApplicationName("O3DE Editor"); connect(m_idleTimer, &QTimer::timeout, this, &EditorQtApplication::maybeProcessIdle); diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp index ea17861cb5..0c859e7996 100644 --- a/Code/Sandbox/Editor/CryEdit.cpp +++ b/Code/Sandbox/Editor/CryEdit.cpp @@ -549,7 +549,7 @@ public: QCommandLineParser parser; parser.addHelpOption(); parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); - parser.setApplicationDescription(QObject::tr("Open 3D Engine")); + parser.setApplicationDescription(QObject::tr("O3DE Editor")); // nsDocumentRevisionDebugMode is an argument that the macOS system passed into an App bundle that is being debugged. // Need to include it here so that Qt argument parser does not error out. bool nsDocumentRevisionsDebugMode = false; diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp index b4cf317c26..404b2a0a1c 100644 --- a/Code/Sandbox/Editor/MainWindow.cpp +++ b/Code/Sandbox/Editor/MainWindow.cpp @@ -1032,11 +1032,11 @@ void MainWindow::InitActions() am->AddAction(ID_DOCUMENTATION_AWSSUPPORT, tr("AWS Support")) .SetReserved(); - am->AddAction(ID_APP_ABOUT, tr("&About Open 3D Engine")) + am->AddAction(ID_APP_ABOUT, tr("&About O3DE")) .SetStatusTip(tr("Display program information, version number and copyright")) .SetReserved(); am->AddAction(ID_APP_SHOW_WELCOME, tr("&Welcome")) - .SetStatusTip(tr("Show the Welcome to Open 3D Engine dialog box")) + .SetStatusTip(tr("Show the Welcome to O3DE dialog box")) .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateShowWelcomeScreen); // Editors Toolbar actions diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc b/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc index 715fc2952c..ebb41f1192 100644 Binary files a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc and b/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc differ diff --git a/Code/Tools/AssetBundler/source/utils/utils.cpp b/Code/Tools/AssetBundler/source/utils/utils.cpp index de8b7af539..f137716283 100644 --- a/Code/Tools/AssetBundler/source/utils/utils.cpp +++ b/Code/Tools/AssetBundler/source/utils/utils.cpp @@ -463,7 +463,7 @@ namespace AssetBundler return AZ::Failure(AZStd::string::format( "Unable to locate the Project Cache path from Settings Registry at key %s." - " Please run the Open 3D Engine Asset Processor to generate a Cache and build assets.", + " Please run the O3DE Asset Processor to generate a Cache and build assets.", AZ::SettingsRegistryMergeUtils::FilePathKey_CacheProjectRootFolder)); } @@ -473,7 +473,7 @@ namespace AssetBundler if (assetCatalogFilePath.empty()) { return AZ::Failure(AZStd::string::format( - "Unable to retrieve cache platform path from Settings Registry at key: %s. Please run the Open 3D Engine Asset Processor to generate platform-specific cache folders and build assets.", + "Unable to retrieve cache platform path from Settings Registry at key: %s. Please run the O3DE Asset Processor to generate platform-specific cache folders and build assets.", AZ::SettingsRegistryMergeUtils::FilePathKey_CacheProjectRootFolder)); } diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp index cba4078f96..9648824627 100644 --- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp @@ -644,7 +644,7 @@ QString ApplicationManager::GetOrganizationName() const QString ApplicationManager::GetApplicationName() const { - return "Asset Processor"; + return "O3DE Asset Processor"; } bool ApplicationManager::PostActivate() diff --git a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp index 98a56ccdd1..8faa0e4d6e 100644 --- a/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp @@ -270,7 +270,7 @@ bool GUIApplicationManager::Run() m_trayIcon = new QSystemTrayIcon(m_mainWindow); m_trayIcon->setContextMenu(trayIconMenu); - m_trayIcon->setToolTip(QObject::tr("Asset Processor")); + m_trayIcon->setToolTip(QObject::tr("O3DE Asset Processor")); m_trayIcon->setIcon(QIcon(":/o3de_assetprocessor.png")); m_trayIcon->show(); QObject::connect(m_trayIcon, &QSystemTrayIcon::activated, m_mainWindow, [&, wrapper](QSystemTrayIcon::ActivationReason reason) @@ -293,8 +293,8 @@ bool GUIApplicationManager::Run() if (startHidden) { m_trayIcon->showMessage( - QCoreApplication::translate("Tray Icon", "Open 3D Engine Asset Processor has started"), - QCoreApplication::translate("Tray Icon", "The Open 3D Engine Asset Processor monitors raw project assets and converts those assets into runtime-ready data."), + QCoreApplication::translate("Tray Icon", "O3DE Asset Processor has started"), + QCoreApplication::translate("Tray Icon", "The O3DE Asset Processor monitors raw project assets and converts those assets into runtime-ready data."), QSystemTrayIcon::Information, 3000); } } @@ -814,7 +814,7 @@ void GUIApplicationManager::ShowTrayIconErrorMessage(QString msg) { m_timeWhenLastWarningWasShown = currentTime; m_trayIcon->showMessage( - QCoreApplication::translate("Tray Icon", "Open 3D Engine Asset Processor"), + QCoreApplication::translate("Tray Icon", "O3DE Asset Processor"), QCoreApplication::translate("Tray Icon", msg.toUtf8().data()), QSystemTrayIcon::Critical, 3000); } @@ -826,7 +826,7 @@ void GUIApplicationManager::ShowTrayIconMessage(QString msg) if (m_trayIcon && m_mainWindow && !m_mainWindow->isVisible()) { m_trayIcon->showMessage( - QCoreApplication::translate("Tray Icon", "Open 3D Engine Asset Processor"), + QCoreApplication::translate("Tray Icon", "O3DE Asset Processor"), QCoreApplication::translate("Tray Icon", msg.toUtf8().data()), QSystemTrayIcon::Information, 3000); } diff --git a/Code/Tools/CrashHandler/Shared/CrashHandler.h b/Code/Tools/CrashHandler/Shared/CrashHandler.h index 6df110b6e2..1d490623c8 100644 --- a/Code/Tools/CrashHandler/Shared/CrashHandler.h +++ b/Code/Tools/CrashHandler/Shared/CrashHandler.h @@ -16,7 +16,7 @@ namespace CrashHandler { static const char* defaultCrashFolder = "CrashDB/"; - static const char* O3DEProductName = "Open 3D Engine"; + static const char* O3DEProductName = "O3DE"; using CrashHandlerAnnotations = std::map; using CrashHandlerArguments = std::vector; diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp index 47b3f47ab1..05634103ae 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp @@ -23,9 +23,9 @@ int main(int argc, char** argv) { - QApplication::setOrganizationName("Amazon"); - QApplication::setOrganizationDomain("amazon.com"); - QApplication::setApplicationName("ShaderManagementConsole"); + QApplication::setOrganizationName("O3DE"); + QApplication::setOrganizationDomain("o3de.com"); + QApplication::setApplicationName("O3DE Shader Management Console"); AzQtComponents::PrepareQtPaths(); diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp index f01fb5e754..749bbf3af3 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp @@ -155,7 +155,7 @@ namespace ImGui ImGui::SetCursorPosX(40.f); // Main Open 3D Engine menu - if (ImGui::BeginMenu("Open 3D Engine")) + if (ImGui::BeginMenu("O3DE")) { // Asset Explorer if (ImGui::MenuItem("Asset Explorer")) diff --git a/Gems/LyShine/Code/Editor/EditorCommon.h b/Gems/LyShine/Code/Editor/EditorCommon.h index f8223e4a37..c25be71964 100644 --- a/Gems/LyShine/Code/Editor/EditorCommon.h +++ b/Gems/LyShine/Code/Editor/EditorCommon.h @@ -161,7 +161,7 @@ enum class FusibleCommand // IMPORTANT: This is NOT the permanent location for these values. #define AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME "Amazon" -#define AZ_QCOREAPPLICATION_SETTINGS_APPLICATION_NAME "Open 3D Engine" +#define AZ_QCOREAPPLICATION_SETTINGS_APPLICATION_NAME "O3DE" // See: http://en.wikipedia.org/wiki/Internet_media_type#Prefix_x #define UICANVASEDITOR_MIMETYPE "application/x-amazon-o3de-uicanvaseditor" diff --git a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py index 5f92b42b7a..068aa3dbbd 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py @@ -29,7 +29,7 @@ from ly_test_tools.o3de.ap_log_parser import APLogParser logger = logging.getLogger(__name__) # Asset Processor fast scan system setting key/subkey -AP_FASTSCAN_KEY = r"Software\Amazon\Asset Processor\Options" +AP_FASTSCAN_KEY = r"Software\Amazon\O3DE Asset Processor\Options" AP_FASTSCAN_SUBKEY = r"EnableZeroAnalysis"