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/Framework/AzFramework/Platform/Windows/AzFramework/TargetManagement/TargetManagementComponent_Windows.cpp
+1 -1
View File
@@ -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);
Code/Framework/AzQtComponents/AzQtComponents/StyleGallery/main.cpp
+1 -1
View File
@@ -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);
Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
+2 -2
View File
@@ -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);
Code/Sandbox/Editor/Core/QtEditorApplication.cpp
+1 -1
View File
@@ -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);
Code/Sandbox/Editor/CryEdit.cpp
+1 -1
View File
@@ -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;
Code/Sandbox/Editor/MainWindow.cpp
+2 -2
View File
@@ -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
Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc
BIN
View File
Binary file not shown.
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>;
Gems/Atom/Tools/ShaderManagementConsole/Code/Source/main.cpp
+3 -3
View File
@@ -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();
Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp
+1 -1
View File
@@ -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"))
Gems/LyShine/Code/Editor/EditorCommon.h
+1 -1
View File
@@ -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"
Tools/LyTestTools/ly_test_tools/o3de/pipeline_utils.py
+1 -1
View File
@@ -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"