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

Reworded the "Add / remove instance / set number of instances".

Browse source
This commit is contained in:
bubnikv 2019-08-28 15:35:01 +02:00
parent 048ed74318
commit 2b7a4973a8
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/localization/PrusaSlicer.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-08-28 15:11+0200\n" "POT-Creation-Date: 2019-08-28 15:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -880,11 +880,12 @@ msgstr ""
msgid "Paste" msgid "Paste"
msgstr "" msgstr ""
#: src/slic3r/GUI/GLCanvas3D.cpp:3603 #: src/slic3r/GUI/GLCanvas3D.cpp:3603 src/slic3r/GUI/Plater.cpp:3390
#: src/slic3r/GUI/Plater.cpp:3402 src/slic3r/GUI/Plater.cpp:3516
msgid "Add instance" msgid "Add instance"
msgstr "" msgstr ""
#: src/slic3r/GUI/GLCanvas3D.cpp:3614 #: src/slic3r/GUI/GLCanvas3D.cpp:3614 src/slic3r/GUI/Plater.cpp:3518
msgid "Remove instance" msgid "Remove instance"
msgstr "" msgstr ""
@ -3370,33 +3371,24 @@ msgstr ""
msgid "Cancelled" msgid "Cancelled"
msgstr "" msgstr ""
#: src/slic3r/GUI/Plater.cpp:3390 src/slic3r/GUI/Plater.cpp:3402
#: src/slic3r/GUI/Plater.cpp:3516
msgid "Increase copies"
msgstr ""
#: src/slic3r/GUI/Plater.cpp:3510 src/slic3r/GUI/Plater.cpp:3529 #: src/slic3r/GUI/Plater.cpp:3510 src/slic3r/GUI/Plater.cpp:3529
msgid "Remove the selected object" msgid "Remove the selected object"
msgstr "" msgstr ""
#: src/slic3r/GUI/Plater.cpp:3516 #: src/slic3r/GUI/Plater.cpp:3516
msgid "Place one more copy of the selected object" msgid "Add one more instance of the selected object"
msgstr "" msgstr ""
#: src/slic3r/GUI/Plater.cpp:3518 #: src/slic3r/GUI/Plater.cpp:3518
msgid "Decrease copies" msgid "Remove one instance of the selected object"
msgstr ""
#: src/slic3r/GUI/Plater.cpp:3518
msgid "Remove one copy of the selected object"
msgstr "" msgstr ""
#: src/slic3r/GUI/Plater.cpp:3520 #: src/slic3r/GUI/Plater.cpp:3520
msgid "Set number of copies" msgid "Set number of instances"
msgstr "" msgstr ""
#: src/slic3r/GUI/Plater.cpp:3520 #: src/slic3r/GUI/Plater.cpp:3520
msgid "Change the number of copies of the selected object" msgid "Change the number of instances of the selected object"
msgstr "" msgstr ""
#: src/slic3r/GUI/Plater.cpp:3539 #: src/slic3r/GUI/Plater.cpp:3539

10
src/slic3r/GUI/Plater.cpp
View file

@ -3387,7 +3387,7 @@ void Plater::priv::on_right_click(Vec2dEvent& evt)
*/ */
const MenuIdentifier id = printer_technology == ptSLA ? miObjectSLA : miObjectFFF; const MenuIdentifier id = printer_technology == ptSLA ? miObjectSLA : miObjectFFF;
if (wxGetApp().get_mode() == comSimple) { if (wxGetApp().get_mode() == comSimple) {
if (menu->FindItem(_(L("Increase copies"))) != wxNOT_FOUND) if (menu->FindItem(_(L("Add instance"))) != wxNOT_FOUND)
{ {
/* Detach an items from the menu, but don't delete them /* Detach an items from the menu, but don't delete them
* so that they can be added back later * so that they can be added back later
@ -3399,7 +3399,7 @@ void Plater::priv::on_right_click(Vec2dEvent& evt)
} }
} }
else { else {
if (menu->FindItem(_(L("Increase copies"))) == wxNOT_FOUND) if (menu->FindItem(_(L("Add instance"))) == wxNOT_FOUND)
{ {
// Prepend items to the menu, if those aren't not there // Prepend items to the menu, if those aren't not there
menu->Prepend(items_set_number_of_copies[id]); menu->Prepend(items_set_number_of_copies[id]);
@ -3513,11 +3513,11 @@ bool Plater::priv::init_common_menu(wxMenu* menu, const bool is_part/* = false*/
sidebar->obj_list()->append_menu_item_export_stl(menu); sidebar->obj_list()->append_menu_item_export_stl(menu);
} }
else { else {
wxMenuItem* item_increase = append_menu_item(menu, wxID_ANY, _(L("Increase copies")) + "\t+", _(L("Place one more copy of the selected object")), wxMenuItem* item_increase = append_menu_item(menu, wxID_ANY, _(L("Add instance")) + "\t+", _(L("Add one more instance of the selected object")),
[this](wxCommandEvent&) { q->increase_instances(); }, "add_copies", nullptr, [this]() { return can_increase_instances(); }, q); [this](wxCommandEvent&) { q->increase_instances(); }, "add_copies", nullptr, [this]() { return can_increase_instances(); }, q);
wxMenuItem* item_decrease = append_menu_item(menu, wxID_ANY, _(L("Decrease copies")) + "\t-", _(L("Remove one copy of the selected object")), wxMenuItem* item_decrease = append_menu_item(menu, wxID_ANY, _(L("Remove instance")) + "\t-", _(L("Remove one instance of the selected object")),
[this](wxCommandEvent&) { q->decrease_instances(); }, "remove_copies", nullptr, [this]() { return can_decrease_instances(); }, q); [this](wxCommandEvent&) { q->decrease_instances(); }, "remove_copies", nullptr, [this]() { return can_decrease_instances(); }, q);
wxMenuItem* item_set_number_of_copies = append_menu_item(menu, wxID_ANY, _(L("Set number of copies")) + dots, _(L("Change the number of copies of the selected object")), wxMenuItem* item_set_number_of_copies = append_menu_item(menu, wxID_ANY, _(L("Set number of instances")) + dots, _(L("Change the number of instances of the selected object")),
[this](wxCommandEvent&) { q->set_number_of_copies(); }, "number_of_copies", nullptr, [this]() { return can_increase_instances(); }, q); [this](wxCommandEvent&) { q->set_number_of_copies(); }, "number_of_copies", nullptr, [this]() { return can_increase_instances(); }, q);