Skip to content

Commit

Permalink
Custom GCode editor: Added wrapping for descriptions lines in dialog
Browse files Browse the repository at this point in the history
+ Some fixes for tooltips and labels in *Configs
  • Loading branch information
YuSanka authored and lukasmatena committed Sep 13, 2023
1 parent 7efdbec commit 83b8988
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
14 changes: 4 additions & 10 deletions src/libslic3r/PrintConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5223,27 +5223,21 @@ TimestampsConfigDef::TimestampsConfigDef()

def = this->add("year", coInt);
def->label = L("Year");
def->tooltip = L("");

def = this->add("month", coInt);
def->label = L("Month");
def->tooltip = L("");

def = this->add("day", coInt);
def->label = L("Day");
def->tooltip = L("");

def = this->add("hour", coInt);
def->label = L("Hour");
def->tooltip = L("");

def = this->add("minute", coInt);
def->label = L("Minute");
def->tooltip = L("");

def = this->add("second", coInt);
def->label = L("Second");
def->tooltip = L("");
}

OtherPresetsConfigDef::OtherPresetsConfigDef()
Expand All @@ -5259,17 +5253,17 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
def->tooltip = L("Name of the print preset used for slicing.");

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 "
"containing one name for each extruder.");

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 = this->add("physical_printer_preset", coString);
def->label = L("");
def->tooltip = L("Name of the physical print preset used for slicing.");
def->label = L("Physical printer name");
def->tooltip = L("Name of the physical printer used for slicing.");
}


Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/EditGCodeDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

if (def)
description = _(def->tooltip);
description = get_wraped_wxString(_(def->tooltip), 120);
}
else
label = "Undef optptr";
Expand Down

0 comments on commit 83b8988

Please sign in to comment.