birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated branding for application names (#1617)

Browse Source
This commit is contained in:
Terry Michaels
2021-06-28 11:35:13 -05:00
committed by GitHub
parent 5656736db4
commit 7a2a2dc0d7
15 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetBundler/source/utils/utils.cpp
+2 -2
View File
@@ -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));
}
Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
+1 -1
View File
@@ -644,7 +644,7 @@ QString ApplicationManager::GetOrganizationName() const
QString ApplicationManager::GetApplicationName() const
{
return "Asset Processor";
return "O3DE Asset Processor";
}
bool ApplicationManager::PostActivate()
Code/Tools/AssetProcessor/native/utilities/GUIApplicationManager.cpp
+5 -5
View File
@@ -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);
}
Code/Tools/CrashHandler/Shared/CrashHandler.h
+1 -1
View File
@@ -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<std::string, std::string>;
using CrashHandlerArguments = std::vector<std::string>;