3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 16:27:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move compatible_printers from developer mode to Advance mode

Browse source
This commit is contained in:
SoftFever 2025-01-15 22:54:56 +08:00
parent 727a3887c5
commit f8698d89a4
2 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libslic3r/PrintConfig.cpp
View file

@ -1261,38 +1261,38 @@ void PrintConfigDef::init_fff_params()
def = this->add("compatible_printers", coStrings); def = this->add("compatible_printers", coStrings);
def->label = L("Compatible machine"); def->label = L("Compatible machine");
def->mode = comDevelop; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings()); def->set_default_value(new ConfigOptionStrings());
def->cli = ConfigOptionDef::nocli; def->cli = ConfigOptionDef::nocli;
//BBS. //BBS.
def = this->add("upward_compatible_machine", coStrings); def = this->add("upward_compatible_machine", coStrings);
def->label = L("upward compatible machine"); def->label = L("upward compatible machine");
def->mode = comDevelop; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings()); def->set_default_value(new ConfigOptionStrings());
def->cli = ConfigOptionDef::nocli; def->cli = ConfigOptionDef::nocli;
def = this->add("compatible_printers_condition", coString); def = this->add("compatible_printers_condition", coString);
def->label = L("Compatible machine condition"); def->label = L("Compatible machine condition");
//def->tooltip = L("A boolean expression using the configuration values of an active printer profile. " def->tooltip = L("A boolean expression using the configuration values of an active printer profile. "
// "If this expression evaluates to true, this profile is considered compatible " "If this expression evaluates to true, this profile is considered compatible "
// "with the active printer profile."); "with the active printer profile.");
def->mode = comDevelop; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionString()); def->set_default_value(new ConfigOptionString());
def->cli = ConfigOptionDef::nocli; def->cli = ConfigOptionDef::nocli;
def = this->add("compatible_prints", coStrings); def = this->add("compatible_prints", coStrings);
def->label = L("Compatible process profiles"); def->label = L("Compatible process profiles");
def->mode = comDevelop; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionStrings()); def->set_default_value(new ConfigOptionStrings());
def->cli = ConfigOptionDef::nocli; def->cli = ConfigOptionDef::nocli;
def = this->add("compatible_prints_condition", coString); def = this->add("compatible_prints_condition", coString);
def->label = L("Compatible process profiles condition"); def->label = L("Compatible process profiles condition");
//def->tooltip = L("A boolean expression using the configuration values of an active print profile. " def->tooltip = L("A boolean expression using the configuration values of an active print profile. "
// "If this expression evaluates to true, this profile is considered compatible " "If this expression evaluates to true, this profile is considered compatible "
// "with the active print profile."); "with the active print profile.");
def->mode = comDevelop; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionString()); def->set_default_value(new ConfigOptionString());
def->cli = ConfigOptionDef::nocli; def->cli = ConfigOptionDef::nocli;

19
src/slic3r/GUI/Tab.cpp
View file

@ -2381,7 +2381,6 @@ page = add_options_page(L("Others"), "custom-gcode_other"); // ORCA: icon only v
option.opt.height = 25;//250; option.opt.height = 25;//250;
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
#if 1
page = add_options_page(L("Dependencies"), "custom-gcode_advanced"); page = add_options_page(L("Dependencies"), "custom-gcode_advanced");
optgroup = page->new_optgroup(L("Profile dependencies")); optgroup = page->new_optgroup(L("Profile dependencies"));
@ -2394,7 +2393,6 @@ page = add_options_page(L("Others"), "custom-gcode_other"); // ORCA: icon only v
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
build_preset_description_line(optgroup.get()); build_preset_description_line(optgroup.get());
#endif
} }
// Reload current config (aka presets->edited_preset->config) into the UI fields. // Reload current config (aka presets->edited_preset->config) into the UI fields.
@ -3527,14 +3525,6 @@ void TabFilament::build()
optgroup->append_single_option_line("filament_multitool_ramming_volume"); optgroup->append_single_option_line("filament_multitool_ramming_volume");
optgroup->append_single_option_line("filament_multitool_ramming_flow"); optgroup->append_single_option_line("filament_multitool_ramming_flow");
page = add_options_page(L("Notes"), "custom-gcode_note"); // ORCA: icon only visible on placeholders
optgroup = page->new_optgroup(L("Notes"),"note", 0);
optgroup->label_width = 0;
option = optgroup->get_option("filament_notes");
option.opt.full_width = true;
option.opt.height = notes_field_height;// 250;
optgroup->append_single_option_line(option);
#if 1
page = add_options_page(L("Dependencies"), "advanced"); page = add_options_page(L("Dependencies"), "advanced");
optgroup = page->new_optgroup(L("Profile dependencies")); optgroup = page->new_optgroup(L("Profile dependencies"));
create_line_with_widget(optgroup.get(), "compatible_printers", "", [this](wxWindow* parent) { create_line_with_widget(optgroup.get(), "compatible_printers", "", [this](wxWindow* parent) {
@ -3553,8 +3543,15 @@ void TabFilament::build()
option.opt.full_width = true; option.opt.full_width = true;
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
page = add_options_page(L("Notes"), "custom-gcode_note"); // ORCA: icon only visible on placeholders
optgroup = page->new_optgroup(L("Notes"),"note", 0);
optgroup->label_width = 0;
option = optgroup->get_option("filament_notes");
option.opt.full_width = true;
option.opt.height = notes_field_height;// 250;
optgroup->append_single_option_line(option);
//build_preset_description_line(optgroup.get()); //build_preset_description_line(optgroup.get());
#endif
} }
// Reload current config (aka presets->edited_preset->config) into the UI fields. // Reload current config (aka presets->edited_preset->config) into the UI fields.