juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-05 11:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ConfigWizard instance in GUI_App, lazy-initialized,

Browse Source 
add filament/material installation item in Sidebar combo boxes
This commit is contained in:
Vojtech Kral
2019-06-04 18:01:41 +02:00
parent 87b7b1cc1d
commit dba9925c4e
13 changed files with 115 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,11 +192,9 @@ typedef DataList<wxCheckListBox, Preset> PresetList;
struct PageMaterials: ConfigWizardPage
{
// Technology technology;
Materials *materials;
StringList *list_l1, *list_l2;
PresetList *list_l3;
// wxCheckListBox *list_l3;
int sel1_prev, sel2_prev;
PageMaterials(ConfigWizard *parent, Materials *materials, wxString title, wxString shortname, wxString list1name);
@@ -333,7 +331,7 @@ wxDEFINE_EVENT(EVT_INDEX_PAGE, wxCommandEvent);
struct ConfigWizard::priv
{
ConfigWizard *q;
ConfigWizard::RunReason run_reason;
ConfigWizard::RunReason run_reason = RR_USER;
AppConfig appconfig_new; // Backing for vendor/model/variant and material selections in the GUI
std::unordered_map<std::string, VendorProfile> vendors;
Materials filaments; // Holds available filament presets and their types & vendors
@@ -382,6 +380,7 @@ struct ConfigWizard::priv
void load_vendors();
void add_page(ConfigWizardPage *page);
void enable_next(bool enable);
void set_start_page(ConfigWizard::StartPage start_page);
void on_custom_setup();
void on_printer_pick(PagePrinters *page);