From 6c2725a78ed9fe8ef4d8c0482d5310c721ce8ac1 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Mon, 21 Apr 2025 20:29:30 +0800 Subject: [PATCH] ENH:modify camera text jira: none Change-Id: I6f9f111260d97427e70d29339f84423b2bcbd067 --- src/slic3r/GUI/MainFrame.cpp | 8 ++++---- src/slic3r/GUI/Plater.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 784e2073b..fa8f69411 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2429,11 +2429,11 @@ static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame, append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric", "Camera"), "Camera") + "\t" + ctrl + "7", _L("Isometric View"), [mainFrame](wxCommandEvent &) { mainFrame->select_view("iso"); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); #if !BBL_RELEASE_TO_PUBLIC - append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric 1", "Camera"), "Camera"), _L("Isometric 1 View"), + append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric", "Camera"), "Camera") + " 1", _L("Isometric View") + " 1", [mainFrame](wxCommandEvent &) { mainFrame->select_view("iso_1"); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); - append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric 2", "Camera"), "Camera"), _L("Isometric 2 View"), - [mainFrame](wxCommandEvent &) { mainFrame->select_view("iso_2"); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); - append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric 3", "Camera"), "Camera"), _L("Isometric 3 View"), + append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric", "Camera"), "Camera") + " 2", _L("Isometric View") + " 2", + [mainFrame](wxCommandEvent &) { mainFrame->select_view("iso_2"); },"", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); + append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric", "Camera"), "Camera") + " 3", _L("Isometric View") + " 3", [mainFrame](wxCommandEvent &) { mainFrame->select_view("iso_3"); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); #endif } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a1ee95e42..afd39e784 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -17200,14 +17200,14 @@ SuppressBackgroundProcessingUpdate::~SuppressBackgroundProcessingUpdate() } wxString get_view_type_string(Camera::ViewAngleType type) { switch (type) { - case Slic3r::GUI::Camera::ViewAngleType::Iso: return _L("isometric"); - case Slic3r::GUI::Camera::ViewAngleType::Top_Front: return _L("top_front"); - case Slic3r::GUI::Camera::ViewAngleType::Left: return _L("left"); - case Slic3r::GUI::Camera::ViewAngleType::Right: return _L("right"); - case Slic3r::GUI::Camera::ViewAngleType::Top: return _L("top"); - case Slic3r::GUI::Camera::ViewAngleType::Bottom: return _L("bottom"); - case Slic3r::GUI::Camera::ViewAngleType::Front: return _L("front"); - case Slic3r::GUI::Camera::ViewAngleType::Rear: return _L("rear"); + case Slic3r::GUI::Camera::ViewAngleType::Iso: return _CTX(L_CONTEXT("Isometric", "Camera"), "Camera"); + case Slic3r::GUI::Camera::ViewAngleType::Top_Front: return _L("Top front"); + case Slic3r::GUI::Camera::ViewAngleType::Left: return _CTX(L_CONTEXT("Left", "Camera"), "Camera"); + case Slic3r::GUI::Camera::ViewAngleType::Right: return _CTX(L_CONTEXT("Right", "Camera"), "Camera"); + case Slic3r::GUI::Camera::ViewAngleType::Top: return _L("Top"); + case Slic3r::GUI::Camera::ViewAngleType::Bottom: return _L("Bottom"); + case Slic3r::GUI::Camera::ViewAngleType::Front: return _L("Front"); + case Slic3r::GUI::Camera::ViewAngleType::Rear: return _L("Rear"); default: return ""; } }