3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste

Browse source
This commit is contained in:
Enrico Turri 2019-05-10 13:50:46 +02:00
commit 3432218e8b
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/localization/Slic3rPE.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-10 11:50+0200\n"
"POT-Creation-Date: 2019-05-10 13:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1329,6 +1329,14 @@ msgstr ""
msgid "Right button click the icon to change the object settings"
msgstr ""
#: src/slic3r/GUI/GUI_ObjectList.cpp:357 src/slic3r/GUI/GUI_ObjectList.cpp:378
#: src/slic3r/GUI/GUI_ObjectList.cpp:390 src/slic3r/GUI/GUI_ObjectList.cpp:2855
#: src/slic3r/GUI/GUI_ObjectList.cpp:2865
#: src/slic3r/GUI/GUI_ObjectList.cpp:2897 src/slic3r/GUI/wxExtensions.cpp:499
#: src/slic3r/GUI/wxExtensions.cpp:524
msgid "default"
msgstr ""
#: src/slic3r/GUI/GUI_ObjectList.cpp:362 src/slic3r/GUI/Tab.cpp:1480
#: src/libslic3r/PrintConfig.cpp:456
msgid "Extruder"

12
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -354,7 +354,7 @@ DynamicPrintConfig& ObjectList::get_item_config(const wxDataViewItem& item) cons
wxDataViewColumn* ObjectList::create_objects_list_extruder_column(int extruders_count)
{
wxArrayString choices;
choices.Add("default");
choices.Add(_(L("default")));
for (int i = 1; i <= extruders_count; ++i)
choices.Add(wxString::Format("%d", i));
wxDataViewChoiceRenderer *c =
@ -375,7 +375,7 @@ void ObjectList::update_extruder_values_for_items(const int max_extruder)
wxString extruder;
if (!object->config.has("extruder") ||
object->config.option<ConfigOptionInt>("extruder")->value > max_extruder)
extruder = "default";
extruder = _(L("default"));
else
extruder = wxString::Format("%d", object->config.option<ConfigOptionInt>("extruder")->value);
@ -387,7 +387,7 @@ void ObjectList::update_extruder_values_for_items(const int max_extruder)
if (!item) continue;
if (!object->volumes[id]->config.has("extruder") ||
object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value > max_extruder)
extruder = "default";
extruder = _(L("default"));
else
extruder = wxString::Format("%d", object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value);
@ -2852,7 +2852,7 @@ void ObjectList::show_multi_selection_menu()
void ObjectList::extruder_selection()
{
wxArrayString choices;
choices.Add("default");
choices.Add(_(L("default")));
for (int i = 1; i <= extruders_count(); ++i)
choices.Add(wxString::Format("%d", i));
@ -2862,7 +2862,7 @@ void ObjectList::extruder_selection()
if (selected_extruder.IsEmpty())
return;
const int extruder_num = selected_extruder == "default" ? 0 : atoi(selected_extruder.c_str());
const int extruder_num = selected_extruder == _(L("default")) ? 0 : atoi(selected_extruder.c_str());
// /* Another variant for an extruder selection */
// extruder_num = wxGetNumberFromUser(_(L("Attention!!! \n"
@ -2894,7 +2894,7 @@ void ObjectList::set_extruder_for_selected_items(const int extruder) const
else if (extruder > 0)
config.set_key_value("extruder", new ConfigOptionInt(extruder));
const wxString extruder_str = extruder == 0 ? wxString ("default") :
const wxString extruder_str = extruder == 0 ? wxString (_(L("default"))) :
wxString::Format("%d", config.option<ConfigOptionInt>("extruder")->value);
auto const type = m_objects_model->GetItemType(item);

4
src/slic3r/GUI/wxExtensions.cpp
View file

@ -496,7 +496,7 @@ wxDataViewItem ObjectDataViewModel::Add(const wxString &name,
const int extruder,
const bool has_errors/* = false*/)
{
const wxString extruder_str = extruder == 0 ? "default" : wxString::Format("%d", extruder);
const wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
auto root = new ObjectDataViewModelNode(name, extruder_str);
// Add error icon if detected auto-repaire
if (has_errors)
@ -521,7 +521,7 @@ wxDataViewItem ObjectDataViewModel::AddVolumeChild( const wxDataViewItem &parent
ObjectDataViewModelNode *root = (ObjectDataViewModelNode*)parent_item.GetID();
if (!root) return wxDataViewItem(0);
wxString extruder_str = extruder == 0 ? "default" : wxString::Format("%d", extruder);
wxString extruder_str = extruder == 0 ? _(L("default")) : wxString::Format("%d", extruder);
// because of istance_root is a last item of the object
int insert_position = root->GetChildCount() - 1;