mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-16 03:07:55 -06:00
Added preset parent description line to Dependencies
This commit is contained in:
parent
d7e2305686
commit
44b711953f
2 changed files with 31 additions and 1 deletions
|
@ -849,6 +849,13 @@ void TabPrint::build()
|
||||||
option = optgroup->get_option("compatible_printers_condition");
|
option = optgroup->get_option("compatible_printers_condition");
|
||||||
option.opt.full_width = true;
|
option.opt.full_width = true;
|
||||||
optgroup->append_single_option_line(option);
|
optgroup->append_single_option_line(option);
|
||||||
|
|
||||||
|
line = Line{ "", "" };
|
||||||
|
line.full_width = 1;
|
||||||
|
line.widget = [this](wxWindow* parent) {
|
||||||
|
return description_line_widget(parent, &m_parent_preset_description_line);
|
||||||
|
};
|
||||||
|
optgroup->append_line(line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reload current config (aka presets->edited_preset->config) into the UI fields.
|
// Reload current config (aka presets->edited_preset->config) into the UI fields.
|
||||||
|
@ -1216,6 +1223,13 @@ void TabFilament::build()
|
||||||
option = optgroup->get_option("compatible_printers_condition");
|
option = optgroup->get_option("compatible_printers_condition");
|
||||||
option.opt.full_width = true;
|
option.opt.full_width = true;
|
||||||
optgroup->append_single_option_line(option);
|
optgroup->append_single_option_line(option);
|
||||||
|
|
||||||
|
line = Line{ "", "" };
|
||||||
|
line.full_width = 1;
|
||||||
|
line.widget = [this](wxWindow* parent) {
|
||||||
|
return description_line_widget(parent, &m_parent_preset_description_line);
|
||||||
|
};
|
||||||
|
optgroup->append_line(line);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reload current config (aka presets->edited_preset->config) into the UI fields.
|
// Reload current config (aka presets->edited_preset->config) into the UI fields.
|
||||||
|
@ -1504,6 +1518,15 @@ void TabPrinter::build()
|
||||||
option.opt.height = 250;
|
option.opt.height = 250;
|
||||||
optgroup->append_single_option_line(option);
|
optgroup->append_single_option_line(option);
|
||||||
|
|
||||||
|
page = add_options_page(_(L("Dependencies")), "wrench.png");
|
||||||
|
optgroup = page->new_optgroup(_(L("Profile dependencies")));
|
||||||
|
line = Line{ "", "" };
|
||||||
|
line.full_width = 1;
|
||||||
|
line.widget = [this](wxWindow* parent) {
|
||||||
|
return description_line_widget(parent, &m_parent_preset_description_line);
|
||||||
|
};
|
||||||
|
optgroup->append_line(line);
|
||||||
|
|
||||||
build_extruder_pages();
|
build_extruder_pages();
|
||||||
|
|
||||||
if (!m_no_controller)
|
if (!m_no_controller)
|
||||||
|
@ -1692,10 +1715,16 @@ void Tab::load_current_preset()
|
||||||
on_preset_loaded();
|
on_preset_loaded();
|
||||||
// Reload preset pages with the new configuration values.
|
// Reload preset pages with the new configuration values.
|
||||||
reload_config();
|
reload_config();
|
||||||
m_nonsys_btn_icon = m_presets->get_selected_preset_parent() == nullptr ?
|
const Preset* parent = m_presets->get_selected_preset_parent();
|
||||||
|
m_nonsys_btn_icon = parent == nullptr ?
|
||||||
"bullet_white.png" :
|
"bullet_white.png" :
|
||||||
wxMSW ? "sys_unlock.png" : "lock_open.png";
|
wxMSW ? "sys_unlock.png" : "lock_open.png";
|
||||||
|
|
||||||
|
wxString description_line = parent == nullptr ?
|
||||||
|
_(L("It's default preset")) :
|
||||||
|
_(L("Current preset is inherited from")) + ":\n" + parent->name;
|
||||||
|
m_parent_preset_description_line->SetText(description_line);
|
||||||
|
|
||||||
// use CallAfter because some field triggers schedule on_change calls using CallAfter,
|
// use CallAfter because some field triggers schedule on_change calls using CallAfter,
|
||||||
// and we don't want them to be called after this update_dirty() as they would mark the
|
// and we don't want them to be called after this update_dirty() as they would mark the
|
||||||
// preset dirty again
|
// preset dirty again
|
||||||
|
|
|
@ -121,6 +121,7 @@ public:
|
||||||
PresetCollection* m_presets;
|
PresetCollection* m_presets;
|
||||||
DynamicPrintConfig* m_config;
|
DynamicPrintConfig* m_config;
|
||||||
std::string m_nonsys_btn_icon;
|
std::string m_nonsys_btn_icon;
|
||||||
|
ogStaticText* m_parent_preset_description_line;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Tab() {}
|
Tab() {}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue