Custom GCode editor: Added wrapping for descriptions lines in dialog

+ Some fixes for tooltips and labels in *Configs
This commit is contained in:
YuSanka 2023-09-12 15:48:03 +02:00 committed by Lukas Matena
parent 7efdbecaf4
commit 83b8988524
2 changed files with 5 additions and 11 deletions

View File

@ -5223,27 +5223,21 @@ TimestampsConfigDef::TimestampsConfigDef()
def = this->add("year", coInt); def = this->add("year", coInt);
def->label = L("Year"); def->label = L("Year");
def->tooltip = L("");
def = this->add("month", coInt); def = this->add("month", coInt);
def->label = L("Month"); def->label = L("Month");
def->tooltip = L("");
def = this->add("day", coInt); def = this->add("day", coInt);
def->label = L("Day"); def->label = L("Day");
def->tooltip = L("");
def = this->add("hour", coInt); def = this->add("hour", coInt);
def->label = L("Hour"); def->label = L("Hour");
def->tooltip = L("");
def = this->add("minute", coInt); def = this->add("minute", coInt);
def->label = L("Minute"); def->label = L("Minute");
def->tooltip = L("");
def = this->add("second", coInt); def = this->add("second", coInt);
def->label = L("Second"); def->label = L("Second");
def->tooltip = L("");
} }
OtherPresetsConfigDef::OtherPresetsConfigDef() OtherPresetsConfigDef::OtherPresetsConfigDef()
@ -5259,17 +5253,17 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
def->tooltip = L("Name of the print preset used for slicing."); def->tooltip = L("Name of the print preset used for slicing.");
def = this->add("filament_preset", coString); def = this->add("filament_preset", coString);
def->label = L(""); def->label = L("Filament preset name");
def->tooltip = L("Names of the filament presets used for slicing. The variable is a vector " def->tooltip = L("Names of the filament presets used for slicing. The variable is a vector "
"containing one name for each extruder."); "containing one name for each extruder.");
def = this->add("printer_preset", coString); def = this->add("printer_preset", coString);
def->label = L(""); def->label = L("Printer preset name");
def->tooltip = L("Name of the printer preset used for slicing."); def->tooltip = L("Name of the printer preset used for slicing.");
def = this->add("physical_printer_preset", coString); def = this->add("physical_printer_preset", coString);
def->label = L(""); def->label = L("Physical printer name");
def->tooltip = L("Name of the physical print preset used for slicing."); def->tooltip = L("Name of the physical printer used for slicing.");
} }

View File

@ -286,7 +286,7 @@ void EditGCodeDialog::bind_list_and_button()
format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str); format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str);
if (def) if (def)
description = _(def->tooltip); description = get_wraped_wxString(_(def->tooltip), 120);
} }
else else
label = "Undef optptr"; label = "Undef optptr";