Skip to content

Commit

Permalink
WIP: EditGCodeDialog: Add parameter description
Browse files Browse the repository at this point in the history
  • Loading branch information
YuSanka committed Aug 29, 2023
1 parent b2bd7f5 commit d652f15
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/slic3r/GUI/EditGCodeDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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->SetFont(wxGetApp().bold_font());

m_param_description = new wxStaticText(this, wxID_ANY, wxEmptyString);

wxStdDialogButtonSizer* btns = this->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
wxGetApp().UpdateDarkUI(this->FindWindowById(wxID_OK, this));
wxGetApp().UpdateDarkUI(this->FindWindowById(wxID_CANCEL, this));
Expand All @@ -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(grid_sizer , 1, 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);

SetSizer(topSizer);
Expand Down Expand Up @@ -390,6 +393,7 @@ void EditGCodeDialog::bind_list_and_button()
{
m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) {
wxString label;
wxString description;

const std::string opt_key = m_params_list->GetSelectedParamKey();
if (!opt_key.empty()) {
Expand Down Expand Up @@ -427,12 +431,17 @@ void EditGCodeDialog::bind_list_and_button()
(!cod->full_label.empty() && !cod->label.empty() ) ?
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);

if (cod)
description = _(cod->tooltip);
}
else
label = "Undef optptr";
}

m_param_label->SetLabel(label);
m_param_description->SetLabel(description);

Layout();
});

Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/EditGCodeDialog.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class EditGCodeDialog : public DPIDialog
ScalableButton* m_add_btn {nullptr};
wxTextCtrl* m_gcode_editor {nullptr};
wxStaticText* m_param_label {nullptr};
wxStaticText* m_param_description {nullptr};

DynamicConfig m_read_write_config;
DynamicConfig m_universal_config;
Expand Down

0 comments on commit d652f15

Please sign in to comment.