GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-18 07:56:11 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: 5092 edit filament add scrolled window

Browse Source 
Jira: 5092

Change-Id: I53ae996b04e4e2f1b1ddce6a858d505001b11615
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
This commit is contained in:
maosheng.wei 2023-11-09 17:24:26 +08:00 committed by Lane.Wei
parent 768fcd164d
commit c570a2eaab
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@ -3658,7 +3658,7 @@ ExportConfigsDialog::ExportCase ExportConfigsDialog::archive_preset_bundle_to_fi
return ExportCase::ADD_FILE_FAIL; return ExportCase::ADD_FILE_FAIL;
} }
filament_configs.push_back(filament_config_file_name); filament_configs.push_back(filament_config_file_name);
BOOST_LOG_TRIVIAL(info) << "Filament preset json add successful: "; BOOST_LOG_TRIVIAL(info) << "Filament preset json add successful.";
} }
} }
@ -4078,17 +4078,17 @@ EditFilamentPresetDialog::EditFilamentPresetDialog(wxWindow *parent, FilamentInf
std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str(); std::string icon_path = (boost::format("%1%/images/BambuStudioTitle.ico") % resources_dir()).str();
SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO)); SetIcon(wxIcon(encode_path(icon_path.c_str()), wxBITMAP_TYPE_ICO));
wxBoxSizer *main_sizer = new wxBoxSizer(wxVERTICAL); m_main_sizer = new wxBoxSizer(wxVERTICAL);
// top line // top line
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
m_line_top->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA)); m_line_top->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA));
main_sizer->Add(m_line_top, 0, wxEXPAND, 0); m_main_sizer->Add(m_line_top, 0, wxEXPAND, 0);
main_sizer->Add(0, 0, 0, wxTOP, FromDIP(5)); m_main_sizer->Add(0, 0, 0, wxTOP, FromDIP(5));
wxStaticText* basic_infomation = new wxStaticText(this, wxID_ANY, _L("Basic Information")); wxStaticText* basic_infomation = new wxStaticText(this, wxID_ANY, _L("Basic Information"));
basic_infomation->SetFont(Label::Head_16); basic_infomation->SetFont(Label::Head_16);
main_sizer->Add(basic_infomation, 0, wxALL, FromDIP(10)); m_main_sizer->Add(basic_infomation, 0, wxALL, FromDIP(10));
m_filament_id = filament_info->filament_id; m_filament_id = filament_info->filament_id;
//std::string filament_name = filament_info->filament_name; //std::string filament_name = filament_info->filament_name;
bool get_filament_presets = get_same_filament_id_presets(m_filament_id); bool get_filament_presets = get_same_filament_id_presets(m_filament_id);
@ -4109,25 +4109,25 @@ EditFilamentPresetDialog::EditFilamentPresetDialog(wxWindow *parent, FilamentInf
} }
} }
main_sizer->Add(create_filament_basic_info(), 0, wxEXPAND | wxALL, 0); m_main_sizer->Add(create_filament_basic_info(), 0, wxEXPAND | wxALL, 0);
// divider line // divider line
auto line_divider = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); auto line_divider = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
line_divider->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA)); line_divider->SetBackgroundColour(wxColour(0xA6, 0xa9, 0xAA));
main_sizer->Add(line_divider, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10)); m_main_sizer->Add(line_divider, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10));
main_sizer->Add(0, 0, 0, wxTOP, FromDIP(5)); m_main_sizer->Add(0, 0, 0, wxTOP, FromDIP(5));
wxStaticText *presets_infomation = new wxStaticText(this, wxID_ANY, _L("Filament presets under this filament")); wxStaticText *presets_infomation = new wxStaticText(this, wxID_ANY, _L("Filament presets under this filament"));
presets_infomation->SetFont(Label::Head_16); presets_infomation->SetFont(Label::Head_16);
main_sizer->Add(presets_infomation, 0, wxLEFT | wxRIGHT, FromDIP(10)); m_main_sizer->Add(presets_infomation, 0, wxLEFT | wxRIGHT, FromDIP(10));
main_sizer->Add(create_add_filament_btn(), 0, wxEXPAND | wxALL, 0); m_main_sizer->Add(create_add_filament_btn(), 0, wxEXPAND | wxALL, 0);
main_sizer->Add(create_preset_tree_sizer(), 0, wxEXPAND | wxALL, 0); m_main_sizer->Add(create_preset_tree_sizer(), 0, wxEXPAND | wxALL, 0);
main_sizer->Add(create_button_sizer(), 0, wxEXPAND | wxALL, 0); m_main_sizer->Add(create_button_sizer(), 0, wxEXPAND | wxALL, 0);
update_preset_tree(); update_preset_tree();
this->SetSizer(main_sizer); this->SetSizer(m_main_sizer);
this->Layout(); this->Layout();
this->Fit(); this->Fit();
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
@ -4166,7 +4166,14 @@ void EditFilamentPresetDialog::update_preset_tree()
for (std::pair<std::string, std::vector<std::shared_ptr<Preset>>> printer_and_presets : m_printer_compatible_presets) { for (std::pair<std::string, std::vector<std::shared_ptr<Preset>>> printer_and_presets : m_printer_compatible_presets) {
m_preset_tree_sizer->Add(m_preset_tree_creater->get_preset_tree(printer_and_presets), 0, wxEXPAND | wxALL, 5); m_preset_tree_sizer->Add(m_preset_tree_creater->get_preset_tree(printer_and_presets), 0, wxEXPAND | wxALL, 5);
} }
m_preset_tree_window->SetSizerAndFit(m_preset_tree_window_sizer);
m_preset_tree_panel->SetSizerAndFit(m_preset_tree_sizer);
int whidth = m_preset_tree_panel->GetSize().GetWidth();
int height = m_preset_tree_panel->GetSize().GetHeight();
m_preset_tree_window->SetMinSize(wxSize(std::min(1000, whidth), std::min(600, height)));
m_preset_tree_window->SetMaxSize(wxSize(std::min(1000, whidth), std::min(600, height)));
m_preset_tree_window->SetSize(wxSize(std::min(1000, whidth), std::min(600, height)));
this->SetSizerAndFit(m_main_sizer);
this->Layout(); this->Layout();
this->Fit(); this->Fit();
@ -4384,7 +4391,7 @@ wxBoxSizer *EditFilamentPresetDialog::create_preset_tree_sizer()
m_preset_tree_panel->SetSizer(m_preset_tree_sizer); m_preset_tree_panel->SetSizer(m_preset_tree_sizer);
m_preset_tree_panel->SetMinSize(wxSize(580, -1)); m_preset_tree_panel->SetMinSize(wxSize(580, -1));
m_preset_tree_panel->SetBackgroundColour(PRINTER_LIST_COLOUR); m_preset_tree_panel->SetBackgroundColour(PRINTER_LIST_COLOUR);
m_preset_tree_window_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* m_preset_tree_window_sizer = new wxBoxSizer(wxVERTICAL);
m_preset_tree_window_sizer->Add(m_preset_tree_panel, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10)); m_preset_tree_window_sizer->Add(m_preset_tree_panel, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(10));
m_preset_tree_window->SetSizerAndFit(m_preset_tree_window_sizer); m_preset_tree_window->SetSizerAndFit(m_preset_tree_window_sizer);
filament_preset_tree_sizer->Add(m_preset_tree_window, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(10)); filament_preset_tree_sizer->Add(m_preset_tree_window, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(10));

2
src/slic3r/GUI/CreatePresetsDialog.hpp
View File

@ -387,7 +387,7 @@ private:
wxBoxSizer * m_preset_tree_sizer = nullptr; wxBoxSizer * m_preset_tree_sizer = nullptr;
wxPanel * m_preset_tree_panel = nullptr; wxPanel * m_preset_tree_panel = nullptr;
wxScrolledWindow * m_preset_tree_window = nullptr; wxScrolledWindow * m_preset_tree_window = nullptr;
wxBoxSizer * m_preset_tree_window_sizer = nullptr; wxBoxSizer * m_main_sizer = nullptr;
int m_need_delete_preset_index = -1; int m_need_delete_preset_index = -1;
int m_need_edit_preset_index = -1; int m_need_edit_preset_index = -1;
std::string m_selected_printer = ""; std::string m_selected_printer = "";