GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-09-26 11:33:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP: EditGCodeDialog: Add parameter description

Browse Source
This commit is contained in:
YuSanka 2023-08-21 15:41:57 +02:00
parent b2bd7f5fbd
commit d652f15e48
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/EditGCodeDialog.cpp
View File

@ -164,6 +164,8 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
m_param_label = new wxStaticText(this, wxID_ANY, _L("Select placeholder")); m_param_label = new wxStaticText(this, wxID_ANY, _L("Select placeholder"));
m_param_label->SetFont(wxGetApp().bold_font()); m_param_label->SetFont(wxGetApp().bold_font());
m_param_description = new wxStaticText(this, wxID_ANY, wxEmptyString);
wxStdDialogButtonSizer* btns = this->CreateStdDialogButtonSizer(wxOK | wxCANCEL); wxStdDialogButtonSizer* btns = this->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
wxGetApp().UpdateDarkUI(this->FindWindowById(wxID_OK, this)); wxGetApp().UpdateDarkUI(this->FindWindowById(wxID_OK, this));
wxGetApp().UpdateDarkUI(this->FindWindowById(wxID_CANCEL, this)); wxGetApp().UpdateDarkUI(this->FindWindowById(wxID_CANCEL, this));
@ -173,6 +175,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
topSizer->Add(label_top , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border); topSizer->Add(label_top , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
topSizer->Add(grid_sizer , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border); topSizer->Add(grid_sizer , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
topSizer->Add(m_param_label , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border); topSizer->Add(m_param_label , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
topSizer->Add(m_param_description , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
topSizer->Add(btns , 0, wxEXPAND | wxALL, border); topSizer->Add(btns , 0, wxEXPAND | wxALL, border);
SetSizer(topSizer); SetSizer(topSizer);
@ -390,6 +393,7 @@ void EditGCodeDialog::bind_list_and_button()
{ {
m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) { m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) {
wxString label; wxString label;
wxString description;
const std::string opt_key = m_params_list->GetSelectedParamKey(); const std::string opt_key = m_params_list->GetSelectedParamKey();
if (!opt_key.empty()) { if (!opt_key.empty()) {
@ -427,12 +431,17 @@ void EditGCodeDialog::bind_list_and_button()
(!cod->full_label.empty() && !cod->label.empty() ) ? (!cod->full_label.empty() && !cod->label.empty() ) ?
format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) : format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) :
format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str); format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str);
if (cod)
description = _(cod->tooltip);
} }
else else
label = "Undef optptr"; label = "Undef optptr";
} }
m_param_label->SetLabel(label); m_param_label->SetLabel(label);
m_param_description->SetLabel(description);
Layout(); Layout();
}); });

1
src/slic3r/GUI/EditGCodeDialog.hpp
View File

@ -29,6 +29,7 @@ class EditGCodeDialog : public DPIDialog
ScalableButton* m_add_btn {nullptr}; ScalableButton* m_add_btn {nullptr};
wxTextCtrl* m_gcode_editor {nullptr}; wxTextCtrl* m_gcode_editor {nullptr};
wxStaticText* m_param_label {nullptr}; wxStaticText* m_param_label {nullptr};
wxStaticText* m_param_description {nullptr};
DynamicConfig m_read_write_config; DynamicConfig m_read_write_config;
DynamicConfig m_universal_config; DynamicConfig m_universal_config;