mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:UI of network error prompt cannot be seen as a link 

JIRA:STUDIO-3168
Change-Id: I05fdb746ec0e3ee955180b8ff122fb8a28e4ba8c
This commit is contained in:
hu.wang 2023-09-14 16:34:09 +08:00 committed by Lane.Wei
parent abd220dadd
commit 73cc51ac38
8 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/BindDialog.cpp
View File

@ -298,8 +298,7 @@ wxString get_fail_reason(int code)
wxBoxSizer* m_sizer_bind_failed_info = new wxBoxSizer(wxVERTICAL); wxBoxSizer* m_sizer_bind_failed_info = new wxBoxSizer(wxVERTICAL);
m_sw_bind_failed_info->SetSizer( m_sizer_bind_failed_info ); m_sw_bind_failed_info->SetSizer( m_sizer_bind_failed_info );
m_link_network_state = new Label(m_sw_bind_failed_info, _L("Check the status of current system services")); m_link_network_state = new wxHyperlinkCtrl(m_sw_bind_failed_info, wxID_ANY,_L("Check the status of current system services"),"");
m_link_network_state->SetForegroundColour(0x00AE42);
m_link_network_state->SetFont(::Label::Body_12); m_link_network_state->SetFont(::Label::Body_12);
m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check(); }); m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check(); });
m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND); }); m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND); });

3
src/slic3r/GUI/BindDialog.hpp
View File

@ -17,6 +17,7 @@
#include <wx/dialog.h> #include <wx/dialog.h>
#include <curl/curl.h> #include <curl/curl.h>
#include <wx/webrequest.h> #include <wx/webrequest.h>
#include <wx/hyperlink.h>
#include "wxExtensions.hpp" #include "wxExtensions.hpp"
#include "Plater.hpp" #include "Plater.hpp"
#include "Widgets/StepCtrl.hpp" #include "Widgets/StepCtrl.hpp"
@ -66,7 +67,7 @@ private:
Label* m_st_txt_error_code{ nullptr }; Label* m_st_txt_error_code{ nullptr };
Label* m_st_txt_error_desc{ nullptr }; Label* m_st_txt_error_desc{ nullptr };
Label* m_st_txt_extra_info{ nullptr }; Label* m_st_txt_extra_info{ nullptr };
Label* m_link_network_state{ nullptr }; wxHyperlinkCtrl* m_link_network_state{ nullptr };
wxString m_result_info; wxString m_result_info;
wxString m_result_extra; wxString m_result_extra;
bool m_show_error_info_state = true; bool m_show_error_info_state = true;

3
src/slic3r/GUI/SelectMachine.cpp
View File

@ -1334,8 +1334,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
sizer_extra_info->Add(m_st_txt_extra_info, 0, wxALL, 0); sizer_extra_info->Add(m_st_txt_extra_info, 0, wxALL, 0);
m_link_network_state = new Label(m_sw_print_failed_info, _L("Check the status of current system services")); m_link_network_state = new wxHyperlinkCtrl(m_sw_print_failed_info, wxID_ANY,_L("Check the status of current system services"),"");
m_link_network_state->SetForegroundColour(0x00AE42);
m_link_network_state->SetFont(::Label::Body_12); m_link_network_state->SetFont(::Label::Body_12);
m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check();}); m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check();});
m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND);}); m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND);});

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

@ -360,8 +360,8 @@ protected:
Label* m_st_txt_error_code{nullptr}; Label* m_st_txt_error_code{nullptr};
Label* m_st_txt_error_desc{nullptr}; Label* m_st_txt_error_desc{nullptr};
Label* m_st_txt_extra_info{nullptr}; Label* m_st_txt_extra_info{nullptr};
Label * m_link_network_state;
Label* m_ams_backup_tip{nullptr}; Label* m_ams_backup_tip{nullptr};
wxHyperlinkCtrl* m_link_network_state{ nullptr };
wxSimplebook* m_rename_switch_panel{nullptr}; wxSimplebook* m_rename_switch_panel{nullptr};
wxSimplebook* m_simplebook{nullptr}; wxSimplebook* m_simplebook{nullptr};
wxStaticText* m_rename_text{nullptr}; wxStaticText* m_rename_text{nullptr};

