diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 162d9fd75..b5826c9f1 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -314,9 +314,6 @@ void ObjectList::create_objects_ctrl() */ SetMinSize(wxSize(-1, 3000)); - m_sizer = new wxBoxSizer(wxVERTICAL); - m_sizer->Add(this, 1, wxGROW); - m_objects_model = new ObjectDataViewModel; AssociateModel(m_objects_model); m_objects_model->SetAssociatedControl(this); diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 2e25c9b9b..0e6aa96e8 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -163,8 +163,6 @@ private: } m_dragged_data; - wxBoxSizer *m_sizer {nullptr}; - ObjectDataViewModel *m_objects_model{ nullptr }; ModelConfig *m_config {nullptr}; std::vector *m_objects{ nullptr }; @@ -308,7 +306,6 @@ public: bool can_merge_to_single_object() const; wxPoint get_mouse_position_in_control() const { return wxGetMousePosition() - this->GetScreenPosition(); } - wxBoxSizer* get_sizer() {return m_sizer;} int get_selected_obj_idx() const; ModelConfig& get_item_config(const wxDataViewItem& item) const; diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 279353df6..f008b048e 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -103,7 +103,6 @@ #include "Widgets/ProgressDialog.hpp" #include "BBLStatusBar.hpp" #include "BitmapCache.hpp" -#include "AuxiliaryDialog.hpp" #include "ParamsDialog.hpp" #include "Widgets/Label.hpp" #include "Widgets/RoundedRectangle.hpp" @@ -304,7 +303,6 @@ struct Sidebar::priv wxPanel* m_panel_printer_content = nullptr; ObjectList *m_object_list{ nullptr }; - AuxiliaryDialog *m_auxiliary_dialog{ nullptr }; ObjectSettings *object_settings{ nullptr }; wxButton *btn_export_gcode; @@ -536,6 +534,7 @@ Sidebar::Sidebar(Plater *parent) scrolled_sizer->AddSpacer(FromDIP(20)); } + { // add filament title p->m_panel_filament_title = new StaticBox(p->scrolled, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_NONE); p->m_panel_filament_title->SetBackgroundColor(title_bg); @@ -703,7 +702,9 @@ Sidebar::Sidebar(Plater *parent) p->m_panel_filament_content->Layout(); scrolled_sizer->Add(p->m_panel_filament_content, 0, wxTOP | wxEXPAND, FromDIP(5)); scrolled_sizer->AddSpacer(FromDIP(20)); + } + { //add project title auto params_panel = ((MainFrame*)parent->GetParent())->m_param_panel; if (params_panel) { @@ -727,8 +728,6 @@ Sidebar::Sidebar(Plater *parent) scrolled_sizer->Add(p->sizer_params, 2, wxEXPAND | wxLEFT, 0); p->m_object_list->Hide(); - p->m_auxiliary_dialog = new AuxiliaryDialog(this); - // Frequently Object Settings p->object_settings = new ObjectSettings(p->scrolled); #if !NEW_OBJECT_SETTING @@ -740,6 +739,7 @@ Sidebar::Sidebar(Plater *parent) scrolled_sizer->Add(params_panel, 3, wxEXPAND); } #endif + } auto *sizer = new wxBoxSizer(wxVERTICAL); sizer->Add(p->scrolled, 1, wxEXPAND); @@ -1192,11 +1192,6 @@ ObjectList* Sidebar::obj_list() return p->m_object_list; } -AuxiliaryList* Sidebar::aux_list() -{ - return p->m_auxiliary_dialog->aux_list(); -} - ObjectSettings* Sidebar::obj_settings() { return p->object_settings; @@ -1336,12 +1331,6 @@ bool Sidebar::show_object_list(bool show) const return true; } -bool Sidebar::show_auxiliary_dialog() const -{ - p->m_auxiliary_dialog->Reparent(wxGetApp().mainframe); - return p->m_auxiliary_dialog->ShowModal(); -} - std::vector& Sidebar::combos_filament() { return p->combos_filament; @@ -3299,8 +3288,6 @@ std::vector Plater::priv::load_model_objects(const ModelObjectPtrs& mode // BBS void Plater::priv::load_auxiliary_files() { - // AuxiliaryList* aux_list = dynamic_cast(sidebar->aux_list()); - // aux_list->reload(auxiliary_path); std::string auxiliary_path = encode_path(q->model().get_auxiliary_file_temp_path().c_str()); wxGetApp().mainframe->m_auxiliary->Reload(auxiliary_path); } diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index a8f0b812c..5fb45dfa3 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -19,7 +19,6 @@ #include "Search.hpp" #include "PartPlate.hpp" #include "GUI_App.hpp" -#include "GUI_AuxiliaryList.hpp" #include "Jobs/PrintJob.hpp" #include "libslic3r/Model.hpp" @@ -126,8 +125,6 @@ public: wxPanel* print_panel(); wxPanel* filament_panel(); - AuxiliaryList* aux_list(); - ConfigOptionsGroup* og_freq_chng_params(const bool is_fff); wxButton* get_wiping_dialog_button(); @@ -147,7 +144,6 @@ public: void update_searcher(); void update_ui_from_settings(); bool show_object_list(bool show) const; - bool show_auxiliary_dialog() const; #ifdef _MSW_DARK_MODE void show_mode_sizer(bool show);