diff --git a/resources/web/homepage3/css/left.css b/resources/web/homepage3/css/left.css index cefedb1..248ea1e 100644 --- a/resources/web/homepage3/css/left.css +++ b/resources/web/homepage3/css/left.css @@ -92,8 +92,8 @@ body #Login1 { - height:36px; - line-height: 36px; + height:48px; + line-height: 48px; display: flex; justify-content: center; user-select: none; @@ -132,7 +132,7 @@ body #QDTIcon { - height:36px; + height:48px; } #Login2 @@ -147,6 +147,8 @@ body #UserAvatarIcon { height: 85px; + border-radius: 50%; + overflow: hidden; } #UserName diff --git a/resources/web/homepage3/js/left.js b/resources/web/homepage3/js/left.js index 90b692b..f7cf675 100644 --- a/resources/web/homepage3/js/left.js +++ b/resources/web/homepage3/js/left.js @@ -138,13 +138,13 @@ function SetLoginInfo( strAvatar, strName ) $("#UserName").text(strName); - let OriginAvatar=$("#Login2 #UserAvatarIconLogin").prop("src"); + let OriginAvatar=$("#Login2 #UserAvatarIcon").prop("src"); if(strAvatar!=OriginAvatar && strAvatar.length != 0) { - $("#Login2 #UserAvatarIconLogin").prop("src",strAvatar); + $("#Login2 #UserAvatarIcon").prop("src",strAvatar); } else - $("#Login2 #UserAvatarIconLogin").prop("src", "../image/userdark.png"); + $("#Login2 #UserAvatarIcon").prop("src", "../image/userdark.png"); $("#Login2").show(); $("#Login2").css("display","flex"); @@ -152,7 +152,7 @@ function SetLoginInfo( strAvatar, strName ) function SetUserOffline() { - $("#UserAvatarIconLogin").prop("src","../image/logo2.png"); + $("#UserAvatarIcon").prop("src","../image/logo2.png"); $("#UserName").text(''); $("#Login2").hide(); diff --git a/resources/web/homepage3/left.html b/resources/web/homepage3/left.html index 7bf3ea8..fc021bf 100644 --- a/resources/web/homepage3/left.html +++ b/resources/web/homepage3/left.html @@ -21,58 +21,14 @@
- -
- -
-
- Logo -
-
- login/register -
-
+
+
+
login/register
- +
log out
@@ -87,7 +43,7 @@
-
Home
+
Home
@@ -117,9 +73,9 @@
- - +
+ diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index e2e09d0..550f9d7 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -44,9 +44,9 @@ void AMSMaterialsSetting::create() m_button_confirm = new Button(this, _L("Confirm")); // y96 - m_btn_bg_green = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + m_btn_bg_blue = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_confirm->SetBackgroundColor(m_btn_bg_green); + m_button_confirm->SetBackgroundColor(m_btn_bg_blue); m_button_confirm->SetBorderColor(wxColour(68, 121, 251)); // y96 m_button_confirm->SetTextColor(wxColour("#FFFFFE")); m_button_confirm->SetMinSize(AMS_MATERIALS_SETTING_BUTTON_SIZE); @@ -1070,7 +1070,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt) return; } else { - m_button_confirm->SetBackgroundColor(m_btn_bg_green); + m_button_confirm->SetBackgroundColor(m_btn_bg_blue); m_button_confirm->SetBorderColor(wxColour(68, 121, 251)); m_button_confirm->SetTextColor(wxColour("#FFFFFE")); m_button_confirm->Enable(true); diff --git a/src/slic3r/GUI/AMSMaterialsSetting.hpp b/src/slic3r/GUI/AMSMaterialsSetting.hpp index c058ac7..c282fdd 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.hpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.hpp @@ -147,7 +147,7 @@ protected: void update_widgets(); protected: - StateColor m_btn_bg_green; + StateColor m_btn_bg_blue; StateColor m_btn_bg_gray; wxPanel * m_panel_normal; wxPanel * m_panel_SN; diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index ff54185..738ec16 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -1320,7 +1320,7 @@ void AmsReplaceMaterialDialog::create() std::pair(wxColour(38, 46, 48), StateColor::Enabled)); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Normal)); + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_button_sizer->Add( 0, 0, 1, wxEXPAND, 0 ); m_main_sizer->Add(0,0,0, wxTOP, FromDIP(12)); diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index a58cbaf..23d0b41 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -136,11 +136,11 @@ PingCodeBindDialog::PingCodeBindDialog(Plater* plater /*= nullptr*/) m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_button_bind = new Button(request_bind_panel, _L("Confirm")); - StateColor btn_bg_green(std::pair(wxColour(206, 206, 206), StateColor::Disabled), + StateColor btn_bg_blue(std::pair(wxColour(206, 206, 206), StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_bind->SetBackgroundColor(btn_bg_green); + m_button_bind->SetBackgroundColor(btn_bg_blue); m_button_bind->SetBorderColor(*wxWHITE); m_button_bind->SetTextColor(wxColour("#FFFFFE")); m_button_bind->SetSize(BIND_DIALOG_BUTTON_SIZE); @@ -676,11 +676,11 @@ PingCodeBindDialog::~PingCodeBindDialog() { m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_button_bind = new Button(button_panel, _L("Confirm")); - StateColor btn_bg_green(std::pair(wxColour(206, 206, 206), StateColor::Disabled), + StateColor btn_bg_blue(std::pair(wxColour(206, 206, 206), StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_bind->SetBackgroundColor(btn_bg_green); + m_button_bind->SetBackgroundColor(btn_bg_blue); m_button_bind->SetBorderColor(*wxWHITE); m_button_bind->SetTextColor(wxColour("#FFFFFE")); m_button_bind->SetSize(BIND_DIALOG_BUTTON_SIZE); @@ -1032,9 +1032,9 @@ UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/) m_sizer_button->Add(0, 0, 1, wxEXPAND, 5); m_button_unbind = new Button(this, _L("Confirm")); - StateColor btn_bg_green(std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_unbind->SetBackgroundColor(btn_bg_green); + m_button_unbind->SetBackgroundColor(btn_bg_blue); m_button_unbind->SetBorderColor(wxColour(68, 121, 251)); m_button_unbind->SetTextColor(wxColour("#FFFFFE")); m_button_unbind->SetSize(BIND_DIALOG_BUTTON_SIZE); diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 414f526..a2f502d 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -74,10 +74,10 @@ HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector& Button * mew_btn = new Button(scroll_window, _L("New")); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); mew_btn->SetBackgroundColour(*wxWHITE); - mew_btn->SetBackgroundColor(btn_bg_green); + mew_btn->SetBackgroundColor(btn_bg_blue); mew_btn->SetBorderColor(wxColour(68, 121, 251)); mew_btn->SetTextColor(wxColour("#FFFFFE")); mew_btn->SetMinSize(wxSize(FromDIP(100), FromDIP(24))); @@ -322,11 +322,11 @@ void HistoryWindow::sync_history_data() { }); auto edit_button = new Button(m_history_data_panel, _L("Edit")); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); edit_button->SetBackgroundColour(*wxWHITE); - edit_button->SetBackgroundColor(btn_bg_green); + edit_button->SetBackgroundColor(btn_bg_blue); edit_button->SetBorderColor(wxColour(68, 121, 251)); edit_button->SetTextColor(wxColour("#FFFFFE")); edit_button->SetMinSize(wxSize(-1, FromDIP(24))); @@ -438,11 +438,11 @@ EditCalibrationHistoryDialog::EditCalibrationHistoryDialog(wxWindow* parent, con auto btn_sizer = new wxBoxSizer(wxHORIZONTAL); Button* save_btn = new Button(top_panel, _L("Save")); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); save_btn->SetBackgroundColour(*wxWHITE); - save_btn->SetBackgroundColor(btn_bg_green); + save_btn->SetBackgroundColor(btn_bg_blue); save_btn->SetBorderColor(wxColour(68, 121, 251)); save_btn->SetTextColor(wxColour("#FFFFFE")); save_btn->SetMinSize(wxSize(-1, FromDIP(24))); @@ -654,10 +654,10 @@ NewCalibrationHistoryDialog::NewCalibrationHistoryDialog(wxWindow *parent, const auto btn_sizer = new wxBoxSizer(wxHORIZONTAL); Button * ok_btn = new Button(top_panel, _L("Ok")); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); ok_btn->SetBackgroundColour(*wxWHITE); - ok_btn->SetBackgroundColor(btn_bg_green); + ok_btn->SetBackgroundColor(btn_bg_blue); ok_btn->SetBorderColor(wxColour(68, 121, 251)); ok_btn->SetTextColor(wxColour("#FFFFFE")); ok_btn->SetMinSize(wxSize(-1, FromDIP(24))); diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index 2a3c213..a083d60 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -138,13 +138,13 @@ CalibrationDialog::CalibrationDialog(Plater *plater) calibration_panel->Layout(); calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0); // y96 - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); - StateColor btn_bd_green(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); + StateColor btn_bd_blue(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); m_calibration_btn = new Button(cali_right_panel, _L("Start Calibration")); - m_calibration_btn->SetBackgroundColor(btn_bg_green); - m_calibration_btn->SetBorderColor(btn_bd_green); + m_calibration_btn->SetBackgroundColor(btn_bg_blue); + m_calibration_btn->SetBorderColor(btn_bd_blue); m_calibration_btn->SetTextColor(wxColour("#FFFFFE")); m_calibration_btn->SetSize(wxSize(FromDIP(128), FromDIP(26))); m_calibration_btn->SetMinSize(wxSize(FromDIP(128), FromDIP(26))); diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index 0365a3c..9565b65 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -86,7 +86,7 @@ CaliPageButton::CaliPageButton(wxWindow* parent, CaliPageActionType type, wxStri Button(parent, text) { // y96 - StateColor btn_bg_green(std::pair(wxColour(206, 206, 206), StateColor::Disabled), + StateColor btn_bg_blue(std::pair(wxColour(206, 206, 206), StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); @@ -96,13 +96,13 @@ CaliPageButton::CaliPageButton(wxWindow* parent, CaliPageActionType type, wxStri std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(wxColour(255, 255, 255), StateColor::Normal)); - StateColor btn_bd_green(std::pair(wxColour(255, 255, 254), StateColor::Disabled), + StateColor btn_bd_blue(std::pair(wxColour(255, 255, 254), StateColor::Disabled), std::pair(wxColour(68, 121, 251), StateColor::Enabled)); StateColor btn_bd_white(std::pair(wxColour(255, 255, 254), StateColor::Disabled), std::pair(wxColour(38, 46, 48), StateColor::Enabled)); - StateColor btn_text_green(std::pair(wxColour(255, 255, 254), StateColor::Disabled), + StateColor btn_text_blue(std::pair(wxColour(255, 255, 254), StateColor::Disabled), std::pair(wxColour(255, 255, 254), StateColor::Enabled)); StateColor btn_text_white(std::pair(wxColour(255, 255, 254), StateColor::Disabled), @@ -162,9 +162,9 @@ CaliPageButton::CaliPageButton(wxWindow* parent, CaliPageActionType type, wxStri case CaliPageActionType::CALI_ACTION_PA_TOWER: case CaliPageActionType::CALI_ACTION_FLOW_COARSE: case CaliPageActionType::CALI_ACTION_FLOW_FINE: - SetBackgroundColor(btn_bg_green); - SetBorderColor(btn_bd_green); - SetTextColor(btn_text_green); + SetBackgroundColor(btn_bg_blue); + SetBorderColor(btn_bd_blue); + SetTextColor(btn_text_blue); break; default: break; diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index debca10..3b2255a 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -922,11 +922,11 @@ wxBoxSizer *CreateFilamentPresetDialog::create_button_item() wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL); bSizer_button->Add(0, 0, 1, wxEXPAND, 0); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_button_create = new Button(this, _L("Create")); - m_button_create->SetBackgroundColor(btn_bg_green); + m_button_create->SetBackgroundColor(btn_bg_blue); m_button_create->SetBorderColor(*wxWHITE); m_button_create->SetTextColor(wxColour(0xFFFFFE)); m_button_create->SetFont(Label::Body_12); @@ -1943,11 +1943,11 @@ wxBoxSizer *CreatePrinterPresetDialog::create_page1_btns_item(wxWindow *parent) wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL); bSizer_button->Add(0, 0, 1, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_button_OK = new Button(parent, _L("OK")); - m_button_OK->SetBackgroundColor(btn_bg_green); + m_button_OK->SetBackgroundColor(btn_bg_blue); m_button_OK->SetBorderColor(*wxWHITE); m_button_OK->SetTextColor(wxColour(0xFFFFFE)); m_button_OK->SetFont(Label::Body_12); @@ -2524,7 +2524,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_page2_btns_item(wxWindow *parent) wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL); bSizer_button->Add(0, 0, 1, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), @@ -2542,7 +2542,7 @@ wxBoxSizer *CreatePrinterPresetDialog::create_page2_btns_item(wxWindow *parent) m_button_page2_back->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) { show_page1(); }); m_button_create = new Button(parent, _L("Create")); - m_button_create->SetBackgroundColor(btn_bg_green); + m_button_create->SetBackgroundColor(btn_bg_blue); m_button_create->SetBorderColor(*wxWHITE); m_button_create->SetTextColor(wxColour(0xFFFFFE)); m_button_create->SetFont(Label::Body_12); @@ -3253,12 +3253,12 @@ CreatePresetSuccessfulDialog::CreatePresetSuccessfulDialog(wxWindow *parent, con case FILAMENT: m_button_ok = sync_user_preset_need_enabled ? new Button(this, _L("Sync user presets")) : new Button(this, _L("OK")); break; } - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(wxColour(*wxWHITE)); m_button_ok->SetTextColor(wxColour(*wxWHITE)); m_button_ok->SetFont(Label::Body_12); @@ -4125,11 +4125,11 @@ wxBoxSizer *ExportConfigsDialog::create_button_item(wxWindow* parent) wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL); bSizer_button->Add(0, 0, 1, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); @@ -4694,11 +4694,11 @@ wxBoxSizer *EditFilamentPresetDialog::create_button_sizer() bSizer_button->Add(0, 0, 1, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_ok_btn = new Button(this, _L("OK")); - m_ok_btn->SetBackgroundColor(btn_bg_green); + m_ok_btn->SetBackgroundColor(btn_bg_blue); m_ok_btn->SetBorderColor(*wxWHITE); m_ok_btn->SetTextColor(wxColour(0xFFFFFE)); m_ok_btn->SetFont(Label::Body_12); @@ -4894,11 +4894,11 @@ wxBoxSizer *CreatePresetForPrinterDialog::create_button_sizer() bSizer_button->Add(0, 0, 1, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_ok_btn = new Button(this, _L("OK")); - m_ok_btn->SetBackgroundColor(btn_bg_green); + m_ok_btn->SetBackgroundColor(btn_bg_blue); m_ok_btn->SetBorderColor(*wxWHITE); m_ok_btn->SetTextColor(wxColour(0xFFFFFE)); m_ok_btn->SetFont(Label::Body_12); @@ -5044,7 +5044,7 @@ wxPanel *PresetTree::get_child_item(wxPanel *parent, std::shared_ptr pre StateColor flush_bd_col(std::pair(wxColour(68, 121, 251), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Hovered), std::pair(wxColour(172, 172, 172), StateColor::Normal)); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); Button *edit_preset_btn = new Button(panel, _L("Edit Preset")); @@ -5063,8 +5063,8 @@ wxPanel *PresetTree::get_child_item(wxPanel *parent, std::shared_ptr pre del_preset_btn->SetPaddingSize(wxSize(8, 3)); del_preset_btn->SetCornerRadius(8); if (base_id_error) { - del_preset_btn->SetBackgroundColor(btn_bg_green); - del_preset_btn->SetBorderColor(btn_bg_green); + del_preset_btn->SetBackgroundColor(btn_bg_blue); + del_preset_btn->SetBorderColor(btn_bg_blue); del_preset_btn->SetTextColor(wxColour(0xFFFFFE)); } else { del_preset_btn->SetBackgroundColor(flush_bg_col); diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index 8f115fb..69985f8 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -172,9 +172,9 @@ void ExtrusionCalibration::create() m_button_cali = new Button(m_step_1_panel, _L("Start calibration")); // y96 - m_btn_bg_green = StateColor(std::pair(wxColour(238, 238, 238), StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + m_btn_bg_blue = StateColor(std::pair(wxColour(238, 238, 238), StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_cali->SetBackgroundColor(m_btn_bg_green); + m_button_cali->SetBackgroundColor(m_btn_bg_blue); m_button_cali->SetFont(Label::Body_13); m_button_cali->SetBorderColor({ std::pair(wxColour(238, 238, 238), StateColor::Disabled), std::pair(wxColour(68, 121, 251), StateColor::Enabled) }); m_button_cali->SetTextColor({ std::pair(wxColour(172, 172, 172), StateColor::Disabled), std::pair(EXTRUSION_CALIBRATION_GREY200, StateColor::Enabled) }); @@ -183,9 +183,9 @@ void ExtrusionCalibration::create() m_button_cali->Bind(wxEVT_BUTTON, &ExtrusionCalibration::on_click_cali, this); m_cali_cancel = new Button(m_step_1_panel, _L("Cancel")); - m_btn_bg_green = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + m_btn_bg_blue = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_cali_cancel->SetBackgroundColor(m_btn_bg_green); + m_cali_cancel->SetBackgroundColor(m_btn_bg_blue); m_cali_cancel->SetBorderColor(wxColour(68, 121, 251)); m_cali_cancel->SetTextColor(EXTRUSION_CALIBRATION_GREY200); m_cali_cancel->SetMinSize(EXTRUSION_CALIBRATION_BUTTON_SIZE); @@ -258,9 +258,9 @@ void ExtrusionCalibration::create() // save button m_button_save_result = new Button(m_step_2_panel, _L("Save")); - m_btn_bg_green = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + m_btn_bg_blue = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_save_result->SetBackgroundColor(m_btn_bg_green); + m_button_save_result->SetBackgroundColor(m_btn_bg_blue); m_button_save_result->SetFont(Label::Body_13); m_button_save_result->SetBorderColor(wxColour(68, 121, 251)); m_button_save_result->SetTextColor(EXTRUSION_CALIBRATION_GREY200); diff --git a/src/slic3r/GUI/ExtrusionCalibration.hpp b/src/slic3r/GUI/ExtrusionCalibration.hpp index a1655ca..4a6f71f 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.hpp +++ b/src/slic3r/GUI/ExtrusionCalibration.hpp @@ -91,7 +91,7 @@ protected: int get_bed_temp(DynamicPrintConfig* config); protected: - StateColor m_btn_bg_green; + StateColor m_btn_bg_blue; StateColor m_btn_bg_gray; wxPanel* m_step_1_panel; diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index fee9fcc..f7bfe6d 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4170,13 +4170,13 @@ std::string GUI_App::handle_web_request(std::string cmd) #endif } else if (command_str.compare("homepage_login_or_register") == 0) { - //Check Plugin - bool bValid = is_compatibility_version(); - if (!bValid) { - CallAfter([this] { handle_web_request("{\"sequence_id\":1,\"command\":\"homepage_need_networkplugin\"}"); - }); - return ""; - } + ////Check Plugin + //bool bValid = is_compatibility_version(); + //if (!bValid) { + // CallAfter([this] { handle_web_request("{\"sequence_id\":1,\"command\":\"homepage_need_networkplugin\"}"); + // }); + // return ""; + //} if (root.get_child_optional("makerworld_model_id") != boost::none) { boost::optional ModelID = root.get_optional("makerworld_model_id"); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index a30936d..ed87aa1 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -693,10 +693,6 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ //53 Bind(wxEVT_ICONIZE, [this](wxIconizeEvent& event) { if (event.IsIconized()) { - if (m_printer_view->GetHasLoadUrl()) { - printer_view_ip = m_printer_view->GetWebIp(); - printer_view_url = m_printer_view->GetWeburl(); - } wxString url; if (m_printer_view->GetNetMode()) { url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir())); @@ -1110,11 +1106,6 @@ void MainFrame::init_tabpanel() } //y53 else if (new_sel != tpMonitor){ - if(m_printer_view->GetHasLoadUrl()){ - printer_view_ip = m_printer_view->GetWebIp(); - printer_view_url = m_printer_view->GetWeburl(); - is_net_url = m_printer_view->IsNetUrl(); - } wxString url; if (m_printer_view->GetNetMode()) { url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir())); diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index d520d75..769590e 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -565,14 +565,14 @@ wxBoxSizer *Newer3mfVersionDialog::get_btn_sizer() horizontal_sizer->Add(0, 0, 1, wxEXPAND, 0); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); bool file_version_newer = (*m_file_version) > (*m_cloud_version); if (!file_version_newer) { m_update_btn = new Button(this, _L("Update")); - m_update_btn->SetBackgroundColor(btn_bg_green); + m_update_btn->SetBackgroundColor(btn_bg_blue); m_update_btn->SetBorderColor(*wxWHITE); m_update_btn->SetTextColor(wxColour(0xFFFFFE)); m_update_btn->SetFont(Label::Body_12); @@ -599,7 +599,7 @@ wxBoxSizer *Newer3mfVersionDialog::get_btn_sizer() m_later_btn->SetBorderColor(wxColour(38, 46, 48)); } else { m_later_btn = new Button(this, _L("OK")); - m_later_btn->SetBackgroundColor(btn_bg_green); + m_later_btn->SetBackgroundColor(btn_bg_blue); m_later_btn->SetBorderColor(*wxWHITE); m_later_btn->SetTextColor(wxColour(0xFFFFFE)); } @@ -683,8 +683,8 @@ NetworkErrorDialog::NetworkErrorDialog(wxWindow* parent) e.Skip(); }); - auto bt_enable = StateColor(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(wxColour(0, 174, 66), StateColor::Normal)); + auto bt_enable = (std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_button_confirm = new Button(this, _L("Confirm")); m_button_confirm->SetBackgroundColor(bt_enable); diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 91ac479..0fbfbcd 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -62,10 +62,10 @@ TipsDialog::TipsDialog(wxWindow *parent, const wxString &title, const wxString & m_confirm = new Button(this, _L("OK")); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_confirm->SetBackgroundColor(btn_bg_green); + m_confirm->SetBackgroundColor(btn_bg_blue); m_confirm->SetBorderColor(wxColour(68, 121, 251)); m_confirm->SetTextColor(wxColour(255, 255, 255)); m_confirm->SetSize(TIPS_DIALOG_BUTTON_SIZE); diff --git a/src/slic3r/GUI/PhysicalPrinterDialog_1.cpp b/src/slic3r/GUI/PhysicalPrinterDialog_1.cpp index 91e6ccd..0d6bff9 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog_1.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog_1.cpp @@ -79,14 +79,14 @@ PhysicalPrinterDialog::PhysicalPrinterDialog(wxWindow* parent) : m_optgroup = new ConfigOptionsGroup(this, _L("Print Host upload"), m_config); build_printhost_settings(m_optgroup); auto button_sizer = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(*wxWHITE); m_button_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/PlateSettingsDialog.cpp b/src/slic3r/GUI/PlateSettingsDialog.cpp index ee53d2c..9c34243 100644 --- a/src/slic3r/GUI/PlateSettingsDialog.cpp +++ b/src/slic3r/GUI/PlateSettingsDialog.cpp @@ -451,14 +451,14 @@ PlateSettingsDialog::PlateSettingsDialog(wxWindow* parent, const wxString& title auto sizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour("#FFFFFE")); m_button_ok->SetFont(Label::Body_12); @@ -656,14 +656,14 @@ PlateNameEditDialog::PlateNameEditDialog(wxWindow *parent, wxWindowID id, const m_sizer_main->Add(top_sizer, 0, wxEXPAND | wxALL, FromDIP(30)); auto sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour("#FFFFFE")); m_button_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index e3e86d0..03ccf8d 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -7471,6 +7471,8 @@ void Plater::priv::on_action_print_plate(SimpleEvent&) std::string send_apikey = dlg->get_machine_apikey(); std::string project_name = dlg->get_project_name(); bool is_net_machine = dlg->GetMachineNetMode(); + std::string link_url = ""; + bool is_special_machine = false; if (project_name.find(".gcode") == std::string::npos) { @@ -7484,12 +7486,8 @@ void Plater::priv::on_action_print_plate(SimpleEvent&) upload_job.create_time = std::chrono::system_clock::now(); upload_job.sendinginterval = m_sending_interval; export_gcode(fs::path(), false, std::move(upload_job)); - std::string link_url = dlg->GetMachineLinkUrl(); - bool is_special_machine = dlg->isSpecialMachine(); - wxGetApp().mainframe->m_printer_view->FormatNetUrl(link_url, show_ip, is_special_machine); - wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); - wxGetApp().app_config->set("machine_list_net", "1"); - wxGetApp().mainframe->m_printer_view->ShowNetPrinterButton(); + link_url = dlg->GetMachineLinkUrl(); + is_special_machine = dlg->isSpecialMachine(); } else { @@ -7503,14 +7501,23 @@ void Plater::priv::on_action_print_plate(SimpleEvent&) upload_job.create_time = std::chrono::system_clock::now(); upload_job.sendinginterval = m_sending_interval; export_gcode(fs::path(), false, std::move(upload_job)); - wxGetApp().mainframe->m_printer_view->FormatUrl(send_ip); - wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); - wxGetApp().app_config->set("machine_list_net", "0"); - wxGetApp().mainframe->m_printer_view->ShowLocalPrinterButton(); } bool is_switch_to_device = wxGetApp().app_config->get("switch to device tab after upload") == "true" ? true : false; - if (is_switch_to_device) + if (is_switch_to_device) { + if (is_net_machine) { + wxGetApp().mainframe->m_printer_view->FormatNetUrl(link_url, show_ip, is_special_machine); + wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); + wxGetApp().app_config->set("machine_list_net", "1"); + wxGetApp().mainframe->m_printer_view->ShowNetPrinterButton(); + } + else { + wxGetApp().mainframe->m_printer_view->FormatUrl(send_ip); + wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); + wxGetApp().app_config->set("machine_list_net", "0"); + wxGetApp().mainframe->m_printer_view->ShowLocalPrinterButton(); + } wxGetApp().mainframe->select_tab(size_t(3)); + } } //if (!m_select_machine_dlg) m_select_machine_dlg = new SelectMachineDialog(q); //m_select_machine_dlg->set_print_type(PrintFromType::FROM_NORMAL); @@ -7765,6 +7772,8 @@ void Plater::priv::on_action_export_to_sdcard(SimpleEvent&) std::string send_apikey = dlg->get_machine_apikey(); std::string project_name = dlg->get_project_name(); bool is_net_machine = dlg->GetMachineNetMode(); + std::string link_url = ""; + bool is_special_machine = false; if (project_name.find(".gcode") == std::string::npos) { @@ -7778,12 +7787,8 @@ void Plater::priv::on_action_export_to_sdcard(SimpleEvent&) upload_job.create_time = std::chrono::system_clock::now(); upload_job.sendinginterval = m_sending_interval; export_gcode(fs::path(), false, std::move(upload_job)); - std::string link_url = dlg->GetMachineLinkUrl(); - bool is_special_machine = dlg->isSpecialMachine(); - wxGetApp().mainframe->m_printer_view->FormatNetUrl(link_url, show_ip, is_special_machine); - wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); - wxGetApp().app_config->set("machine_list_net", "1"); - wxGetApp().mainframe->m_printer_view->ShowNetPrinterButton(); + link_url = dlg->GetMachineLinkUrl(); + is_special_machine = dlg->isSpecialMachine(); } else { @@ -7797,15 +7802,23 @@ void Plater::priv::on_action_export_to_sdcard(SimpleEvent&) upload_job.create_time = std::chrono::system_clock::now(); upload_job.sendinginterval = m_sending_interval; export_gcode(fs::path(), false, std::move(upload_job)); - wxGetApp().mainframe->m_printer_view->FormatUrl(send_ip); - wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); - wxGetApp().app_config->set("machine_list_net", "0"); - wxGetApp().mainframe->m_printer_view->ShowLocalPrinterButton(); } bool is_switch_to_device = wxGetApp().app_config->get("switch to device tab after upload") == "true" ? true : false; - if (is_switch_to_device) + if (is_switch_to_device) { + if (is_net_machine) { + wxGetApp().mainframe->m_printer_view->FormatNetUrl(link_url, show_ip, is_special_machine); + wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); + wxGetApp().app_config->set("machine_list_net", "1"); + wxGetApp().mainframe->m_printer_view->ShowNetPrinterButton(); + } + else { + wxGetApp().mainframe->m_printer_view->FormatUrl(send_ip); + wxGetApp().mainframe->m_printer_view->SetToggleBar(is_net_machine); + wxGetApp().app_config->set("machine_list_net", "0"); + wxGetApp().mainframe->m_printer_view->ShowLocalPrinterButton(); + } wxGetApp().mainframe->select_tab(size_t(3)); - + } } } @@ -11324,10 +11337,10 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename) m_confirm = new Button(this, _L("OK")); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_confirm->SetBackgroundColor(btn_bg_green); + m_confirm->SetBackgroundColor(btn_bg_blue); m_confirm->SetBorderColor(wxColour(68, 121, 251)); m_confirm->SetTextColor(wxColour("#FFFFFE")); m_confirm->SetSize(PROJECT_DROP_DIALOG_BUTTON_SIZE); diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 1bf11ee..56e178e 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -492,13 +492,17 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) wxGetApp().set_devices(devices); #endif // y28 - if (webisNetMode == isNetWeb) - webisNetMode = isDisconnect; + webisNetMode = isDisconnect; + if (wxGetApp().mainframe) { + wxGetApp().mainframe->is_net_url = false; + wxGetApp().mainframe->printer_view_ip = ""; + wxGetApp().mainframe->printer_view_url = ""; + } m_user_head_name = ""; - SetPresetChanged(true); - UpdateState(); - wxGetApp().get_login_info(); - } + SetPresetChanged(true); + UpdateState(); + wxGetApp().get_login_info(); + } } @@ -1007,8 +1011,6 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) webisNetMode = isDisconnect; m_web = url; m_ip = ""; - //y53 - has_load_url = false; m_browser->LoadURL(url); UpdateState(); } @@ -1018,8 +1020,6 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) if (m_browser == nullptr || m_web == url) return; m_web = url; - //y53 - has_load_url = true; m_browser->LoadURL(url); //y28 webisNetMode = isLocalWeb; @@ -1040,6 +1040,11 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) else button->SetIsSelected(false); } + if (wxGetApp().mainframe) { + wxGetApp().mainframe->is_net_url = false; + wxGetApp().mainframe->printer_view_ip = m_ip; + wxGetApp().mainframe->printer_view_url = m_web; + } UpdateState(); } void PrinterWebView::load_net_url(wxString& url, wxString& ip) @@ -1049,8 +1054,6 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) // y13 m_web = url; m_ip = ip; - //y53 - has_load_url = true; m_browser->LoadURL(m_web); //y28 webisNetMode = isNetWeb; @@ -1064,6 +1067,11 @@ wxBoxSizer *PrinterWebView::init_menu_bar(wxPanel *Panel) else button->SetIsSelected(false); } + if (wxGetApp().mainframe) { + wxGetApp().mainframe->is_net_url = true; + wxGetApp().mainframe->printer_view_ip = m_ip; + wxGetApp().mainframe->printer_view_url = m_web; + } UpdateState(); } void PrinterWebView::UpdateState() diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 5f984b8..7ef88a9 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -129,7 +129,6 @@ public: //y53 wxString GetWebIp(){return m_ip;}; - bool GetHasLoadUrl(){return has_load_url;}; bool IsNetUrl() {return webisNetMode == isNetWeb;}; void load_disconnect_url(wxString& url); void FormatNetUrl(std::string link_url, std::string local_ip, bool isSpecialMachine); @@ -181,8 +180,6 @@ private: std::set m_exit_host; std::string m_user_head_name; //y33 bool m_isfluidd_1; //y35 - //y53 - bool has_load_url; }; // y13 diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp index 491aa41..5b64841 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp @@ -67,7 +67,7 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const auto sizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(220, 220, 220), StateColor::Hovered), @@ -87,7 +87,7 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const //m_vebview_release_note->Bind(wxEVT_WEBVIEW_NAVIGATING , &PrivacyUpdateDialog::OnNavigating, this); m_button_ok = new Button(this, _L("Accept")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour("#FFFFFE")); m_button_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/PublishDialog.cpp b/src/slic3r/GUI/PublishDialog.cpp index e2fb3bb..c79a10b 100644 --- a/src/slic3r/GUI/PublishDialog.cpp +++ b/src/slic3r/GUI/PublishDialog.cpp @@ -87,14 +87,14 @@ PublishDialog::PublishDialog(Plater *plater) m_btn_cancel = new Button(this, _L("Cancel")); m_progress_sizer->Add(m_btn_cancel, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5)); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), // y96 + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), // y96 std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(255, 255, 255), StateColor::Normal)); StateColor text_color(std::pair(wxColour(255, 255, 255), StateColor::Pressed), std::pair(wxColour(255, 255, 255), StateColor::Hovered), std::pair(TEXT_LIGHT_GRAY, StateColor::Normal)); m_btn_cancel->SetFont(Label::Body_12); - m_btn_cancel->SetBackgroundColor(btn_bg_green); + m_btn_cancel->SetBackgroundColor(btn_bg_blue); m_btn_cancel->SetBorderColor(wxColour(68, 121, 251)); // y96 m_btn_cancel->SetTextColor(text_color); m_btn_cancel->SetSize(wxSize(FromDIP(60), FromDIP(20))); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 334edf3..36baf07 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -151,14 +151,14 @@ UpdatePluginDialog::UpdatePluginDialog(wxWindow* parent /*= nullptr*/) auto sizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); auto m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); @@ -321,14 +321,14 @@ UpdateVersionDialog::UpdateVersionDialog(wxWindow *parent) auto sizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); m_button_download = new Button(this, _L("Download")); - m_button_download->SetBackgroundColor(btn_bg_green); + m_button_download->SetBackgroundColor(btn_bg_blue); m_button_download->SetBorderColor(*wxWHITE); m_button_download->SetTextColor(wxColour("#FFFFFE")); m_button_download->SetFont(Label::Body_12); @@ -557,7 +557,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons auto bottom_sizer = new wxBoxSizer(wxVERTICAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - btn_bg_green = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + btn_bg_blue = StateColor(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); btn_bg_white = StateColor(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), @@ -576,7 +576,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons bottom_sizer->Add(checkbox_sizer, 0, wxBOTTOM | wxEXPAND, 0); } m_button_ok = new Button(this, _L("Confirm")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour("#FFFFFE")); m_button_ok->SetFont(Label::Body_12); @@ -593,7 +593,7 @@ SecondaryCheckDialog::SecondaryCheckDialog(wxWindow* parent, wxWindowID id, cons }); m_button_retry = new Button(this, _L("Retry")); - m_button_retry->SetBackgroundColor(btn_bg_green); + m_button_retry->SetBackgroundColor(btn_bg_blue); m_button_retry->SetBorderColor(*wxWHITE); m_button_retry->SetTextColor(wxColour("#FFFFFE")); m_button_retry->SetFont(Label::Body_12); @@ -1194,7 +1194,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id auto bottom_sizer = new wxBoxSizer(wxVERTICAL); auto sizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), @@ -1213,7 +1213,7 @@ ConfirmBeforeSendDialog::ConfirmBeforeSendDialog(wxWindow* parent, wxWindowID id bottom_sizer->Add(checkbox_sizer, 0, wxBOTTOM | wxEXPAND, 0); } m_button_ok = new Button(this, _L("Confirm")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour("#FFFFFE")); m_button_ok->SetFont(Label::Body_12); @@ -1429,10 +1429,10 @@ void ConfirmBeforeSendDialog::disable_button_ok() void ConfirmBeforeSendDialog::enable_button_ok() { m_button_ok->Enable(); - StateColor btn_bg_green(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); - m_button_ok->SetBackgroundColor(btn_bg_green); - m_button_ok->SetBorderColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); + m_button_ok->SetBorderColor(btn_bg_blue); } void ConfirmBeforeSendDialog::rescale() @@ -1594,14 +1594,14 @@ InputIpAddressDialog::InputIpAddressDialog(wxWindow *parent) auto m_sizer_button = new wxBoxSizer(wxHORIZONTAL); - StateColor btn_bg_green(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), std::pair(wxColour(238, 238, 238), StateColor::Hovered), std::pair(*wxWHITE, StateColor::Normal)); m_button_ok = new Button(this, _L("Test")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); @@ -1812,10 +1812,10 @@ void InputIpAddressDialog::set_machine_obj(MachineObject* obj) auto str_access_code = m_input_access_code->GetTextCtrl()->GetValue(); if (isIp(str_ip.ToStdString()) && str_access_code.Length() == 8) { m_button_ok->Enable(true); - StateColor btn_bg_green(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); } else { m_button_ok->Enable(false); @@ -2016,10 +2016,10 @@ void InputIpAddressDialog::on_check_ip_address_failed(wxCommandEvent& evt) } m_button_ok->Enable(true); - StateColor btn_bg_green(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); } void InputIpAddressDialog::on_text(wxCommandEvent &evt) @@ -2038,10 +2038,10 @@ void InputIpAddressDialog::on_text(wxCommandEvent &evt) if (isIp(str_ip.ToStdString()) && str_access_code.Length() == 8 && invalid_access_code) { m_button_ok->Enable(true); - StateColor btn_bg_green(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(129, 150, 255), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); } else { m_button_ok->Enable(false); @@ -2052,10 +2052,10 @@ void InputIpAddressDialog::on_text(wxCommandEvent &evt) if (current_input_index == 1){ if (str_sn.length() == 15) { m_button_ok->Enable(true); - StateColor btn_bg_green(std::pair(wxColour(61, 203, 115), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + std::pair(wxColour(68, 121, 251), StateColor::Normal)); m_button_ok->SetTextColor(StateColor::darkModeColorFor("#FFFFFE")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); } else { m_button_ok->Enable(false); m_button_ok->SetBackgroundColor(wxColour(0x90, 0x90, 0x90)); diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp index 879c562..bdebdd0 100644 --- a/src/slic3r/GUI/ReleaseNote.hpp +++ b/src/slic3r/GUI/ReleaseNote.hpp @@ -146,7 +146,7 @@ public: void msw_rescale(); - StateColor btn_bg_green; + StateColor btn_bg_blue; StateColor btn_bg_white; Label* m_staticText_release_note {nullptr}; wxBoxSizer* m_sizer_main; diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index 18aca80..fac4227 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -350,13 +350,13 @@ void SavePresetDialog::build(std::vector types, std::string suffix m_confirm = new Button(this, _L("OK")); // y96 - StateColor btn_bg_green(std::pair(wxColour(144, 144, 144), StateColor::Disabled), + StateColor btn_bg_blue(std::pair(wxColour(144, 144, 144), StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); StateColor btn_br_green(std::pair(wxColour(144, 144, 144), StateColor::Disabled), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_confirm->SetBackgroundColor(btn_bg_green); + m_confirm->SetBackgroundColor(btn_bg_blue); m_confirm->SetBorderColor(btn_br_green); m_confirm->SetTextColor(wxColour("#FFFFFE")); m_confirm->SetMinSize(SAVE_PRESET_DIALOG_BUTTON_SIZE); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index a7cba67..35fab11 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -5061,8 +5061,8 @@ EditDevNameDialog::EditDevNameDialog(Plater *plater /*= nullptr*/) m_button_confirm = new Button(this, _L("Confirm")); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - m_button_confirm->SetBackgroundColor(btn_bg_green); + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Normal)); + m_button_confirm->SetBackgroundColor(btn_bg_blue); m_button_confirm->SetBorderColor(wxColour(68, 121, 251)); m_button_confirm->SetTextColor(wxColour(255, 255, 255)); m_button_confirm->SetSize(wxSize(FromDIP(72), FromDIP(24))); diff --git a/src/slic3r/GUI/SingleChoiceDialog.cpp b/src/slic3r/GUI/SingleChoiceDialog.cpp index 168e66a..e06fbe9 100644 --- a/src/slic3r/GUI/SingleChoiceDialog.cpp +++ b/src/slic3r/GUI/SingleChoiceDialog.cpp @@ -26,11 +26,11 @@ SingleChoiceDialog::SingleChoiceDialog(const wxString &message, const wxString & wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 6864579..b48fb93 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -479,11 +479,11 @@ void PrintingTaskPanel::create_panel(wxWindow* parent) m_request_failed_info->SetFont(::Label::Body_10); static_request_failed_panel_sizer->Add(m_request_failed_info, 0, wxEXPAND | wxALL, FromDIP(10)); // y96 - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bd_green(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); m_button_market_retry = new Button(m_request_failed_panel, _L("Retry")); - m_button_market_retry->SetBackgroundColor(btn_bg_green); + m_button_market_retry->SetBackgroundColor(btn_bg_blue); m_button_market_retry->SetBorderColor(btn_bd_green); m_button_market_retry->SetTextColor(wxColour("#FFFFFE")); m_button_market_retry->SetSize(wxSize(FromDIP(128), FromDIP(26))); @@ -535,7 +535,7 @@ void PrintingTaskPanel::create_panel(wxWindow* parent) } m_button_market_scoring = new Button(m_score_subtask_info, _L("Rate")); - m_button_market_scoring->SetBackgroundColor(btn_bg_green); + m_button_market_scoring->SetBackgroundColor(btn_bg_blue); m_button_market_scoring->SetBorderColor(btn_bd_green); m_button_market_scoring->SetTextColor(wxColour("#FFFFFE")); m_button_market_scoring->SetSize(wxSize(FromDIP(128), FromDIP(26))); @@ -1068,19 +1068,19 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent) //m_staticText_control->SetFont(PAGE_TITLE_FONT); m_staticText_control->SetForegroundColour(PAGE_TITLE_FONT_COL); // y96 - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bd_green(std::pair(AMS_CONTROL_WHITE_COLOUR, StateColor::Disabled), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Enabled)); m_parts_btn = new Button(m_panel_control_title, _L("Printer Parts")); - m_parts_btn->SetBackgroundColor(btn_bg_green); + m_parts_btn->SetBackgroundColor(btn_bg_blue); m_parts_btn->SetBorderColor(btn_bd_green); m_parts_btn->SetTextColor(wxColour("#FFFFFE")); m_parts_btn->SetSize(wxSize(FromDIP(128), FromDIP(26))); m_parts_btn->SetMinSize(wxSize(-1, FromDIP(26))); m_options_btn = new Button(m_panel_control_title, _L("Print Options")); - m_options_btn->SetBackgroundColor(btn_bg_green); + m_options_btn->SetBackgroundColor(btn_bg_blue); m_options_btn->SetBorderColor(btn_bd_green); m_options_btn->SetTextColor(wxColour("#FFFFFE")); m_options_btn->SetSize(wxSize(FromDIP(128), FromDIP(26))); @@ -1088,7 +1088,7 @@ wxBoxSizer *StatusBasePanel::create_machine_control_page(wxWindow *parent) m_calibration_btn = new Button(m_panel_control_title, _L("Calibration")); - m_calibration_btn->SetBackgroundColor(btn_bg_green); + m_calibration_btn->SetBackgroundColor(btn_bg_blue); m_calibration_btn->SetBorderColor(btn_bd_green); m_calibration_btn->SetTextColor(wxColour("#FFFFFE")); m_calibration_btn->SetSize(wxSize(FromDIP(128), FromDIP(26))); @@ -1943,7 +1943,7 @@ void StatusPanel::on_subtask_abort(wxCommandEvent &event) abort_dlg->update_text(_L("Are you sure to stop printing?")); abort_dlg->update_btn_label(_L("Yes"), _L("No")); //y - // abort_dlg->m_button_cancel->SetBackgroundColor(abort_dlg->btn_bg_green); + // abort_dlg->m_button_cancel->SetBackgroundColor(abort_dlg->btn_bg_blue); // abort_dlg->m_button_cancel->SetBorderColor(*wxWHITE); // abort_dlg->m_button_cancel->SetTextColor(wxColor("#FFFFFE")); @@ -4798,11 +4798,11 @@ wxBoxSizer *ScoreDialog::get_button_sizer() wxBoxSizer *bSizer_button = new wxBoxSizer(wxHORIZONTAL); bSizer_button->Add(0, 0, 1, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok = new Button(this, _L("Submit")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/StepMeshDialog.cpp b/src/slic3r/GUI/StepMeshDialog.cpp index 4e615f7..8e99b1a 100644 --- a/src/slic3r/GUI/StepMeshDialog.cpp +++ b/src/slic3r/GUI/StepMeshDialog.cpp @@ -254,10 +254,10 @@ StepMeshDialog::StepMeshDialog(wxWindow* parent, Slic3r::Step& file, double line m_checkbox = new wxCheckBox(this, wxID_ANY, _L("Don't show again"), wxDefaultPosition, wxDefaultSize, 0); bSizer_button->Add(m_checkbox, 0, wxALIGN_LEFT); bSizer_button->AddStretchSpacer(1); - StateColor btn_bg_green(std::pair(wxColour(27, 136, 68), StateColor::Pressed), std::pair(wxColour(61, 203, 115), StateColor::Hovered), - std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), + std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); m_button_ok = new Button(this, _L("OK")); - m_button_ok->SetBackgroundColor(btn_bg_green); + m_button_ok->SetBackgroundColor(btn_bg_blue); m_button_ok->SetBorderColor(*wxWHITE); m_button_ok->SetTextColor(wxColour(0xFFFFFE)); m_button_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index 095670e..ce12076 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -976,15 +976,15 @@ void UnsavedChangesDialog::build(Preset::Type type, PresetCollection *dependent_ // Add Buttons wxFont btn_font = this->GetFont().Scaled(1.4f); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); - auto add_btn = [this, m_sizer_button, btn_font, dependent_presets, btn_bg_green](Button **btn, int &btn_id, const std::string &icon_name, Action close_act, const wxString &label, + auto add_btn = [this, m_sizer_button, btn_font, dependent_presets, btn_bg_blue](Button **btn, int &btn_id, const std::string &icon_name, Action close_act, const wxString &label, bool focus, bool process_enable = true) { *btn = new Button(this, _L(label)); if (focus) { - (*btn)->SetBackgroundColor(btn_bg_green); + (*btn)->SetBackgroundColor(btn_bg_blue); (*btn)->SetBorderColor(wxColour(68, 121, 251)); // y96 (*btn)->SetTextColor(wxColour("#FFFFFE")); } else { diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index 616ed5d..a23d4aa 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -142,7 +142,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector &updates, bool force_ sizer_button->Add(0, 0, 1, wxEXPAND, 5); // y96 - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); StateColor btn_bg_white(std::pair(wxColour(206, 206, 206), StateColor::Pressed), @@ -151,7 +151,7 @@ MsgUpdateConfig::MsgUpdateConfig(const std::vector &updates, bool force_ auto m_butto_ok = new Button(this, _L("OK")); - m_butto_ok->SetBackgroundColor(btn_bg_green); + m_butto_ok->SetBackgroundColor(btn_bg_blue); m_butto_ok->SetBorderColor(*wxWHITE); m_butto_ok->SetTextColor(*wxWHITE); m_butto_ok->SetFont(Label::Body_12); diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 914eab5..3848bc8 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -2563,7 +2563,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons //m_sizer_left_bottom->Add(0, 0, 0, wxEXPAND, 0); - StateColor btn_bg_green(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), + StateColor btn_bg_blue(std::pair(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair(wxColour(95, 82, 253), StateColor::Pressed), // y96 std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(AMS_CONTROL_BRAND_COLOUR, StateColor::Normal)); @@ -2595,7 +2595,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_button_extruder_feed = new Button(m_button_area, _L("Load")); m_button_extruder_feed->SetFont(Label::Body_13); - m_button_extruder_feed->SetBackgroundColor(btn_bg_green); + m_button_extruder_feed->SetBackgroundColor(btn_bg_blue); m_button_extruder_feed->SetBorderColor(btn_bd_green); m_button_extruder_feed->SetTextColor(btn_text_green); @@ -2900,7 +2900,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons wxBoxSizer *sizer_button = new wxBoxSizer(wxHORIZONTAL); auto m_button_calibration_again = new Button(m_calibration_err_panel, _L("Calibrate again")); - m_button_calibration_again->SetBackgroundColor(btn_bg_green); + m_button_calibration_again->SetBackgroundColor(btn_bg_blue); m_button_calibration_again->SetBorderColor(AMS_CONTROL_BRAND_COLOUR); m_button_calibration_again->SetTextColor(AMS_CONTROL_WHITE_COLOUR); m_button_calibration_again->SetMinSize(AMS_CONTRO_CALIBRATION_BUTTON_SIZE); diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp index 0b4376e..63c8274 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.cpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp @@ -44,7 +44,7 @@ void ProgressBar::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, w auto m_progress_bk = new StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); m_progress_bk->SetBackgroundColour(wxColour(238, 130, 238)); - StateColor btn_bg_green(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), + StateColor btn_bg_blue(std::pair(wxColour(95, 82, 253), StateColor::Pressed), std::pair(wxColour(129, 150, 255), StateColor::Hovered), std::pair(wxColour(68, 121, 251), StateColor::Normal)); wxBoxSizer *m_sizer_progress= new wxBoxSizer(wxHORIZONTAL); diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index d15632f..afec1f7 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -108,11 +108,11 @@ PA_Calibration_Dlg::PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* m_btnStart = new Button(this, _L("OK")); //B - StateColor btn_bg_green(std::pair(wxColour(0, 0, 121), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(0, 0, 121), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Hovered), std::pair(0x4479FB, StateColor::Normal)); // y96 //B - m_btnStart->SetBackgroundColor(btn_bg_green); + m_btnStart->SetBackgroundColor(btn_bg_blue); m_btnStart->SetBorderColor(wxColour(68, 121, 251)); m_btnStart->SetTextColor(wxColour("#FFFFFE")); m_btnStart->SetSize(wxSize(FromDIP(48), FromDIP(24))); @@ -318,11 +318,11 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat v_sizer->Add(0, FromDIP(10), 0, wxEXPAND, 5); m_btnStart = new Button(this, _L("OK")); //B - StateColor btn_bg_green(std::pair(wxColour(0, 0, 121), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(0, 0, 121), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Hovered), std::pair(0x4479FB, StateColor::Normal)); // y96 //B - m_btnStart->SetBackgroundColor(btn_bg_green); + m_btnStart->SetBackgroundColor(btn_bg_blue); m_btnStart->SetBorderColor(wxColour(68, 121, 251)); m_btnStart->SetTextColor(wxColour("#FFFFFE")); m_btnStart->SetSize(wxSize(FromDIP(48), FromDIP(24))); @@ -491,11 +491,11 @@ MaxVolumetricSpeed_Test_Dlg::MaxVolumetricSpeed_Test_Dlg(wxWindow* parent, wxWin v_sizer->Add(0, FromDIP(10), 0, wxEXPAND, 5); m_btnStart = new Button(this, _L("OK")); //B - StateColor btn_bg_green(std::pair(wxColour(0, 0, 121), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(0, 0, 121), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Hovered), std::pair(0x4479FB, StateColor::Normal)); // y96 //B - m_btnStart->SetBackgroundColor(btn_bg_green); + m_btnStart->SetBackgroundColor(btn_bg_blue); m_btnStart->SetBorderColor(wxColour(68, 121, 251)); m_btnStart->SetTextColor(wxColour("#FFFFFE")); m_btnStart->SetSize(wxSize(FromDIP(48), FromDIP(24))); @@ -597,11 +597,11 @@ VFA_Test_Dlg::VFA_Test_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) v_sizer->Add(0, FromDIP(10), 0, wxEXPAND, 5); m_btnStart = new Button(this, _L("OK")); //B - StateColor btn_bg_green(std::pair(wxColour(0, 0, 121), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(0, 0, 121), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Hovered), std::pair(0x4479FB, StateColor::Normal)); // y96 //B - m_btnStart->SetBackgroundColor(btn_bg_green); + m_btnStart->SetBackgroundColor(btn_bg_blue); m_btnStart->SetBorderColor(wxColour(68, 121, 251)); m_btnStart->SetTextColor(wxColour("#FFFFFE")); m_btnStart->SetSize(wxSize(FromDIP(48), FromDIP(24))); @@ -704,11 +704,11 @@ Retraction_Test_Dlg::Retraction_Test_Dlg(wxWindow* parent, wxWindowID id, Plater v_sizer->Add(0, FromDIP(10), 0, wxEXPAND, 5); m_btnStart = new Button(this, _L("OK")); //B - StateColor btn_bg_green(std::pair(wxColour(0, 0, 121), StateColor::Pressed), + StateColor btn_bg_blue(std::pair(wxColour(0, 0, 121), StateColor::Pressed), std::pair(wxColour(68, 121, 251), StateColor::Hovered), std::pair(0x4479FB, StateColor::Normal)); // y96 //B - m_btnStart->SetBackgroundColor(btn_bg_green); + m_btnStart->SetBackgroundColor(btn_bg_blue); m_btnStart->SetBorderColor(wxColour(68, 121, 251)); m_btnStart->SetTextColor(wxColour("#FFFFFE")); m_btnStart->SetSize(wxSize(FromDIP(48), FromDIP(24)));