mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: adjust text of sync extruder dialog 

Jira: STUDIO-10814
Change-Id: I3704b5d10c8050d35e212951d672bd9f9f4adcef
This commit is contained in:
chunmao.guo 2025-03-13 10:56:54 +08:00 committed by lane.wei
parent 8763497773
commit 1abcd64e72
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/Tab.cpp
View File

@ -6241,9 +6241,11 @@ void Tab::sync_excluder()
md.ShowModal(); md.ShowModal();
return; return;
} }
wxString header = active_index == 1 ? _L("Copy the following parameters to the left nozzle:") :
_L("Copy the following parameters to the right nozzle:"); wxString title = active_index == 0 ? _L("Modify paramters of right nozzle") : _L("Modify paramters of left nozzle");
UnsavedChangesDialog dlg(_L("Copy paramters"), header, &config_origin, from_index, dest_index); wxString header = active_index == 0 ? _L("Do you want to modify the following parameters of the right nozzle to that of the left nozzle?") :
_L("Do you want to modify the following parameters of the left nozzle to that of the right nozzle?");
UnsavedChangesDialog dlg(title, header, &config_origin, from_index, dest_index, active_index == 0);
dlg.ShowModal(); dlg.ShowModal();
if (dlg.transfer_changes()) { if (dlg.transfer_changes()) {
m_config->apply(config_to_apply); m_config->apply(config_to_apply);

28
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@ -811,9 +811,10 @@ struct SyncExtruderParams
DynamicConfig *config; DynamicConfig *config;
int from; int from;
int to; int to;
bool left_to_right;
}; };
UnsavedChangesDialog::UnsavedChangesDialog(const wxString &caption, const wxString &header, DynamicConfig *config, int from, int to) UnsavedChangesDialog::UnsavedChangesDialog(const wxString &caption, const wxString &header, DynamicConfig *config, int from, int to, bool left_to_right)
: DPIDialog(static_cast<wxWindow *>(wxGetApp().mainframe), : DPIDialog(static_cast<wxWindow *>(wxGetApp().mainframe),
wxID_ANY, wxID_ANY,
caption, caption,
@ -822,7 +823,7 @@ UnsavedChangesDialog::UnsavedChangesDialog(const wxString &caption, const wxStri
wxCAPTION | wxCLOSE_BOX) wxCAPTION | wxCLOSE_BOX)
, m_buttons(ActionButtons::SAVE | ActionButtons::DONT_SAVE) , m_buttons(ActionButtons::SAVE | ActionButtons::DONT_SAVE)
{ {
SyncExtruderParams params { config, from, to }; SyncExtruderParams params { config, from, to, left_to_right };
build(Preset::TYPE_PRINT, reinterpret_cast<PresetCollection*>(&params), "SyncExtruderParams", header); build(Preset::TYPE_PRINT, reinterpret_cast<PresetCollection*>(&params), "SyncExtruderParams", header);
this->CenterOnScreen(); this->CenterOnScreen();
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
@ -932,7 +933,9 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
wxBoxSizer *top_title_oldv = new wxBoxSizer(wxVERTICAL); wxBoxSizer *top_title_oldv = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *top_title_oldv_h = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *top_title_oldv_h = new wxBoxSizer(wxHORIZONTAL);
static_oldv_title = new wxStaticText(m_panel_oldv, wxID_ANY, params ? _L("Current Value") : _L("Preset(Old)"), wxDefaultPosition, wxDefaultSize, 0); wxString modified = _L("(Modified)");
static_oldv_title = new wxStaticText(m_panel_oldv, wxID_ANY, params ? _L("Left nozzle") + (params->left_to_right ? "" : modified) : _L("Preset(Old)"), wxDefaultPosition,
wxDefaultSize, 0);
static_oldv_title->SetFont(::Label::Body_13); static_oldv_title->SetFont(::Label::Body_13);
static_oldv_title->Wrap(-1); static_oldv_title->Wrap(-1);
static_oldv_title->SetForegroundColour(*wxWHITE); static_oldv_title->SetForegroundColour(*wxWHITE);
@ -951,7 +954,8 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
wxBoxSizer *top_title_newv = new wxBoxSizer(wxVERTICAL); wxBoxSizer *top_title_newv = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *top_title_newv_h = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *top_title_newv_h = new wxBoxSizer(wxHORIZONTAL);
static_newv_title = new wxStaticText(m_panel_newv, wxID_ANY, params ? _L("New Value") : _L("Modified Value(New)"), wxDefaultPosition, wxDefaultSize, 0); static_newv_title = new wxStaticText(m_panel_newv, wxID_ANY, params ? _L("Right nozzle") + (!params->left_to_right ? "" : modified) : _L("Modified Value(New)"),
wxDefaultPosition, wxDefaultSize, 0);
static_newv_title->SetFont(::Label::Body_13); static_newv_title->SetFont(::Label::Body_13);
static_newv_title->Wrap(-1); static_newv_title->Wrap(-1);
static_newv_title->SetForegroundColour(*wxWHITE); static_newv_title->SetForegroundColour(*wxWHITE);
@ -1021,8 +1025,7 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
(*btn)->SetTextColor(wxColour(107, 107, 107)); (*btn)->SetTextColor(wxColour(107, 107, 107));
} }
//(*btn)->SetMinSize(UNSAVE_CHANGE_DIALOG_BUTTON_SIZE); (*btn)->SetMinSize(UNSAVE_CHANGE_DIALOG_BUTTON_SIZE);
(*btn)->SetMinSize(wxSize(-1,-1));
(*btn)->SetCornerRadius(FromDIP(12)); (*btn)->SetCornerRadius(FromDIP(12));
(*btn)->Bind(wxEVT_BUTTON, [this, close_act, dependent_presets](wxEvent &) { (*btn)->Bind(wxEVT_BUTTON, [this, close_act, dependent_presets](wxEvent &) {
@ -1042,11 +1045,11 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
bool is_copy = new_selected_preset == "SyncExtruderParams"; bool is_copy = new_selected_preset == "SyncExtruderParams";
// "Save" button // "Save" button
if (ActionButtons::SAVE & m_buttons) add_btn(&m_save_btn, m_save_btn_id, is_copy ? Action::Transfer : Action::Save, is_copy ? _L("Copy") : _L("Save"), true); if (ActionButtons::SAVE & m_buttons) add_btn(&m_save_btn, m_save_btn_id, is_copy ? Action::Transfer : Action::Save, is_copy ? _L("Yes") : _L("Save"), true);
{ // "Don't save" / "Discard" button { // "Don't save" / "Discard" button
std::string btn_icon = (ActionButtons::DONT_SAVE & m_buttons) ? "" : (dependent_presets || (ActionButtons::KEEP & m_buttons)) ? "blank_16" : "exit"; std::string btn_icon = (ActionButtons::DONT_SAVE & m_buttons) ? "" : (dependent_presets || (ActionButtons::KEEP & m_buttons)) ? "blank_16" : "exit";
wxString btn_label = (ActionButtons::TRANSFER & m_buttons) ? _L("Discard Modified Value") : is_copy ? _L("Cancel") : _L("Don't save"); wxString btn_label = (ActionButtons::TRANSFER & m_buttons) ? _L("Discard Modified Value") : is_copy ? _L("No") : _L("Don't save");
add_btn(&m_discard_btn, m_continue_btn_id, Action::Discard, btn_label, false); add_btn(&m_discard_btn, m_continue_btn_id, Action::Discard, btn_label, false);
} }
@ -1084,13 +1087,16 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_
Centre(wxBOTH); Centre(wxBOTH);
if (params) { if (params) {
if (params->left_to_right)
update_tree(type, params->config, params->from, params->to); update_tree(type, params->config, params->from, params->to);
update_list(); else
update_tree(type, params->config, params->to, params->from);
m_action_line->SetLabel(header); m_action_line->SetLabel(header);
m_action_line->Wrap(UNSAVE_CHANGE_DIALOG_SCROLL_WINDOW_SIZE.x);
update_list();
} else { } else {
update(type, dependent_presets, new_selected_preset, header); update(type, dependent_presets, new_selected_preset, header);
} }
//SetSizer(topSizer); //SetSizer(topSizer);
//topSizer->SetSizeHints(this); //topSizer->SetSizeHints(this);
@ -1709,7 +1715,7 @@ void UnsavedChangesDialog::update_tree(Preset::Type type, DynamicConfig * config
auto opt = dynamic_cast<ConfigOptionVectorBase*>(config->option(opt_key)); auto opt = dynamic_cast<ConfigOptionVectorBase*>(config->option(opt_key));
std::string value_from = opt->vserialize()[from]; std::string value_from = opt->vserialize()[from];
std::string value_to = opt->vserialize()[to]; std::string value_to = opt->vserialize()[to];
PresetItem pi = {type, opt_key, category, option.group_local, option.label_local, into_u8(value_to), into_u8(value_from)}; PresetItem pi = {type, opt_key, category, option.group_local, option.label_local, into_u8(value_from), into_u8(value_to)};
m_presetitems.push_back(pi); m_presetitems.push_back(pi);
} }
} }

2
src/slic3r/GUI/UnsavedChangesDialog.hpp
View File

@ -333,7 +333,7 @@ public:
UnsavedChangesDialog(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, bool no_transfer = false); UnsavedChangesDialog(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, bool no_transfer = false);
// show unsaved changes for all another cases // show unsaved changes for all another cases
UnsavedChangesDialog(const wxString& caption, const wxString& header, const std::string& app_config_key, int act_buttons); UnsavedChangesDialog(const wxString& caption, const wxString& header, const std::string& app_config_key, int act_buttons);
UnsavedChangesDialog(const wxString &caption, const wxString &header, DynamicConfig *config, int from, int to); UnsavedChangesDialog(const wxString &caption, const wxString &header, DynamicConfig *config, int from, int to, bool left_to_right);
~UnsavedChangesDialog(){}; ~UnsavedChangesDialog(){};
int ShowModal(); int ShowModal();