mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-09 10:16:50 +00:00
Match button styles on whole UI and fixes for button class (#11233)
* init * web buttons * Bind Dialog & Fix states * update * update * Update common.css * objcolordialog * privacy update dialog * Update CaliHistoryDialog.cpp * Update MultiMachineManagerPage.cpp * Update AMSControl.cpp * TipsDialog * Update AMSMaterialsSetting.cpp * extrusion calibration * Update UpdateDialogs.cpp * recenterdialog * update * Update Calibration.cpp * update * update * update * fix * update * ReleaseNote * update * update * fix remember checkbox position * add comments
This commit is contained in:
@@ -16,7 +16,7 @@ namespace Slic3r { namespace GUI {
|
||||
class DialogButtons : public wxPanel{
|
||||
public:
|
||||
|
||||
DialogButtons(wxWindow* parent, std::vector<wxString> non_translated_labels, const wxString& primary_btn_label = "");
|
||||
DialogButtons(wxWindow* parent, std::vector<wxString> non_translated_labels, const wxString& primary_btn_label = "", const int left_aligned_buttons_count = 0);
|
||||
|
||||
wxBoxSizer* GetSizer() const { return m_sizer; }
|
||||
|
||||
@@ -24,6 +24,8 @@ public:
|
||||
|
||||
Button* GetButtonFromLabel(wxString label);
|
||||
|
||||
Button* GetButtonFromIndex(int index);
|
||||
|
||||
Button* GetOK();
|
||||
Button* GetYES();
|
||||
Button* GetAPPLY();
|
||||
@@ -32,11 +34,15 @@ public:
|
||||
Button* GetCANCEL();
|
||||
Button* GetRETURN();
|
||||
Button* GetNEXT();
|
||||
Button* GetFIRST();
|
||||
Button* GetLAST();
|
||||
|
||||
void SetPrimaryButton(wxString label);
|
||||
|
||||
void SetAlertButton(wxString label);
|
||||
|
||||
void SetLeftAlignedButtonsCount(int left_aligned_buttons_count);
|
||||
|
||||
void UpdateButtons();
|
||||
|
||||
~DialogButtons();
|
||||
@@ -47,6 +53,7 @@ private:
|
||||
std::vector<Button*> m_buttons;
|
||||
wxString m_primary;
|
||||
wxString m_alert;
|
||||
int m_left_aligned_buttons_count;
|
||||
|
||||
// missing ones Transfer / Update / Create
|
||||
const std::map<wxString, wxStandardID> m_standardIDs = {
|
||||
@@ -106,12 +113,6 @@ private:
|
||||
wxID_EXIT
|
||||
};
|
||||
|
||||
std::set<wxStandardID> m_left_align_IDs {
|
||||
wxID_DELETE,
|
||||
wxID_BACKWARD,
|
||||
wxID_FORWARD
|
||||
};
|
||||
|
||||
Button* PickFromList(std::set<wxStandardID> ID_list);
|
||||
|
||||
int FromDIP(int d);
|
||||
|
||||
Reference in New Issue
Block a user