mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Merge remote-tracking branch 'origin/master' into ys_overrides
This commit is contained in:
commit
b8a549259c
17 changed files with 675 additions and 375 deletions
|
@ -198,7 +198,7 @@ void Tab::create_preset_tab()
|
|||
// There is used just additional sizer for m_mode_sizer with right alignment
|
||||
auto mode_sizer = new wxBoxSizer(wxVERTICAL);
|
||||
mode_sizer->Add(m_mode_sizer, 1, wxALIGN_RIGHT);
|
||||
m_hsizer->Add(mode_sizer, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, wxOSX ? 15 : 5);
|
||||
m_hsizer->Add(mode_sizer, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, wxOSX ? 15 : 10);
|
||||
|
||||
//Horizontal sizer to hold the tree and the selected page.
|
||||
m_hsizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
|
@ -914,14 +914,20 @@ void Tab::update_preset_description_line()
|
|||
{
|
||||
const Preset* parent = m_presets->get_selected_preset_parent();
|
||||
const Preset& preset = m_presets->get_edited_preset();
|
||||
|
||||
wxString description_line = preset.is_default ?
|
||||
_(L("It's a default preset.")) : preset.is_system ?
|
||||
_(L("It's a system preset.")) :
|
||||
wxString::Format(_(L("Current preset is inherited from %s")), (parent == nullptr ?
|
||||
_(L("default preset"))+"." :
|
||||
":\n\t" + parent->name));
|
||||
|
||||
|
||||
wxString description_line;
|
||||
|
||||
if (preset.is_default) {
|
||||
description_line = _(L("This is a default preset."));
|
||||
} else if (preset.is_system) {
|
||||
description_line = _(L("This is a system preset."));
|
||||
} else if (parent == nullptr) {
|
||||
description_line = _(L("Current preset is inherited from the default preset."));
|
||||
} else {
|
||||
description_line = wxString::Format(
|
||||
_(L("Current preset is inherited from:\n\t%s")), GUI::from_u8(parent->name));
|
||||
}
|
||||
|
||||
if (preset.is_default || preset.is_system)
|
||||
description_line += "\n\t" + _(L("It can't be deleted or modified.")) +
|
||||
"\n\t" + _(L("Any modifications should be saved as a new preset inherited from this one.")) +
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue