Deleted unused menu items for OSX

+ Marked items for "Change part type" list
+ new POT
This commit is contained in:
YuSanka 2019-05-13 15:07:53 +02:00
parent ee2b8ced16
commit 1b50ea3bda
2 changed files with 7659 additions and 11 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1207,8 +1207,6 @@ wxMenuItem* ObjectList::append_menu_item_instance_to_object(wxMenu* menu)
void ObjectList::append_menu_items_osx(wxMenu* menu) void ObjectList::append_menu_items_osx(wxMenu* menu)
{ {
append_menu_item_delete(menu);
append_menu_item(menu, wxID_ANY, _(L("Rename")), "", append_menu_item(menu, wxID_ANY, _(L("Rename")), "",
[this](wxCommandEvent&) { rename_item(); }, "", menu); [this](wxCommandEvent&) { rename_item(); }, "", menu);
@ -1327,9 +1325,6 @@ void ObjectList::create_part_popupmenu(wxMenu *menu)
void ObjectList::create_instance_popupmenu(wxMenu*menu) void ObjectList::create_instance_popupmenu(wxMenu*menu)
{ {
#ifdef __WXOSX__
append_menu_item_delete(menu);
#endif // __WXOSX__
m_menu_item_split_instances = append_menu_item_instance_to_object(menu); m_menu_item_split_instances = append_menu_item_instance_to_object(menu);
/* New behavior logic: /* New behavior logic:
@ -2545,9 +2540,9 @@ void ObjectList::change_part_type()
} }
} }
const wxString names[] = { "Part", "Modifier", "Support Enforcer", "Support Blocker" }; const wxString names[] = { _(L("Part")), _(L("Modifier")), _(L("Support Enforcer")), _(L("Support Blocker")) };
auto new_type = ModelVolumeType(wxGetSingleChoiceIndex("Type: ", _(L("Select type of part")), wxArrayString(4, names), int(type))); auto new_type = ModelVolumeType(wxGetSingleChoiceIndex(_(L("Type:")), _(L("Select type of part")), wxArrayString(4, names), int(type)));
if (new_type == type || new_type == ModelVolumeType::INVALID) if (new_type == type || new_type == ModelVolumeType::INVALID)
return; return;
@ -2837,10 +2832,6 @@ void ObjectList::show_multi_selection_menu()
wxMenu* menu = new wxMenu(); wxMenu* menu = new wxMenu();
#ifdef __WXOSX__
append_menu_item_delete(menu);
#endif //__WXOSX__
if (extruders_count() > 1) if (extruders_count() > 1)
append_menu_item(menu, wxID_ANY, _(L("Set extruder for selected items")), append_menu_item(menu, wxID_ANY, _(L("Set extruder for selected items")),
_(L("Select extruder number for selected objects and/or parts")), _(L("Select extruder number for selected objects and/or parts")),