juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 20:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:add x1c and x1e picture

Browse Source 
jira:[STUDIO-13716][STUDIO-14124]

Change-Id: Ia793986f1891c2ee57c95a6db536e71f725ddb3c
(cherry picked from commit e29b9cf3a319666c896fc839329448dde435c46d)
This commit is contained in:
milk
2025-09-04 10:06:41 +08:00
committed by Noisyfox
parent c2938827ac
commit 164bd76762
7 changed files with 758 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

274
resources/images/printer_thumbnail_x1c.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

90
resources/images/printer_thumbnail_x1c_dark.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 87 KiB

274
resources/images/printer_thumbnail_x1e.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

90
resources/images/printer_thumbnail_x1e_dark.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 87 KiB

2
resources/printers/BL-P001.json
View File

@@ -55,7 +55,7 @@
"support_wrapping_detection": false, "support_wrapping_detection": false,
"auto_pa_cali_thumbnail_image": "fd_calibration_auto", "auto_pa_cali_thumbnail_image": "fd_calibration_auto",
"printer_type": "3DPrinter-X1-Carbon", "printer_type": "3DPrinter-X1-Carbon",
"printer_thumbnail_image": "printer_thumbnail", "printer_thumbnail_image": "printer_thumbnail_x1c",
"printer_connect_help_image": "input_access_code_x1", "printer_connect_help_image": "input_access_code_x1",
"printer_use_ams_image": "ams_icon", "printer_use_ams_image": "ams_icon",
"printer_ext_image": ["ext_image_xp"], "printer_ext_image": ["ext_image_xp"],

2
resources/printers/C13.json
View File

@@ -59,7 +59,7 @@
"compatible_machine": [ "BL-P001", "BL-P002", "C11", "C12" ], "compatible_machine": [ "BL-P001", "BL-P002", "C11", "C12" ],
"auto_cali_not_support_filaments": [ "GFU03", "GFU04" ], "auto_cali_not_support_filaments": [ "GFU03", "GFU04" ],
"printer_type": "C13", "printer_type": "C13",
"printer_thumbnail_image": "printer_thumbnail", "printer_thumbnail_image": "printer_thumbnail_x1e",
"printer_connect_help_image": "input_access_code_x1", "printer_connect_help_image": "input_access_code_x1",
"printer_use_ams_image": "ams_icon", "printer_use_ams_image": "ams_icon",
"printer_ext_image": ["ext_image_xp"], "printer_ext_image": ["ext_image_xp"],

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

@@ -427,7 +427,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
m_link_show_error = new wxStaticText(this, wxID_ANY, _L("Check the reason")); m_link_show_error = new wxStaticText(this, wxID_ANY, _L("Check the reason"));
m_link_show_error->SetForegroundColour(wxColour(0x6b6b6b)); m_link_show_error->SetForegroundColour(wxColour("#6b6b6b"));
m_link_show_error->SetFont(::Label::Head_13); m_link_show_error->SetFont(::Label::Head_13);
m_bitmap_show_error_close = create_scaled_bitmap("link_more_error_close",nullptr, 7); m_bitmap_show_error_close = create_scaled_bitmap("link_more_error_close",nullptr, 7);
@@ -921,8 +921,12 @@ void BindMachineDialog::on_show(wxShowEvent &event)
if (event.IsShown()) { if (event.IsShown()) {
auto img = m_machine_info->get_printer_thumbnail_img_str(); auto img = m_machine_info->get_printer_thumbnail_img_str();
if (wxGetApp().dark_mode()) { img += "_dark"; } if (wxGetApp().dark_mode()) { img += "_dark"; }
auto bitmap = create_scaled_bitmap(img, this, FromDIP(80)); try {
m_printer_img->SetBitmap(bitmap); auto bitmap = create_scaled_bitmap(img, this, FromDIP(80));
m_printer_img->SetBitmap(bitmap);
}
catch (...){}
m_printer_img->Refresh(); m_printer_img->Refresh();
m_printer_img->Show(); m_printer_img->Show();
@@ -969,7 +973,7 @@ UnBindMachineDialog::UnBindMachineDialog(Plater *plater /*= nullptr*/)
SetBackgroundColour(*wxWHITE); SetBackgroundColour(*wxWHITE);
wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL); wxBoxSizer *m_sizer_main = new wxBoxSizer(wxVERTICAL);
auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL); auto m_line_top = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
m_line_top->SetBackgroundColour(wxColour(166, 169, 170)); m_line_top->SetBackgroundColour(wxColour("#A6A9AA"));
m_sizer_main->Add(m_line_top, 0, wxEXPAND, 0); m_sizer_main->Add(m_line_top, 0, wxEXPAND, 0);
m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(38)); m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(38));
@@ -1138,8 +1142,11 @@ void UnBindMachineDialog::on_show(wxShowEvent &event)
if (event.IsShown()) { if (event.IsShown()) {
auto img = m_machine_info->get_printer_thumbnail_img_str(); auto img = m_machine_info->get_printer_thumbnail_img_str();
if (wxGetApp().dark_mode()) { img += "_dark"; } if (wxGetApp().dark_mode()) { img += "_dark"; }
auto bitmap = create_scaled_bitmap(img, this, FromDIP(80)); try {
m_printer_img->SetBitmap(bitmap); auto bitmap = create_scaled_bitmap(img, this, FromDIP(80));
m_printer_img->SetBitmap(bitmap);
} catch (...) {}
m_printer_img->Refresh(); m_printer_img->Refresh();
m_printer_img->Show(); m_printer_img->Show();