Sync to 2.4.1-beta1
This commit is contained in:
parent
ebb9041041
commit
5c616c5931
92 changed files with 920 additions and 45290 deletions
src/slic3r/GUI
|
@ -1199,26 +1199,6 @@ static wxString get_string_value(std::string opt_key, const DynamicPrintConfig&
|
|||
return out;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
wxString UnsavedChangesDialog::get_short_string(wxString full_string)
|
||||
{
|
||||
int max_len = 30;
|
||||
if (full_string.IsEmpty() || full_string.StartsWith("#") ||
|
||||
(full_string.Find("\n") == wxNOT_FOUND && full_string.Length() < size_t(max_len)))
|
||||
return full_string;
|
||||
|
||||
m_has_long_strings = true;
|
||||
|
||||
int n_pos = full_string.Find("\n");
|
||||
if (n_pos != wxNOT_FOUND && n_pos < max_len)
|
||||
max_len = n_pos;
|
||||
|
||||
full_string.Truncate(max_len);
|
||||
return full_string + dots;
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> master
|
||||
void UnsavedChangesDialog::update(Preset::Type type, PresetCollection* dependent_presets, const std::string& new_selected_preset, const wxString& header)
|
||||
{
|
||||
PresetCollection* presets = dependent_presets;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue