From f2790e45ad24572c9697a97b0b798d73161c8d55 Mon Sep 17 00:00:00 2001 From: SweetId <2630750+SweetId@users.noreply.github.com> Date: Sat, 21 Oct 2023 10:17:29 -0400 Subject: [PATCH] Use new ctor to avoid verbose LocalizedText creation --- src/NazaraEditor/Editor/UI/AssetsWindow.cpp | 4 ++-- src/NazaraEditor/Editor/UI/InspectorWindow.cpp | 2 +- src/NazaraEditor/Editor/UI/LevelWindow.cpp | 2 +- src/NazaraEditor/Editor/UI/MainWindow.cpp | 2 +- src/NazaraEditor/Editor/UI/OutputWindow.cpp | 2 +- src/NazaraEditor/Editor/main.cpp | 16 ++++++++-------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/NazaraEditor/Editor/UI/AssetsWindow.cpp b/src/NazaraEditor/Editor/UI/AssetsWindow.cpp index 7bb2382..5b83fd5 100644 --- a/src/NazaraEditor/Editor/UI/AssetsWindow.cpp +++ b/src/NazaraEditor/Editor/UI/AssetsWindow.cpp @@ -3,7 +3,7 @@ namespace NzEditor { AssetsWindow::AssetsWindow(Nz::EditorBaseApplication* app) - : Nz::EditorWindow(app, Nz::LocalizedText("LOC_EDITOR_WINDOW_ASSET_BROWSER_TITLE"), { "Assets" }) + : Nz::EditorWindow(app, "LOC_EDITOR_WINDOW_ASSET_BROWSER_TITLE", { "Assets" }) { BuildMenuBar(); } @@ -15,6 +15,6 @@ namespace NzEditor void AssetsWindow::BuildMenuBar() { - AddMenuAction("Import", "Ctrl+I", [this]() { ImportAsset(); }); + AddMenuAction({ "LOC_EDITOR_MENU_IMPORT" }, "Ctrl+I", [this]() { ImportAsset(); }); } } \ No newline at end of file diff --git a/src/NazaraEditor/Editor/UI/InspectorWindow.cpp b/src/NazaraEditor/Editor/UI/InspectorWindow.cpp index 87a03cc..80885aa 100644 --- a/src/NazaraEditor/Editor/UI/InspectorWindow.cpp +++ b/src/NazaraEditor/Editor/UI/InspectorWindow.cpp @@ -5,7 +5,7 @@ namespace NzEditor { InspectorWindow::InspectorWindow(Nz::EditorBaseApplication* app) - : Nz::EditorWindow(app, Nz::LocalizedText("LOC_EDITOR_WINDOW_INSPECTOR_TITLE")) + : Nz::EditorWindow(app, "LOC_EDITOR_WINDOW_INSPECTOR_TITLE") { app->OnEntitySelected.Connect(this, &InspectorWindow::OnEntitySelected); } diff --git a/src/NazaraEditor/Editor/UI/LevelWindow.cpp b/src/NazaraEditor/Editor/UI/LevelWindow.cpp index 88f5952..37dbb9d 100644 --- a/src/NazaraEditor/Editor/UI/LevelWindow.cpp +++ b/src/NazaraEditor/Editor/UI/LevelWindow.cpp @@ -6,7 +6,7 @@ namespace NzEditor { LevelWindow::LevelWindow(Nz::EditorBaseApplication* app) - : Nz::EditorWindow(app, Nz::LocalizedText("LOC_EDITOR_WINDOW_LEVEL_TITLE")) + : Nz::EditorWindow(app, "LOC_EDITOR_WINDOW_LEVEL_TITLE") , m_currentLevel(app->GetLevel()) , m_dirty(true) { diff --git a/src/NazaraEditor/Editor/UI/MainWindow.cpp b/src/NazaraEditor/Editor/UI/MainWindow.cpp index 2dfb85a..df6a19b 100644 --- a/src/NazaraEditor/Editor/UI/MainWindow.cpp +++ b/src/NazaraEditor/Editor/UI/MainWindow.cpp @@ -3,7 +3,7 @@ namespace NzEditor { MainWindow::MainWindow(Nz::EditorBaseApplication* app) - : Nz::EditorMainWindow(app, Nz::LocalizedText("LOC_EDITOR_WINDOW_MAIN_TITLE"), { "General", "Plugins" }) + : Nz::EditorMainWindow(app, "LOC_EDITOR_WINDOW_MAIN_TITLE", { "General", "Tools", "Plugins" }) { } } \ No newline at end of file diff --git a/src/NazaraEditor/Editor/UI/OutputWindow.cpp b/src/NazaraEditor/Editor/UI/OutputWindow.cpp index 6585ce6..8f587f7 100644 --- a/src/NazaraEditor/Editor/UI/OutputWindow.cpp +++ b/src/NazaraEditor/Editor/UI/OutputWindow.cpp @@ -6,7 +6,7 @@ namespace NzEditor { OutputWindow::OutputWindow(Nz::EditorBaseApplication* app) - : Nz::EditorWindow(app, Nz::LocalizedText("LOC_EDITOR_WINDOW_OUTPUT_TITLE"), { "Output" }) + : Nz::EditorWindow(app, "LOC_EDITOR_WINDOW_OUTPUT_TITLE", { "Output" }) , m_bScrollToBottom(true) , m_bScrollToTop(false) { diff --git a/src/NazaraEditor/Editor/main.cpp b/src/NazaraEditor/Editor/main.cpp index e7c99b2..e186f14 100644 --- a/src/NazaraEditor/Editor/main.cpp +++ b/src/NazaraEditor/Editor/main.cpp @@ -52,25 +52,25 @@ int WinMain(int argc, char* argv[]) texParams.loadFormat = Nz::PixelFormat::RGBA8_SRGB; app.RegisterAction({ - .description = Nz::LocalizedText("LOC_EDITOR_ACTION_LEVEL_NEW_DESC"), - .path = Nz::LocalizedText("LOC_EDITOR_ACTION_LEVEL_NEW_PATH"), + .description = "LOC_EDITOR_ACTION_LEVEL_NEW_DESC", + .path = { "LOC_EDITOR_MENU_FILE", "LOC_EDITOR_MENU_LEVEL", "LOC_EDITOR_MENU_NEW" }, .category = "General", .shortcut = Nz::Shortcut::Create(Nz::Keyboard::VKey::N, true, true), .icon = Nz::Texture::LoadFromFile(app.GetResourceFolder() / "file_new.png", texParams) }); app.RegisterAction({ - .description = Nz::LocalizedText("LOC_EDITOR_ACTION_LOG_CLEAR_DESC"), - .path = Nz::LocalizedText("LOC_EDITOR_ACTION_LOG_CLEAR_PATH"), + .description = "LOC_EDITOR_ACTION_LOG_CLEAR_DESC", + .path = { "LOC_EDITOR_MENU_LOG_CLEAR" }, .category = "Output", }); app.RegisterAction({ - .description = Nz::LocalizedText("LOC_EDITOR_ACTION_LOG_COPY_DESC"), - .path = Nz::LocalizedText("LOC_EDITOR_ACTION_LOG_COPY_PATH"), + .description = "LOC_EDITOR_ACTION_LOG_COPY_DESC", + .path = { "LOC_EDITOR_MENU_LOG_COPY" }, .category = "Output", }); app.RegisterAction({ - .description = Nz::LocalizedText("LOC_EDITOR_ACTION_QUIT_DESC"), - .path = Nz::LocalizedText("LOC_EDITOR_ACTION_QUIT_PATH"), + .description = "LOC_EDITOR_ACTION_QUIT_DESC", + .path = { "LOC_EDITOR_MENU_FILE", "LOC_EDITOR_MENU_QUIT" }, .category = "General", .shortcut = Nz::Shortcut::Create(Nz::Keyboard::VKey::F4, false, false, true), });