3
src/slic3r/GUI/SendToPrinter.cpp
View File

@ -394,8 +394,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
sizer_extra_info->Add(m_st_txt_extra_info, 0, wxALL, 0); sizer_extra_info->Add(m_st_txt_extra_info, 0, wxALL, 0);
m_link_network_state = new Label(m_sw_print_failed_info, _L("Check the status of current system services")); m_link_network_state = new wxHyperlinkCtrl(m_sw_print_failed_info, wxID_ANY,_L("Check the status of current system services"),"");
m_link_network_state->SetForegroundColour(0x00AE42);
m_link_network_state->SetFont(::Label::Body_12); m_link_network_state->SetFont(::Label::Body_12);
m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check(); }); m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check(); });
m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND); }); m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND); });

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

@ -95,7 +95,7 @@ private:
Label* m_st_txt_error_code{ nullptr }; Label* m_st_txt_error_code{ nullptr };
Label* m_st_txt_error_desc{ nullptr }; Label* m_st_txt_error_desc{ nullptr };
Label* m_st_txt_extra_info{ nullptr }; Label* m_st_txt_extra_info{ nullptr };
Label * m_link_network_state; wxHyperlinkCtrl* m_link_network_state{ nullptr };
StateColor btn_bg_enable; StateColor btn_bg_enable;
wxBoxSizer* rename_sizer_v{ nullptr }; wxBoxSizer* rename_sizer_v{ nullptr };
wxBoxSizer* rename_sizer_h{ nullptr }; wxBoxSizer* rename_sizer_h{ nullptr };

3
src/slic3r/GUI/Widgets/SideTools.cpp
View File

@ -326,10 +326,9 @@ SideTools::SideTools(wxWindow *parent, wxWindowID id, const wxPoint &pos, const
wxBoxSizer* sizer_error_desc = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizer_error_desc = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* sizer_extra_info = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sizer_extra_info = new wxBoxSizer(wxHORIZONTAL);
m_link_network_state = new Label(m_side_error_panel, _L("Check cloud service status"), wxALIGN_CENTER_HORIZONTAL | wxST_ELLIPSIZE_END); m_link_network_state = new wxHyperlinkCtrl(m_side_error_panel, wxID_ANY,_L("Check the status of current system services"),"",wxDefaultPosition,wxDefaultSize,wxALIGN_CENTER_HORIZONTAL | wxST_ELLIPSIZE_END);
m_link_network_state->SetMinSize(wxSize(FromDIP(220), -1)); m_link_network_state->SetMinSize(wxSize(FromDIP(220), -1));
m_link_network_state->SetMaxSize(wxSize(FromDIP(220), -1)); m_link_network_state->SetMaxSize(wxSize(FromDIP(220), -1));
m_link_network_state->SetForegroundColour(0x00AE42);
m_link_network_state->SetFont(::Label::Body_12); m_link_network_state->SetFont(::Label::Body_12);
m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check(); }); m_link_network_state->Bind(wxEVT_LEFT_DOWN, [this](auto& e) {wxGetApp().link_to_network_check(); });
m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND); }); m_link_network_state->Bind(wxEVT_ENTER_WINDOW, [this](auto& e) {m_link_network_state->SetCursor(wxCURSOR_HAND); });

2
src/slic3r/GUI/Widgets/SideTools.hpp
View File

@ -99,7 +99,7 @@ public:
private: private:
SideToolsPanel* m_side_tools{ nullptr }; SideToolsPanel* m_side_tools{ nullptr };
Tabbook* m_tabpanel{ nullptr }; Tabbook* m_tabpanel{ nullptr };
Label* m_link_network_state{ nullptr }; wxHyperlinkCtrl* m_link_network_state{ nullptr };
Label* m_st_txt_error_code{ nullptr }; Label* m_st_txt_error_code{ nullptr };
Label* m_st_txt_error_desc{ nullptr }; Label* m_st_txt_error_desc{ nullptr };
Label* m_st_txt_extra_info{ nullptr }; Label* m_st_txt_extra_info{ nullptr };