diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 8382a7f7a5..165654a90a 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -819,7 +819,8 @@ static std::vector s_Preset_printer_options { "silent_mode", // BBS "scan_first_layer", "machine_load_filament_time", "machine_unload_filament_time", "machine_pause_gcode", "template_custom_gcode", - "nozzle_type", "nozzle_hrc","auxiliary_fan", "nozzle_volume","upward_compatible_machine", "z_hop_types", "retract_lift_enforce", + "nozzle_type", "nozzle_hrc","auxiliary_fan", "nozzle_volume","upward_compatible_machine", "z_hop_types", "retract_lift_enforce","support_chamber_temp_control","support_air_filtration","printer_structure","thumbnail_size", + "best_object_pos", //SoftFever "host_type", "print_host", "printhost_apikey", "print_host_webui", diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 0cdfb1a3d7..f3a68b2608 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -500,8 +500,6 @@ wxMenu* MenuFactory::append_submenu_add_generic(wxMenu* menu, ModelVolumeType ty file_name = "ksr_fdmtest_v4.stl"; else if (file_name == L("Voron Cube")) file_name = "Voron_Design_Cube_v7.stl"; - else if (file_name == "Disc") - file_name ="Disc.stl"; else return; input_files.push_back( diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 9e55409940..fa73ff795a 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -876,8 +876,8 @@ void MainFrame::update_title() void MainFrame::show_publish_button(bool show) { - m_publish_btn->Show(show); - Layout(); + // m_publish_btn->Show(show); + // Layout(); } void MainFrame::show_calibration_button(bool show) @@ -1461,18 +1461,18 @@ wxBoxSizer* MainFrame::create_side_tools() m_slice_select = eSlicePlate; m_print_select = ePrintPlate; - m_publish_btn = new Button(this, _L("Upload"), "bar_publish", 0, FromDIP(16)); + // m_publish_btn = new Button(this, _L("Upload"), "bar_publish", 0, FromDIP(16)); m_slice_btn = new SideButton(this, _L("Slice plate"), ""); m_slice_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14)); m_print_btn = new SideButton(this, _L("Print plate"), ""); m_print_option_btn = new SideButton(this, "", "sidebutton_dropdown", 0, FromDIP(14)); update_side_button_style(); - m_publish_btn->Hide(); + // m_publish_btn->Hide(); m_slice_option_btn->Enable(); m_print_option_btn->Enable(); - sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); - sizer->Add(FromDIP(15), 0, 0, 0, 0); + // sizer->Add(m_publish_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); + // sizer->Add(FromDIP(15), 0, 0, 0, 0); sizer->Add(m_slice_option_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(m_slice_btn, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, FromDIP(1)); sizer->Add(FromDIP(15), 0, 0, 0, 0); @@ -1482,20 +1482,20 @@ wxBoxSizer* MainFrame::create_side_tools() sizer->Layout(); - m_publish_btn->Bind(wxEVT_BUTTON, [this](auto& e) { - CallAfter([this] { - wxGetApp().open_publish_page_dialog(); + // m_publish_btn->Bind(wxEVT_BUTTON, [this](auto& e) { + // CallAfter([this] { + // wxGetApp().open_publish_page_dialog(); - if (!wxGetApp().getAgent()) { - BOOST_LOG_TRIVIAL(info) << "publish: no agent"; - return; - } + // if (!wxGetApp().getAgent()) { + // BOOST_LOG_TRIVIAL(info) << "publish: no agent"; + // return; + // } - // record - json j; - NetworkAgent* agent = GUI::wxGetApp().getAgent(); - }); - }); + // // record + // json j; + // NetworkAgent* agent = GUI::wxGetApp().getAgent(); + // }); + // }); m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) { @@ -1858,12 +1858,12 @@ void MainFrame::update_side_button_style() std::pair(wxColour(0, 150, 136), StateColor::Normal) ); - m_publish_btn->SetMinSize(wxSize(FromDIP(125), FromDIP(24))); - m_publish_btn->SetCornerRadius(FromDIP(12)); - m_publish_btn->SetBackgroundColor(m_btn_bg_enable); - m_publish_btn->SetBorderColor(m_btn_bg_enable); - m_publish_btn->SetBackgroundColour(wxColour(59,68,70)); - m_publish_btn->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); + // m_publish_btn->SetMinSize(wxSize(FromDIP(125), FromDIP(24))); + // m_publish_btn->SetCornerRadius(FromDIP(12)); + // m_publish_btn->SetBackgroundColor(m_btn_bg_enable); + // m_publish_btn->SetBorderColor(m_btn_bg_enable); + // m_publish_btn->SetBackgroundColour(wxColour(59,68,70)); + // m_publish_btn->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); m_slice_btn->SetTextLayout(SideButton::EHorizontalOrientation::HO_Left, FromDIP(15)); m_slice_btn->SetCornerRadius(FromDIP(12)); diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 42b37fe53f..28ff66fd95 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -376,10 +376,10 @@ public: wxWindow* m_plater_page{ nullptr }; PrintHostQueueDialog* m_printhost_queue_dlg; - // BBS + mutable int m_print_select{ ePrintAll }; mutable int m_slice_select{ eSliceAll }; - Button* m_publish_btn{ nullptr }; + // Button* m_publish_btn{ nullptr }; SideButton* m_slice_btn{ nullptr }; SideButton* m_slice_option_btn{ nullptr }; SideButton* m_print_btn{ nullptr }; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 34eb1dc4e9..c9f49f11de 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -3001,8 +3001,8 @@ void TabFilament::toggle_options() toggle_line("cool_plate_temp_initial_layer", is_BBL_printer); toggle_line("eng_plate_temp_initial_layer", is_BBL_printer); toggle_line("textured_plate_temp_initial_layer", is_BBL_printer); - bool support_chamber_temp_control = this->m_preset_bundle->printers.get_selected_preset().config.opt_bool("support_chamber_temp_control"); - toggle_option("chamber_temperature", !is_BBL_printer || support_chamber_temp_control); + // bool support_chamber_temp_control = this->m_preset_bundle->printers.get_selected_preset().config.opt_bool("support_chamber_temp_control"); + // toggle_option("chamber_temperature", !is_BBL_printer || support_chamber_temp_control); } if (m_active_page->title() == L("Setting Overrides")) update_filament_overrides_page();