diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index ac91d8619..f195066c0 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -1099,26 +1099,26 @@ void AuxiliaryPanel::update_all_cover() wxBoxSizer *m_sizer_body = new wxBoxSizer(wxVERTICAL); wxBoxSizer *m_sizer_designer = new wxBoxSizer(wxHORIZONTAL); - auto m_text_designer = new wxStaticText(this, wxID_ANY, _L("Author"), wxDefaultPosition, wxSize(120, -1), 0); + auto m_text_designer = new wxStaticText(this, wxID_ANY, _L("Author"), wxDefaultPosition, wxSize(180, -1), 0); m_text_designer->Wrap(-1); m_text_designer->SetForegroundColour(*wxBLACK); m_sizer_designer->Add(m_text_designer, 0, wxALIGN_CENTER, 0); m_input_designer = new ::TextInput(this, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(450), FromDIP(30)), wxTE_PROCESS_ENTER); m_input_designer->GetTextCtrl()->SetFont(::Label::Body_14); - m_input_designer->GetTextCtrl()->SetSize(wxSize(FromDIP(450), FromDIP(22))); + m_input_designer->GetTextCtrl()->SetSize(wxSize(FromDIP(450), -1)); m_sizer_designer->Add(m_input_designer, 0, wxALIGN_CENTER, 0); wxBoxSizer *m_sizer_model_name = new wxBoxSizer(wxHORIZONTAL); - auto m_text_model_name = new wxStaticText(this, wxID_ANY, _L("Model Name"), wxDefaultPosition, wxSize(120, -1), 0); + auto m_text_model_name = new wxStaticText(this, wxID_ANY, _L("Model Name"), wxDefaultPosition, wxSize(180, -1), 0); m_text_model_name->SetForegroundColour(*wxBLACK); m_text_model_name->Wrap(-1); m_sizer_model_name->Add(m_text_model_name, 0, wxALIGN_CENTER, 0); m_imput_model_name = new ::TextInput(this, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition,wxSize(FromDIP(450),FromDIP(30)), wxTE_PROCESS_ENTER); m_imput_model_name->GetTextCtrl()->SetFont(::Label::Body_14); - m_imput_model_name->GetTextCtrl()->SetSize(wxSize(FromDIP(450), FromDIP(22))); + m_imput_model_name->GetTextCtrl()->SetSize(wxSize(FromDIP(450), -1)); m_sizer_model_name->Add(m_imput_model_name, 0, wxALIGN_CENTER, 0); /* @@ -1224,8 +1224,8 @@ void DesignerPanel::update_info() void DesignerPanel::msw_rescale() { - m_input_designer->GetTextCtrl()->SetSize(wxSize(FromDIP(450), FromDIP(22))); - m_imput_model_name->GetTextCtrl()->SetSize(wxSize(FromDIP(450), FromDIP(22))); + m_input_designer->GetTextCtrl()->SetSize(wxSize(FromDIP(450), -1)); + m_imput_model_name->GetTextCtrl()->SetSize(wxSize(FromDIP(450), -1)); } }} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index bd140c450..e797fdb76 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -956,9 +956,10 @@ void PreferencesDialog::create_shortcuts_page() sizer_page->Fit(page); } -wxBoxSizer* PreferencesDialog::create_debug_page() +wxWindow* PreferencesDialog::create_debug_page() { - //wxBoxSizer *sizer_page = new wxBoxSizer(wxVERTICAL); + auto page = new wxWindow(m_scrolledWindow, wxID_ANY); + page->SetBackgroundColour(*wxWHITE); m_developer_mode_def = app_config->get("developer_mode"); m_dump_video_def = app_config->get("dump_video"); @@ -967,19 +968,19 @@ wxBoxSizer* PreferencesDialog::create_debug_page() wxBoxSizer *bSizer = new wxBoxSizer(wxVERTICAL); - auto title_develop_mode = create_item_title(_L("Develop mode"), m_scrolledWindow, _L("Develop mode")); - auto item_develop_mode = create_item_checkbox(_L("Develop mode"), m_scrolledWindow, _L("Develop mode"), 50, "developer_mode"); - auto item_dump_video = create_item_checkbox(_L("Dump video"), m_scrolledWindow, _L("Dump video"), 50, "dump_video"); + auto title_develop_mode = create_item_title(_L("Develop mode"), page, _L("Develop mode")); + auto item_develop_mode = create_item_checkbox(_L("Develop mode"), page, _L("Develop mode"), 50, "developer_mode"); + auto item_dump_video = create_item_checkbox(_L("Dump video"), page, _L("Dump video"), 50, "dump_video"); - auto title_log_level = create_item_title(_L("Log Level"), m_scrolledWindow, _L("Log Level")); + auto title_log_level = create_item_title(_L("Log Level"), page, _L("Log Level")); auto log_level_list = std::vector{_L("fatal"), _L("error"), _L("warning"), _L("info"), _L("debug"), _L("trace")}; - auto loglevel_combox = create_item_loglevel_combobox(_L("Log Level"), m_scrolledWindow, _L("Log Level"), log_level_list); + auto loglevel_combox = create_item_loglevel_combobox(_L("Log Level"), page, _L("Log Level"), log_level_list); - auto title_host = create_item_title(_L("Host Setting"), m_scrolledWindow, _L("Host Setting")); - auto radio1 = create_item_radiobox(_L("DEV host: api-dev.bambu-lab.com/v1"), m_scrolledWindow, wxEmptyString, 50, 1, "dev_host"); - auto radio2 = create_item_radiobox(_L("QA host: api-qa.bambu-lab.com/v1"), m_scrolledWindow, wxEmptyString, 50, 1, "qa_host"); - auto radio3 = create_item_radiobox(_L("PRE host: api-pre.bambu-lab.com/v1"), m_scrolledWindow, wxEmptyString, 50, 1, "pre_host"); - auto radio4 = create_item_radiobox(_L("Product host"), m_scrolledWindow, wxEmptyString, 50, 1, "product_host"); + auto title_host = create_item_title(_L("Host Setting"), page, _L("Host Setting")); + auto radio1 = create_item_radiobox(_L("DEV host: api-dev.bambu-lab.com/v1"), page, wxEmptyString, 50, 1, "dev_host"); + auto radio2 = create_item_radiobox(_L("QA host: api-qa.bambu-lab.com/v1"), page, wxEmptyString, 50, 1, "qa_host"); + auto radio3 = create_item_radiobox(_L("PRE host: api-pre.bambu-lab.com/v1"), page, wxEmptyString, 50, 1, "pre_host"); + auto radio4 = create_item_radiobox(_L("Product host"), page, wxEmptyString, 50, 1, "product_host"); if (m_iot_environment_def == ENV_DEV_HOST) { on_select_radio("dev_host"); @@ -997,7 +998,7 @@ wxBoxSizer* PreferencesDialog::create_debug_page() std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Normal)); StateColor btn_bd_white(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(wxColour(38, 46, 48), StateColor::Enabled)); - Button* debug_button = new Button(m_scrolledWindow, _L("debug save button")); + Button* debug_button = new Button(page, _L("debug save button")); debug_button->SetBackgroundColor(btn_bg_white); debug_button->SetBorderColor(btn_bd_white); debug_button->SetFont(Label::Body_13); @@ -1066,7 +1067,9 @@ wxBoxSizer* PreferencesDialog::create_debug_page() wxGetApp().request_user_logout(); agent->set_country_code(country_code); } - wxMessageBox(_L("Switch cloud environment, Please login again!")); + ConfirmBeforeSendDialog confirm_dlg(this, wxID_ANY, _L("Warning"), ConfirmBeforeSendDialog::ButtonStyle::ONLY_CONFIRM); + confirm_dlg.update_text(_L("Switch cloud environment, Please login again!")); + confirm_dlg.on_show(); } // bbs backup @@ -1101,7 +1104,11 @@ wxBoxSizer* PreferencesDialog::create_debug_page() bSizer->Add(radio3, 0, wxEXPAND | wxTOP, FromDIP(3)); bSizer->Add(radio4, 0, wxEXPAND | wxTOP, FromDIP(3)); bSizer->Add(debug_button, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(15)); - return bSizer; + + page->SetSizer(bSizer); + page->Layout(); + bSizer->Fit(page); + return page; } void PreferencesDialog::on_select_radio(std::string param) diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp index 003f5337b..cd497110d 100644 --- a/src/slic3r/GUI/Preferences.hpp +++ b/src/slic3r/GUI/Preferences.hpp @@ -122,7 +122,7 @@ public: void create_gui_page(); void create_sync_page(); void create_shortcuts_page(); - wxBoxSizer* create_debug_page(); + wxWindow* create_debug_page(); void on_select_radio(std::string param); wxString get_select_radio(int groupid);