Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsupermerill <merill@free.fr>2020-11-11 21:53:54 +0300
committersupermerill <merill@free.fr>2020-11-11 21:53:54 +0300
commitfbcc6569376317d86b68601af7bda29ea44bdb5e (patch)
tree4cc40e24cd68b4a09649882211b00288678ef540
parent732a441b84acbc6a9a23599822d0a7adfcb05751 (diff)
fix repetier2.3.55_hotfix
-rw-r--r--src/libslic3r/GCode.cpp2
-rw-r--r--src/libslic3r/Preset.cpp2
-rw-r--r--src/libslic3r/PresetBundle.cpp2
-rw-r--r--src/slic3r/GUI/PhysicalPrinterDialog.cpp10
-rw-r--r--src/slic3r/GUI/PhysicalPrinterDialog.hpp1
5 files changed, 8 insertions, 9 deletions
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index a4907ac7b..0fe2bccc0 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2890,7 +2890,7 @@ void GCode::append_full_config(const Print &print, std::string &str)
"print_host",
"printhost_apikey",
"printhost_cafile",
- "printhost_slug"
+ "printhost_port"
};
assert(std::is_sorted(banned_keys.begin(), banned_keys.end()));
auto is_banned = [banned_keys](const std::string &key) {
diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 015f511d9..30acc88fa 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -1596,7 +1596,7 @@ bool PhysicalPrinter::has_empty_config() const
config.opt_string("printhost_port" ).empty() &&
config.opt_string("printhost_user" ).empty() &&
config.opt_string("printhost_password").empty() &&
- config.opt_string("printhost_slug" ).empty();
+ config.opt_string("printhost_port" ).empty();
}
void PhysicalPrinter::update_preset_names_in_config()
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index e8d493a5a..4392944c6 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -500,7 +500,7 @@ DynamicPrintConfig PresetBundle::full_config_secure() const
config.erase("print_host");
config.erase("printhost_apikey");
config.erase("printhost_cafile");
- config.erase("printhost_slug");
+ config.erase("printhost_port");
return config;
}
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
index ddb152943..e1b410f55 100644
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
@@ -270,7 +270,7 @@ void PhysicalPrinterDialog::update_printers()
std::unique_ptr<PrintHost> host(PrintHost::get_print_host(m_config));
wxArrayString printers;
- Field* rs = m_optgroup->get_field("printhost_slug");
+ Field* rs = m_optgroup->get_field("printhost_port");
if (!host->get_printers(printers)) {
std::vector<std::string> slugs;
@@ -288,12 +288,12 @@ void PhysicalPrinterDialog::update_printers()
choice->set_values(slugs);
boost::any val = choice->get_value();
boost::any any_string_type = std::string("");
- auto value_idx = std::find(slugs.begin(), slugs.end(), m_config->opt<ConfigOptionString>("printhost_slug")->value);
+ auto value_idx = std::find(slugs.begin(), slugs.end(), m_config->opt<ConfigOptionString>("printhost_port")->value);
if ((val.empty() || (any_string_type.type() == val.type() && boost::any_cast<std::string>(val) == "")) && !slugs.empty() && value_idx == slugs.end()) {
- change_opt_value(*m_config, "printhost_slug", slugs[0]);
+ change_opt_value(*m_config, "printhost_port", slugs[0]);
choice->set_value(slugs[0],false);
} else if(value_idx != slugs.end() ){
- choice->set_value(m_config->option<ConfigOptionString>("printhost_slug")->value, false);
+ choice->set_value(m_config->option<ConfigOptionString>("printhost_port")->value, false);
}
rs->enable();
}
@@ -495,7 +495,7 @@ void PhysicalPrinterDialog::update()
if (m_printhost_browse_btn)
m_printhost_browse_btn->Enable(host->has_auto_discovery());
- m_printhost_slug_browse_btn->Enable(supports_multiple_printers);
+ m_printhost_port_browse_btn->Enable(supports_multiple_printers);
m_optgroup->show_field("printhost_port", supports_multiple_printers);
}
diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.hpp b/src/slic3r/GUI/PhysicalPrinterDialog.hpp
index 5e72c21c0..6d089415f 100644
--- a/src/slic3r/GUI/PhysicalPrinterDialog.hpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.hpp
@@ -72,7 +72,6 @@ class PhysicalPrinterDialog : public DPIDialog
ScalableButton* m_add_preset_btn {nullptr};
ScalableButton* m_printhost_browse_btn {nullptr};
ScalableButton* m_printhost_test_btn {nullptr};
- ScalableButton* m_printhost_slug_browse_btn {nullptr};
ScalableButton* m_printhost_cafile_browse_btn {nullptr};
ScalableButton* m_printhost_port_browse_btn {nullptr};