From 932218e3895f971b30fec5fdd40eaa1d5c5272d5 Mon Sep 17 00:00:00 2001 From: tao wang Date: Mon, 6 May 2024 16:14:30 +0800 Subject: [PATCH] FIX:fixed incorrect display of printer options page on Linux jira:[STUDIO-6220] Change-Id: Id1f084658b0b340b7f17ab97ba82c0fd3ae83fae --- src/slic3r/GUI/PrintOptionsDialog.cpp | 16 ++++++++-------- src/slic3r/GUI/PrintOptionsDialog.hpp | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index f9b1a4d6b..d875323ca 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -217,7 +217,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) // ai monitoring with levels line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_ai_monitoring = new CheckBox(parent); - text_ai_monitoring = new wxStaticText(parent, wxID_ANY, _L("Enable AI monitoring of printing")); + text_ai_monitoring = new Label(parent, _L("Enable AI monitoring of printing")); text_ai_monitoring->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_ai_monitoring, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -227,7 +227,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer = new wxBoxSizer(wxHORIZONTAL); - text_ai_monitoring_caption = new wxStaticText(parent, wxID_ANY, _L("Sensitivity of pausing is")); + text_ai_monitoring_caption = new Label(parent, _L("Sensitivity of pausing is")); text_ai_monitoring_caption->SetFont(Label::Body_14); text_ai_monitoring_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL); text_ai_monitoring_caption->Wrap(-1); @@ -255,7 +255,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) // detection of build plate position line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_plate_mark = new CheckBox(parent); - text_plate_mark = new wxStaticText(parent, wxID_ANY, _L("Enable detection of build plate position")); + text_plate_mark = new Label(parent, _L("Enable detection of build plate position")); text_plate_mark->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_plate_mark, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -282,7 +282,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) // detection of first layer line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_first_layer = new CheckBox(parent); - text_first_layer = new wxStaticText(parent, wxID_ANY, _L("First Layer Inspection")); + text_first_layer = new Label(parent, _L("First Layer Inspection")); text_first_layer->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_first_layer, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -298,7 +298,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) // auto-recovery from step loss line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_auto_recovery = new CheckBox(parent); - text_auto_recovery = new wxStaticText(parent, wxID_ANY, _L("Auto-recovery from step loss")); + text_auto_recovery = new Label(parent, _L("Auto-recovery from step loss")); text_auto_recovery->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_auto_recovery, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -315,7 +315,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) //Allow prompt sound line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_sup_sound = new CheckBox(parent); - text_sup_sound = new wxStaticText(parent, wxID_ANY, _L("Allow Prompt Sound")); + text_sup_sound = new Label(parent, _L("Allow Prompt Sound")); text_sup_sound->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_sup_sound, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -332,7 +332,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) //filament tangle detect line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_filament_tangle = new CheckBox(parent); - text_filament_tangle = new wxStaticText(parent, wxID_ANY, _L("Filament Tangle Detect")); + text_filament_tangle = new Label(parent, _L("Filament Tangle Detect")); text_filament_tangle->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_filament_tangle, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); @@ -349,7 +349,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent) //nozzle blob detect line_sizer = new wxBoxSizer(wxHORIZONTAL); m_cb_nozzle_blob = new CheckBox(parent); - text_nozzle_blob = new wxStaticText(parent, wxID_ANY, _L("Nozzle Clumping Detection")); + text_nozzle_blob = new Label(parent, _L("Nozzle Clumping Detection")); text_nozzle_blob->SetFont(Label::Body_14); line_sizer->Add(FromDIP(5), 0, 0, 0); line_sizer->Add(m_cb_nozzle_blob, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5)); diff --git a/src/slic3r/GUI/PrintOptionsDialog.hpp b/src/slic3r/GUI/PrintOptionsDialog.hpp index 63fe24af6..db55d12dc 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.hpp +++ b/src/slic3r/GUI/PrintOptionsDialog.hpp @@ -50,17 +50,17 @@ protected: CheckBox* m_cb_sup_sound; CheckBox* m_cb_filament_tangle; CheckBox* m_cb_nozzle_blob; - wxStaticText* text_first_layer; - wxStaticText* text_ai_monitoring; - wxStaticText* text_ai_monitoring_caption; + Label* text_first_layer; + Label* text_ai_monitoring; + Label* text_ai_monitoring_caption; ComboBox* ai_monitoring_level_list; - wxStaticText* text_plate_mark; - wxStaticText* text_plate_mark_caption; - wxStaticText* text_auto_recovery; - wxStaticText* text_sup_sound; - wxStaticText* text_filament_tangle; - wxStaticText* text_nozzle_blob; - wxStaticText* text_nozzle_blob_caption; + Label* text_plate_mark; + Label* text_plate_mark_caption; + Label* text_auto_recovery; + Label* text_sup_sound; + Label* text_filament_tangle; + Label* text_nozzle_blob; + Label* text_nozzle_blob_caption; StaticLine* line1; StaticLine* line2; StaticLine* line3;