mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
ENH: refine load/unload for spool holder filament
update ams load/unload gcode Change-Id: Ia3d4a26efb14325c89f0c9f9571268c1834361ae Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
parent
9480b84b64
commit
a48c36fde1
11 changed files with 323 additions and 156 deletions
|
@ -22,6 +22,7 @@
|
|||
#include <wx/spinctrl.h>
|
||||
#include <wx/artprov.h>
|
||||
#include <wx/wrapsizer.h>
|
||||
#include <wx/event.h>
|
||||
|
||||
#include "AmsMappingPopup.hpp"
|
||||
#include "GUI_Utils.hpp"
|
||||
|
@ -39,6 +40,7 @@ namespace Slic3r { namespace GUI {
|
|||
|
||||
wxDECLARE_EVENT(EVT_SECONDARY_CHECK_CONFIRM, wxCommandEvent);
|
||||
wxDECLARE_EVENT(EVT_SECONDARY_CHECK_CANCEL, wxCommandEvent);
|
||||
wxDECLARE_EVENT(EVT_SECONDARY_CHECK_FUNC, wxCommandEvent);
|
||||
|
||||
class ReleaseNoteDialog : public DPIDialog
|
||||
{
|
||||
|
@ -98,11 +100,14 @@ public:
|
|||
|
||||
class SecondaryCheckDialog : public DPIFrame
|
||||
{
|
||||
private:
|
||||
wxWindow* event_parent { nullptr };
|
||||
public:
|
||||
enum ButtonStyle {
|
||||
ONLY_CONFIRM = 0,
|
||||
CONFIRM_AND_CANCEL = 1,
|
||||
MAX_STYLE_NUM = 2
|
||||
ONLY_CONFIRM = 0,
|
||||
CONFIRM_AND_CANCEL = 1,
|
||||
CONFIRM_AND_FUNC = 2,
|
||||
MAX_STYLE_NUM = 3
|
||||
};
|
||||
SecondaryCheckDialog(
|
||||
wxWindow* parent,
|
||||
|
@ -118,6 +123,9 @@ public:
|
|||
void on_show();
|
||||
void on_hide();
|
||||
void update_btn_label(wxString ok_btn_text, wxString cancel_btn_text);
|
||||
void update_title_style(wxString title, SecondaryCheckDialog::ButtonStyle style, wxWindow* parent = nullptr);
|
||||
void update_func_btn(wxString func_btn_text);
|
||||
void post_event(wxCommandEvent&& event);
|
||||
void rescale();
|
||||
~SecondaryCheckDialog();
|
||||
void on_dpi_changed(const wxRect& suggested_rect);
|
||||
|
@ -125,8 +133,9 @@ public:
|
|||
Label* m_staticText_release_note {nullptr};
|
||||
wxBoxSizer* m_sizer_main;
|
||||
wxScrolledWindow *m_vebview_release_note {nullptr};
|
||||
Button* m_button_ok;
|
||||
Button* m_button_cancel;
|
||||
Button* m_button_ok { nullptr };
|
||||
Button* m_button_cancel { nullptr };
|
||||
Button* m_button_fn { nullptr };
|
||||
wxCheckBox* m_show_again_checkbox;
|
||||
bool not_show_again = false;
|
||||
std::string show_again_config_text = "";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue