juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-25 01:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124 from Snapmaker/dev_bug_fixed_2.3.0_alves

Browse Source 
Dev bug fixed translation not correct bug
This commit is contained in:
Alves
2026-01-19 17:54:09 +08:00
committed by GitHub
parent d3b58c788d fdf03a306e
commit bbc55336de
4 changed files with 1328 additions and 3481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po
+1320 -3473
View File
File diff suppressed because it is too large Load Diff
src/slic3r/GUI/Plater.cpp
+2 -2
View File
@@ -4948,8 +4948,8 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
if (is_snapmaker_u1) {
if (q->get_notification_manager()) {
std::string warning_text = _u8L("Warning: Printing by object with caution. This function may cause the print head to collide with printed parts during switching.");
q->get_notification_manager()->push_plater_error_notification(warning_text);
wxString warning_text = _L("Printing by object with caution. This function may cause the print head to collide with printed parts during switching.");
q->get_notification_manager()->push_plater_error_notification(warning_text.ToStdString());
}
}
}
src/slic3r/GUI/Tab.cpp
+4 -4
View File
@@ -1567,16 +1567,16 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
if (is_snapmaker_u1) {
// Show red warning notification
if (wxGetApp().plater() && wxGetApp().plater()->get_notification_manager()) {
std::string warning_text = _u8L("Warning: Printing by object with caution. This function may cause the print head to collide with printed parts during switching.");
wxGetApp().plater()->get_notification_manager()->push_plater_error_notification(warning_text);
wxString warning_text = _L("Printing by object with caution. This function may cause the print head to collide with printed parts during switching.");
wxGetApp().plater()->get_notification_manager()->push_plater_error_notification(warning_text.ToStdString());
}
}
}
} else {
// Clear warning when switching away from ByObject
if (wxGetApp().plater() && wxGetApp().plater()->get_notification_manager()) {
std::string warning_text = _u8L("Warning: Printing by object with caution. This function may cause the print head to collide with printed parts during switching.");
wxGetApp().plater()->get_notification_manager()->close_plater_error_notification(warning_text);
wxString warning_text = _L("Printing by object with caution. This function may cause the print head to collide with printed parts during switching.");
wxGetApp().plater()->get_notification_manager()->close_plater_error_notification(warning_text.ToStdString());
}
}
}
src/slic3r/GUI/UpdateDialogs.cpp
+2 -2
View File
@@ -154,7 +154,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_
m_butto_ok->SetFont(Label::Body_12);
m_butto_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_butto_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
m_butto_ok->SetCursor(wxCURSOR_HAND);
auto m_button_cancel = new Button(this, _L("Cancel"));
m_button_cancel->SetBackgroundColor(*wxWHITE);
@@ -162,7 +162,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector<Update> &updates, bool force_
m_button_cancel->SetFont(Label::Body_12);
m_button_cancel->SetSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_cancel->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
m_button_cancel->SetCursor(wxCURSOR_HAND);
sizer_button->Add(m_butto_ok, 0, wxALL, 5);
sizer_button->Add(m_button_cancel, 0, wxALL, 5);