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

ENH: update question icon about can not connect printer

Browse Source 
jira: [STUDIO-11680]
Change-Id: I9eee78d36f75c8f7f56f3a9f2aee89f72a7d48ff
This commit is contained in:
xin.zhang 2025-05-07 18:06:12 +08:00 committed by lane.wei
parent 59db0a2265
commit e8abfcea8e
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/images/icon_qusetion.svg
View File

@ -1,3 +1,3 @@
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.5938 7.5C13.5937 5.88384 12.9517 4.33387 11.8089 3.19107C10.6661 2.04827 9.11616 1.40625 7.5 1.40625C5.88384 1.40625 4.33387 2.04827 3.19107 3.19107C2.04827 4.33387 1.40625 5.88384 1.40625 7.5C1.40625 9.11616 2.04827 10.6661 3.19107 11.8089C4.33387 12.9517 5.88384 13.5938 7.5 13.5938C9.11616 13.5938 10.6661 12.9517 11.8089 11.8089C12.9517 10.6661 13.5938 9.11616 13.5938 7.5ZM0 7.5C0 5.51088 0.790176 3.60322 2.1967 2.1967C3.60322 0.790176 5.51088 0 7.5 0C9.48912 0 11.3968 0.790176 12.8033 2.1967C14.2098 3.60322 15 5.51088 15 7.5C15 9.48912 14.2098 11.3968 12.8033 12.8033C11.3968 14.2098 9.48912 15 7.5 15C5.51088 15 3.60322 14.2098 2.1967 12.8033C0.790176 11.3968 0 9.48912 0 7.5ZM4.97461 4.84277C5.20605 4.18945 5.82715 3.75 6.52148 3.75H8.22949C9.25195 3.75 10.0781 4.5791 10.0781 5.59863C10.0781 6.26074 9.72363 6.87305 9.14941 7.2041L8.20312 7.74609C8.19727 8.12695 7.88379 8.4375 7.5 8.4375C7.11035 8.4375 6.79688 8.12402 6.79688 7.73438V7.33887C6.79688 7.08691 6.93164 6.85547 7.15137 6.72949L8.44922 5.98535C8.58691 5.90625 8.67188 5.75977 8.67188 5.60156C8.67188 5.35547 8.47266 5.15918 8.22949 5.15918H6.52148C6.42188 5.15918 6.33398 5.2207 6.30176 5.31445L6.29004 5.34961C6.16113 5.71582 5.75684 5.90625 5.39355 5.77734C5.03027 5.64844 4.83691 5.24414 4.96582 4.88086L4.97754 4.8457L4.97461 4.84277ZM6.5625 10.3125C6.5625 10.0639 6.66127 9.8254 6.83709 9.64959C7.0129 9.47377 7.25136 9.375 7.5 9.375C7.74864 9.375 7.9871 9.47377 8.16291 9.64959C8.33873 9.8254 8.4375 10.0639 8.4375 10.3125C8.4375 10.5611 8.33873 10.7996 8.16291 10.9754C7.9871 11.1512 7.74864 11.25 7.5 11.25C7.25136 11.25 7.0129 11.1512 6.83709 10.9754C6.66127 10.7996 6.5625 10.5611 6.5625 10.3125Z" fill="#1F8EEA"/>
<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17.2722 9C17.2722 7.0606 16.5018 5.20064 15.1304 3.82928C13.7591 2.45792 11.8991 1.6875 9.95972 1.6875C8.02032 1.6875 6.16036 2.45792 4.789 3.82928C3.41764 5.20064 2.64722 7.0606 2.64722 9C2.64722 10.9394 3.41764 12.7994 4.789 14.1707C6.16036 15.5421 8.02032 16.3125 9.95972 16.3125C11.8991 16.3125 13.7591 15.5421 15.1304 14.1707C16.5018 12.7994 17.2722 10.9394 17.2722 9ZM0.959717 9C0.959717 6.61305 1.90793 4.32387 3.59576 2.63604C5.28358 0.948212 7.57277 0 9.95972 0C12.3467 0 14.6359 0.948212 16.3237 2.63604C18.0115 4.32387 18.9597 6.61305 18.9597 9C18.9597 11.3869 18.0115 13.6761 16.3237 15.364C14.6359 17.0518 12.3467 18 9.95972 18C7.57277 18 5.28358 17.0518 3.59576 15.364C1.90793 13.6761 0.959717 11.3869 0.959717 9ZM6.92925 5.81133C7.20698 5.02734 7.95229 4.5 8.7855 4.5H10.8351C12.0621 4.5 13.0535 5.49492 13.0535 6.71836C13.0535 7.51289 12.6281 8.24766 11.939 8.64492L10.8035 9.29531C10.7964 9.75234 10.4203 10.125 9.95972 10.125C9.49214 10.125 9.11597 9.74883 9.11597 9.28125V8.80664C9.11597 8.5043 9.27769 8.22656 9.54136 8.07539L11.0988 7.18242C11.264 7.0875 11.366 6.91172 11.366 6.72187C11.366 6.42656 11.1269 6.19102 10.8351 6.19102H8.7855C8.66597 6.19102 8.5605 6.26484 8.52183 6.37734L8.50776 6.41953C8.35308 6.85898 7.86792 7.0875 7.43198 6.93281C6.99604 6.77812 6.76401 6.29297 6.9187 5.85703L6.93276 5.81484L6.92925 5.81133ZM8.83472 12.375C8.83472 12.0766 8.95324 11.7905 9.16422 11.5795C9.3752 11.3685 9.66135 11.25 9.95972 11.25C10.2581 11.25 10.5442 11.3685 10.7552 11.5795C10.9662 11.7905 11.0847 12.0766 11.0847 12.375C11.0847 12.6734 10.9662 12.9595 10.7552 13.1705C10.5442 13.3815 10.2581 13.5 9.95972 13.5C9.66135 13.5 9.3752 13.3815 9.16422 13.1705C8.95324 12.9595 8.83472 12.6734 8.83472 12.375Z" fill="#909090"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -5099,15 +5099,24 @@ void PrinterInfoBox::Create()
{
/*printer combobox*/
wxBoxSizer* sizer_split_printer = new wxBoxSizer(wxHORIZONTAL);
m_stext_printer_title = new Label(this, _L("Printer"));
m_stext_printer_title = new Label(this, _L("Printer"), wxALIGN_TOP);
m_stext_printer_title->SetFont(::Label::Body_14);
m_stext_printer_title->SetForegroundColour(0x909090);
m_button_question = new ScalableButton(this, wxID_ANY, "icon_qusetion", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true);
m_button_question->Bind(wxEVT_BUTTON, &PrinterInfoBox::OnBtnQuestionClicked, this);
m_button_question->SetToolTip(_L("Click here if you can't connect to the printer"));
m_button_question->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
m_button_question->SetMaxSize(wxSize(FromDIP(18), FromDIP(18)));
auto m_split_line = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
m_split_line->SetBackgroundColour(0xeeeeee);
m_split_line->SetMinSize(wxSize(-1, 1));
m_split_line->SetMaxSize(wxSize(-1, 1));
sizer_split_printer->Add(0, 0, 0, wxEXPAND, 0);
sizer_split_printer->Add(m_stext_printer_title, 0, wxALIGN_CENTER, 0);
sizer_split_printer->Add(m_stext_printer_title, 0, wxALIGN_CENTER_VERTICAL, 0);
sizer_split_printer->AddSpacer(FromDIP(5));
sizer_split_printer->Add(m_button_question, 0, wxALIGN_CENTER_VERTICAL, 0);
sizer_split_printer->Add(m_split_line, 1, wxALIGN_CENTER_VERTICAL, 0);
wxBoxSizer* sizer_printer_area = new wxBoxSizer(wxHORIZONTAL);
@ -5122,23 +5131,17 @@ void PrinterInfoBox::Create()
m_comboBox_printer = new ComboBox(printer_staticbox, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY);
m_comboBox_printer->SetBorderWidth(0);
m_comboBox_printer->SetMinSize(wxSize(FromDIP(277), FromDIP(60)));
m_comboBox_printer->SetMaxSize(wxSize(FromDIP(277), FromDIP(60)));
m_comboBox_printer->SetMinSize(wxSize(FromDIP(300), FromDIP(60)));
m_comboBox_printer->SetMaxSize(wxSize(FromDIP(300), FromDIP(60)));
m_comboBox_printer->SetBackgroundColor(*wxWHITE);
m_comboBox_printer->Bind(wxEVT_COMBOBOX, &SelectMachineDialog::on_selection_changed, m_select_dialog);
m_button_refresh = new ScalableButton(printer_staticbox, wxID_ANY, "refresh_printer", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true);
m_button_refresh->Bind(wxEVT_BUTTON, &SelectMachineDialog::on_refresh, m_select_dialog);
m_button_question = new ScalableButton(printer_staticbox, wxID_ANY, "icon_qusetion", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true);
m_button_question->Bind(wxEVT_BUTTON, &PrinterInfoBox::OnBtnQuestionClicked, this);
m_button_question->SetToolTip(_L("Click here if you can't connect to the printer"));
sizer_printer_staticbox->Add(0, 0, 0, wxLEFT, FromDIP(7));
sizer_printer_staticbox->Add(m_comboBox_printer, 0, wxALIGN_CENTER, 0);
sizer_printer_staticbox->Add(m_button_refresh, 0, wxALIGN_CENTER, 0);
sizer_printer_staticbox->AddSpacer(FromDIP(10));
sizer_printer_staticbox->Add(m_button_question, 0, wxALIGN_CENTER, 0);
printer_staticbox->SetSizer(sizer_printer_staticbox);
printer_staticbox->Layout();