GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 17:22:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Physical Printer Dialog changes

Browse Source 
PrusaConnect hostname no browse button
PrusaConnect address check on OK
Store hostname when showing PrusaConnect URL
This commit is contained in:
David Kocik 2023-11-03 16:07:23 +01:00
parent da6a384e48
commit c3931c80f2
3 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View File

@ -436,11 +436,15 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
m_optgroup->activate();
const auto opt = m_config->option<ConfigOptionEnum<PrintHostType>>("host_type");
m_last_host_type = opt->value;
m_opened_as_connect = (m_last_host_type == htPrusaConnect);
Field* printhost_field = m_optgroup->get_field("print_host");
if (printhost_field)
{
text_ctrl* temp = dynamic_cast<text_ctrl*>(printhost_field->getWindow());
if (temp)
if (temp) {
temp->Bind(wxEVT_TEXT, ([printhost_field, temp](wxEvent& e)
{
#ifndef __WXGTK__
@ -457,6 +461,7 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
if (field)
field->propagate_value();
}), temp->GetId());
}
}
// Always fill in the "printhost_port" combo box from the config and select it.
@ -488,12 +493,6 @@ void PhysicalPrinterDialog::update(bool printer_change)
const auto opt = m_config->option<ConfigOptionEnum<PrintHostType>>("host_type");
m_optgroup->show_field("host_type");
// hide PrusaConnect address
Field* printhost_field = m_optgroup->get_field("print_host");
text_ctrl* printhost_win = printhost_field ? dynamic_cast<text_ctrl*>(printhost_field->getWindow()) : nullptr;
if (printhost_win && printhost_win->GetValue() == L"https://connect.prusa3d.com")
printhost_win->SetValue(wxString());
if (opt->value == htPrusaLink) { // PrusaConnect does NOT allow http digest
m_optgroup->show_field("printhost_authorization_type");
AuthorizationType auth_type = m_config->option<ConfigOptionEnum<AuthorizationType>>("printhost_authorization_type")->value;
@ -506,11 +505,30 @@ void PhysicalPrinterDialog::update(bool printer_change)
for (const std::string& opt_key : std::vector<std::string>{ "printhost_user", "printhost_password" })
m_optgroup->hide_field(opt_key);
supports_multiple_printers = opt && opt->value == htRepetier;
if (opt->value == htPrusaConnect && printhost_win && printhost_win->GetValue().IsEmpty()) {
// automatically show default prusaconnect address
}
// Hide Browse and Test buttons for Connect
if (opt->value == htPrusaConnect) {
m_printhost_browse_btn->Hide();
// hide show hostname and PrusaConnect address
Field* printhost_field = m_optgroup->get_field("print_host");
text_ctrl* printhost_win = printhost_field ? dynamic_cast<text_ctrl*>(printhost_field->getWindow()) : nullptr;
if (!m_opened_as_connect && printhost_win && m_last_host_type != htPrusaConnect){
m_stored_host = printhost_win->GetValue();
printhost_win->SetValue(L"https://connect.prusa3d.com");
}
} else {
m_printhost_browse_btn->Show();
// hide PrusaConnect address and show hostname
Field* printhost_field = m_optgroup->get_field("print_host");
text_ctrl* printhost_win = printhost_field ? dynamic_cast<text_ctrl*>(printhost_field->getWindow()) : nullptr;
if (!m_opened_as_connect && printhost_win && m_last_host_type == htPrusaConnect) {
wxString temp_host = printhost_win->GetValue();
printhost_win->SetValue(m_stored_host);
m_stored_host = temp_host;
}
}
m_last_host_type = opt->value;
}
else {
m_optgroup->set_value("host_type", int(PrintHostType::htOctoPrint), false);
@ -727,6 +745,20 @@ void PhysicalPrinterDialog::OnOK(wxEvent& event)
return;
}
Field* printhost_field = m_optgroup->get_field("print_host");
text_ctrl* printhost_win = printhost_field ? dynamic_cast<text_ctrl*>(printhost_field->getWindow()) : nullptr;
const auto opt = m_config->option<ConfigOptionEnum<PrintHostType>>("host_type");
if (opt->value == htPrusaConnect) {
if (printhost_win && printhost_win->GetValue() != L"https://connect.prusa3d.com"){
InfoDialog msg(this, _L("Warning"), _L("URL of PrusaConnect is different than https://connect.prusa3d.com. Do you wish to continue?"), true, wxYES_NO);
if(msg.ShowModal() != wxID_YES){
printhost_win->SetValue(L"https://connect.prusa3d.com");
return;
}
}
}
PhysicalPrinterCollection& printers = wxGetApp().preset_bundle->physical_printers;
const PhysicalPrinter* existing = printers.find_printer(into_u8(printer_name), false);
if (existing && into_u8(printer_name) != printers.get_selected_printer_name())

5
src/slic3r/GUI/PhysicalPrinterDialog.hpp
View File

@ -66,7 +66,6 @@ class PhysicalPrinterDialog : public DPIDialog
PhysicalPrinter m_printer;
wxString m_default_name;
DynamicPrintConfig* m_config { nullptr };
::TextInput* m_printer_name { nullptr };
std::vector<PresetForPrinter*> m_presets;
@ -80,6 +79,10 @@ class PhysicalPrinterDialog : public DPIDialog
wxBoxSizer* m_presets_sizer {nullptr};
wxString m_stored_host;
PrintHostType m_last_host_type;
bool m_opened_as_connect {false};
void build_printhost_settings(ConfigOptionsGroup* optgroup);
void OnOK(wxEvent& event);
void AddPreset(wxEvent& event);

1
src/slic3r/GUI/Widgets/TextInput.cpp
View File

@ -79,7 +79,6 @@ void TextInput::Create(wxWindow * parent,
ProcessEventLocally(e);
});
text_ctrl->Bind(wxEVT_TEXT, [this](auto &e) {
OnEdit();
e.SetId(GetId());
ProcessEventLocally(e);
});