mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
ConfigWizard: Fix: Don't check the default printer if the wizard is requested by user or re-configure
This commit is contained in:
parent
3e65b4410b
commit
1842520ea6
2 changed files with 7 additions and 4 deletions
|
@ -223,7 +223,7 @@ void ConfigWizardPage::enable_next(bool enable) { parent->p->enable_next(enable)
|
||||||
|
|
||||||
// Wizard pages
|
// Wizard pages
|
||||||
|
|
||||||
PageWelcome::PageWelcome(ConfigWizard *parent) :
|
PageWelcome::PageWelcome(ConfigWizard *parent, bool check_first_variant) :
|
||||||
ConfigWizardPage(parent, wxString::Format(_(L("Welcome to the Slic3r %s")), ConfigWizard::name()), _(L("Welcome"))),
|
ConfigWizardPage(parent, wxString::Format(_(L("Welcome to the Slic3r %s")), ConfigWizard::name()), _(L("Welcome"))),
|
||||||
printer_picker(nullptr),
|
printer_picker(nullptr),
|
||||||
others_buttons(new wxPanel(parent)),
|
others_buttons(new wxPanel(parent)),
|
||||||
|
@ -247,7 +247,10 @@ PageWelcome::PageWelcome(ConfigWizard *parent) :
|
||||||
AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
|
AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
|
||||||
|
|
||||||
printer_picker = new PrinterPicker(this, vendor_prusa->second, appconfig_vendors);
|
printer_picker = new PrinterPicker(this, vendor_prusa->second, appconfig_vendors);
|
||||||
printer_picker->select_one(0, true); // Select the default (first) model/variant on the Prusa vendor
|
if (check_first_variant) {
|
||||||
|
// Select the default (first) model/variant on the Prusa vendor
|
||||||
|
printer_picker->select_one(0, true);
|
||||||
|
}
|
||||||
printer_picker->Bind(EVT_PRINTER_PICK, [this, &appconfig_vendors](const PrinterPickerEvent &evt) {
|
printer_picker->Bind(EVT_PRINTER_PICK, [this, &appconfig_vendors](const PrinterPickerEvent &evt) {
|
||||||
appconfig_vendors.set_variant(evt.vendor_id, evt.model_id, evt.variant_name, evt.enable);
|
appconfig_vendors.set_variant(evt.vendor_id, evt.model_id, evt.variant_name, evt.enable);
|
||||||
this->on_variant_checked();
|
this->on_variant_checked();
|
||||||
|
@ -839,7 +842,7 @@ ConfigWizard::ConfigWizard(wxWindow *parent, RunReason reason) :
|
||||||
p->btnsizer->Add(p->btn_finish, 0, wxLEFT, BTN_SPACING);
|
p->btnsizer->Add(p->btn_finish, 0, wxLEFT, BTN_SPACING);
|
||||||
p->btnsizer->Add(p->btn_cancel, 0, wxLEFT, BTN_SPACING);
|
p->btnsizer->Add(p->btn_cancel, 0, wxLEFT, BTN_SPACING);
|
||||||
|
|
||||||
p->add_page(p->page_welcome = new PageWelcome(this));
|
p->add_page(p->page_welcome = new PageWelcome(this, reason == RR_DATA_EMPTY || reason == RR_DATA_LEGACY));
|
||||||
p->add_page(p->page_update = new PageUpdate(this));
|
p->add_page(p->page_update = new PageUpdate(this));
|
||||||
p->add_page(p->page_vendors = new PageVendors(this));
|
p->add_page(p->page_vendors = new PageVendors(this));
|
||||||
p->add_page(p->page_firmware = new PageFirmware(this));
|
p->add_page(p->page_firmware = new PageFirmware(this));
|
||||||
|
|
|
@ -104,7 +104,7 @@ struct PageWelcome: ConfigWizardPage
|
||||||
wxPanel *others_buttons;
|
wxPanel *others_buttons;
|
||||||
wxCheckBox *cbox_reset;
|
wxCheckBox *cbox_reset;
|
||||||
|
|
||||||
PageWelcome(ConfigWizard *parent);
|
PageWelcome(ConfigWizard *parent, bool check_first_variant);
|
||||||
|
|
||||||
virtual wxPanel* extra_buttons() { return others_buttons; }
|
virtual wxPanel* extra_buttons() { return others_buttons; }
|
||||||
virtual void on_page_set();
|
virtual void on_page_set();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue