* Upgrade wxWidgets to 3.2.1 Based on prusa3d/PrusaSlicer@9a7e024 Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> * Implement BitmapCache * update wxExtensions while keeping legacy items * update dc.DrawBitmap calls to use get_bitmap * Fix GetSize/Width/Height calls * update BitmapComboBox * fix ifndef in wxExtensions.hpp * update my todos to OcraftyoneTODO * Get to a compilable state Everything seems to be working (including the plater). I am not seeing any graphical issues * fix extruder color icons * fix crash on opening support tab * remove GetBmpSize method from DropDown.cpp * Update TextInput to use bitmap bundles * update a TODO after testing * fix the rendering of the icons on combobox * fix a few todos * fix WipeTowerDialog.cpp * Overhaul WipeTowerDialog Removed simple version of the dialog since BBS removed the functionality but left the code. Center the table (only seen when the table is smaller than the minimum size of the dialog) Fix issue where editing a value causes the m_min_flush_label to change colors slightly Fix an issue where changing a value or running an auto calc changes the disabled value from "-" to "0" * update a few todos * Update some todos * Show dropdown when editing is started * Update NanoSVG.cmake Update NanoSVG to work with PR #2780 * Dim the icon on ComboBox when disabled * solve ObjectDataViewModel todos leaving colPrint and colEditing cases alone as it does not seem to impact anything * Update names in wxExtensions -Rename msw_rescale to sys_color_changed -Replace GetBmpSize, GetBmpWidth, GetBmpHeight with renamed version (same name without "Bmp") Both of these changes were also made by PrusaSlicer. Original Commit: Prusa3D/PrusaSlicer@066b567 Co-authored-by: YuSanka <yusanka@gmail.com> * update BitmapCache::from_svg disable finding bundle in the cache to match load_svg update to match values used in load_svg * Update ScalableButton change the signature and remove functions/vars pertaining to a default bmp fix TODOs in ScalableButton Original Commit: Prusa3D/PrusaSlicer@066b567 Co-authored-by: YuSanka <yusanka@gmail.com> * fix up some more todos in wxExtensions * update ScalableBitmap to use bmp bundles use wxBitmapBundle by default add flag to use old scaled bitmap function (specifically to solve issue with advanced toggle) * attempt to fix macos deps build * fix ubuntu build * Revert "attempt to fix macos deps build" Mistakenly made change to wrong file This reverts commit d9c20b51216db1d409aeb0420d9d901000ad1b00. * update wxWidgets patch an attempt to fix macOS build * Remove duplicate variable from OrcaSlicer.cpp * Fix macOS build issue * Fix blank DataViewItem being added to objects list * Filament ComboBox editor updates -Add show drop down feature to ObjectTable -Call finish editing when ComboBox is closed in ObjectList * remove Apple specific declarations missed during refactor * delete old wxWidgets patch * fix ubuntu seg fault * include patch from #2926 * update patch to include wxWidgets/wxWidgets@991a74c * fix deps not compiling on Windows * update WipeTowerDialog relocates the recalculate button back to its previous position changes the wording of the tip message label add spacing below the matrix * finish patching wxWidgets from prusa3d/PrusaSlicer@f8477d1 and prusa3d/PrusaSlicer@066b567 Co-authored-by: YuSanka <yusanka@gmail.com> * fix combobox crash * revert outside plate changes --------- Co-authored-by: tamasmeszaros <meszaros.q@gmail.com> Co-authored-by: YuSanka <yusanka@gmail.com>
409 lines
12 KiB
C++
409 lines
12 KiB
C++
#ifndef slic3r_Notebook_hpp_
|
|
#define slic3r_Notebook_hpp_
|
|
|
|
//#ifdef _WIN32
|
|
|
|
#include <wx/bookctrl.h>
|
|
|
|
class ModeSizer;
|
|
class ScalableButton;
|
|
class Button;
|
|
|
|
// custom message the ButtonsListCtrl sends to its parent (Notebook) to notify a selection change:
|
|
wxDECLARE_EVENT(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, wxCommandEvent);
|
|
|
|
class ButtonsListCtrl : public wxControl
|
|
{
|
|
public:
|
|
// BBS
|
|
ButtonsListCtrl(wxWindow* parent, wxBoxSizer* side_tools = NULL);
|
|
~ButtonsListCtrl() {}
|
|
|
|
void OnPaint(wxPaintEvent&);
|
|
void SetSelection(int sel);
|
|
void UpdateMode();
|
|
void Rescale();
|
|
void OnColorsChanged();
|
|
bool InsertPage(size_t n, const wxString &text, bool bSelect = false, const std::string &bmp_name = "", const std::string &inactive_bmp_name = "");
|
|
void RemovePage(size_t n);
|
|
bool SetPageImage(size_t n, const std::string& bmp_name) const;
|
|
void SetPageText(size_t n, const wxString& strText);
|
|
wxString GetPageText(size_t n) const;
|
|
|
|
private:
|
|
wxFlexGridSizer* m_buttons_sizer;
|
|
wxBoxSizer* m_sizer;
|
|
// BBS: use Button
|
|
std::vector<Button*> m_pageButtons;
|
|
int m_selection {-1};
|
|
int m_btn_margin;
|
|
int m_line_margin;
|
|
//ModeSizer* m_mode_sizer {nullptr};
|
|
};
|
|
|
|
class Notebook: public wxBookCtrlBase
|
|
{
|
|
public:
|
|
Notebook(wxWindow * parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint & pos = wxDefaultPosition,
|
|
const wxSize & size = wxDefaultSize,
|
|
// BBS
|
|
wxBoxSizer* side_tools = NULL,
|
|
long style = 0)
|
|
{
|
|
Init();
|
|
Create(parent, winid, pos, size, side_tools, style);
|
|
}
|
|
|
|
bool Create(wxWindow * parent,
|
|
wxWindowID winid = wxID_ANY,
|
|
const wxPoint & pos = wxDefaultPosition,
|
|
const wxSize & size = wxDefaultSize,
|
|
// BBS
|
|
wxBoxSizer* side_tools = NULL,
|
|
long style = 0)
|
|
{
|
|
if (!wxBookCtrlBase::Create(parent, winid, pos, size, style | wxBK_TOP))
|
|
return false;
|
|
|
|
m_bookctrl = new ButtonsListCtrl(this, side_tools);
|
|
|
|
wxSizer* mainSizer = new wxBoxSizer(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
|
|
|
|
if (style & wxBK_RIGHT || style & wxBK_BOTTOM)
|
|
mainSizer->Add(0, 0, 1, wxEXPAND, 0);
|
|
|
|
m_controlSizer = new wxBoxSizer(IsVertical() ? wxHORIZONTAL : wxVERTICAL);
|
|
m_controlSizer->Add(m_bookctrl, wxSizerFlags(1).Expand());
|
|
wxSizerFlags flags;
|
|
if (IsVertical())
|
|
flags.Expand();
|
|
else
|
|
flags.CentreVertical();
|
|
mainSizer->Add(m_controlSizer, flags.Border(wxALL, m_controlMargin));
|
|
SetSizer(mainSizer);
|
|
|
|
this->Bind(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, [this](wxCommandEvent& evt)
|
|
{
|
|
if (int page_idx = evt.GetId(); page_idx >= 0)
|
|
SetSelection(page_idx);
|
|
});
|
|
|
|
this->Bind(wxEVT_NAVIGATION_KEY, &Notebook::OnNavigationKey, this);
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
// Methods specific to this class.
|
|
|
|
// A method allowing to add a new page without any label (which is unused
|
|
// by this control) and show it immediately.
|
|
bool ShowNewPage(wxWindow * page)
|
|
{
|
|
return AddPage(page, wxString(), "", "");
|
|
}
|
|
|
|
|
|
// Set effect to use for showing/hiding pages.
|
|
void SetEffects(wxShowEffect showEffect, wxShowEffect hideEffect)
|
|
{
|
|
m_showEffect = showEffect;
|
|
m_hideEffect = hideEffect;
|
|
}
|
|
|
|
// Or the same effect for both of them.
|
|
void SetEffect(wxShowEffect effect)
|
|
{
|
|
SetEffects(effect, effect);
|
|
}
|
|
|
|
// And the same for time outs.
|
|
void SetEffectsTimeouts(unsigned showTimeout, unsigned hideTimeout)
|
|
{
|
|
m_showTimeout = showTimeout;
|
|
m_hideTimeout = hideTimeout;
|
|
}
|
|
|
|
void SetEffectTimeout(unsigned timeout)
|
|
{
|
|
SetEffectsTimeouts(timeout, timeout);
|
|
}
|
|
|
|
|
|
// Implement base class pure virtual methods.
|
|
|
|
// adds a new page to the control
|
|
bool AddPage(wxWindow* page,
|
|
const wxString& text,
|
|
const std::string& bmp_name,
|
|
const std::string& inactive_bmp_name,
|
|
bool bSelect = false)
|
|
{
|
|
DoInvalidateBestSize();
|
|
return InsertPage(GetPageCount(), page, text, bmp_name, inactive_bmp_name, bSelect);
|
|
}
|
|
|
|
// Page management
|
|
virtual bool InsertPage(size_t n,
|
|
wxWindow * page,
|
|
const wxString & text,
|
|
bool bSelect = false,
|
|
int imageId = NO_IMAGE) override
|
|
{
|
|
if (!wxBookCtrlBase::InsertPage(n, page, text, bSelect, imageId))
|
|
return false;
|
|
|
|
GetBtnsListCtrl()->InsertPage(n, text, bSelect);
|
|
|
|
if (!DoSetSelectionAfterInsertion(n, bSelect))
|
|
page->Hide();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool InsertPage(size_t n,
|
|
wxWindow * page,
|
|
const wxString & text,
|
|
const std::string& bmp_name = "",
|
|
const std::string& inactive_bmp_name = "",
|
|
bool bSelect = false)
|
|
{
|
|
if (!wxBookCtrlBase::InsertPage(n, page, text, bSelect))
|
|
return false;
|
|
|
|
GetBtnsListCtrl()->InsertPage(n, text, bSelect, bmp_name, inactive_bmp_name);
|
|
|
|
if (bSelect)
|
|
SetSelection(n);
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual int SetSelection(size_t n) override
|
|
{
|
|
int ret = DoSetSelection(n, SetSelection_SendEvent);
|
|
int new_sel = GetSelection();
|
|
//check the new_sel firstly
|
|
if (new_sel != n) {
|
|
//not allowed, skip it
|
|
return ret;
|
|
}
|
|
GetBtnsListCtrl()->SetSelection(n);
|
|
|
|
// check that only the selected page is visible and others are hidden:
|
|
for (size_t page = 0; page < m_pages.size(); page++) {
|
|
wxWindow* win_a = GetPage(page);
|
|
wxWindow* win_b = GetPage(n);
|
|
if (page != n && GetPage(page) != GetPage(n)) {
|
|
m_pages[page]->Hide();
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
virtual int ChangeSelection(size_t n) override
|
|
{
|
|
GetBtnsListCtrl()->SetSelection(n);
|
|
return DoSetSelection(n);
|
|
}
|
|
|
|
// Neither labels nor images are supported but we still store the labels
|
|
// just in case the user code attaches some importance to them.
|
|
virtual bool SetPageText(size_t n, const wxString & strText) override
|
|
{
|
|
wxCHECK_MSG(n < GetPageCount(), false, wxS("Invalid page"));
|
|
|
|
GetBtnsListCtrl()->SetPageText(n, strText);
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual wxString GetPageText(size_t n) const override
|
|
{
|
|
wxCHECK_MSG(n < GetPageCount(), wxString(), wxS("Invalid page"));
|
|
return GetBtnsListCtrl()->GetPageText(n);
|
|
}
|
|
|
|
virtual bool SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId)) override
|
|
{
|
|
return false;
|
|
}
|
|
|
|
virtual int GetPageImage(size_t WXUNUSED(n)) const override
|
|
{
|
|
return NO_IMAGE;
|
|
}
|
|
|
|
bool SetPageImage(size_t n, const std::string& bmp_name)
|
|
{
|
|
return GetBtnsListCtrl()->SetPageImage(n, bmp_name);
|
|
}
|
|
|
|
// Override some wxWindow methods too.
|
|
virtual void SetFocus() override
|
|
{
|
|
wxWindow* const page = GetCurrentPage();
|
|
if (page)
|
|
page->SetFocus();
|
|
}
|
|
|
|
ButtonsListCtrl* GetBtnsListCtrl() const { return static_cast<ButtonsListCtrl*>(m_bookctrl); }
|
|
|
|
void UpdateMode()
|
|
{
|
|
GetBtnsListCtrl()->UpdateMode();
|
|
}
|
|
|
|
void Rescale()
|
|
{
|
|
GetBtnsListCtrl()->Rescale();
|
|
}
|
|
|
|
void OnColorsChanged()
|
|
{
|
|
GetBtnsListCtrl()->OnColorsChanged();
|
|
}
|
|
|
|
void OnNavigationKey(wxNavigationKeyEvent& event)
|
|
{
|
|
if (event.IsWindowChange()) {
|
|
// change pages
|
|
AdvanceSelection(event.GetDirection());
|
|
}
|
|
else {
|
|
// we get this event in 3 cases
|
|
//
|
|
// a) one of our pages might have generated it because the user TABbed
|
|
// out from it in which case we should propagate the event upwards and
|
|
// our parent will take care of setting the focus to prev/next sibling
|
|
//
|
|
// or
|
|
//
|
|
// b) the parent panel wants to give the focus to us so that we
|
|
// forward it to our selected page. We can't deal with this in
|
|
// OnSetFocus() because we don't know which direction the focus came
|
|
// from in this case and so can't choose between setting the focus to
|
|
// first or last panel child
|
|
//
|
|
// or
|
|
//
|
|
// c) we ourselves (see MSWTranslateMessage) generated the event
|
|
//
|
|
wxWindow* const parent = GetParent();
|
|
|
|
// the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE
|
|
const bool isFromParent = event.GetEventObject() == (wxObject*)parent;
|
|
const bool isFromSelf = event.GetEventObject() == (wxObject*)this;
|
|
const bool isForward = event.GetDirection();
|
|
|
|
if (isFromSelf && !isForward)
|
|
{
|
|
// focus is currently on notebook tab and should leave
|
|
// it backwards (Shift-TAB)
|
|
event.SetCurrentFocus(this);
|
|
parent->HandleWindowEvent(event);
|
|
}
|
|
else if (isFromParent || isFromSelf)
|
|
{
|
|
// no, it doesn't come from child, case (b) or (c): forward to a
|
|
// page but only if entering notebook page (i.e. direction is
|
|
// backwards (Shift-TAB) comething from out-of-notebook, or
|
|
// direction is forward (TAB) from ourselves),
|
|
if (m_selection != wxNOT_FOUND &&
|
|
(!event.GetDirection() || isFromSelf))
|
|
{
|
|
// so that the page knows that the event comes from it's parent
|
|
// and is being propagated downwards
|
|
event.SetEventObject(this);
|
|
|
|
wxWindow* page = m_pages[m_selection];
|
|
if (!page->HandleWindowEvent(event))
|
|
{
|
|
page->SetFocus();
|
|
}
|
|
//else: page manages focus inside it itself
|
|
}
|
|
else // otherwise set the focus to the notebook itself
|
|
{
|
|
SetFocus();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// it comes from our child, case (a), pass to the parent, but only
|
|
// if the direction is forwards. Otherwise set the focus to the
|
|
// notebook itself. The notebook is always the 'first' control of a
|
|
// page.
|
|
if (!isForward)
|
|
{
|
|
SetFocus();
|
|
}
|
|
else if (parent)
|
|
{
|
|
event.SetCurrentFocus(this);
|
|
parent->HandleWindowEvent(event);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
protected:
|
|
virtual void UpdateSelectedPage(size_t WXUNUSED(newsel)) override
|
|
{
|
|
// Nothing to do here, but must be overridden to avoid the assert in
|
|
// the base class version.
|
|
}
|
|
|
|
virtual wxBookCtrlEvent * CreatePageChangingEvent() const override
|
|
{
|
|
return new wxBookCtrlEvent(wxEVT_BOOKCTRL_PAGE_CHANGING,
|
|
GetId());
|
|
}
|
|
|
|
virtual void MakeChangedEvent(wxBookCtrlEvent & event) override
|
|
{
|
|
event.SetEventType(wxEVT_BOOKCTRL_PAGE_CHANGED);
|
|
}
|
|
|
|
virtual wxWindow * DoRemovePage(size_t page) override
|
|
{
|
|
wxWindow* const win = wxBookCtrlBase::DoRemovePage(page);
|
|
if (win)
|
|
{
|
|
GetBtnsListCtrl()->RemovePage(page);
|
|
DoSetSelectionAfterRemoval(page);
|
|
}
|
|
|
|
return win;
|
|
}
|
|
|
|
virtual void DoSize() override
|
|
{
|
|
wxWindow* const page = GetCurrentPage();
|
|
if (page)
|
|
page->SetSize(GetPageRect());
|
|
}
|
|
|
|
virtual void DoShowPage(wxWindow * page, bool show) override
|
|
{
|
|
if (show)
|
|
page->ShowWithEffect(m_showEffect, m_showTimeout);
|
|
else
|
|
page->HideWithEffect(m_hideEffect, m_hideTimeout);
|
|
}
|
|
|
|
private:
|
|
void Init();
|
|
|
|
wxShowEffect m_showEffect,
|
|
m_hideEffect;
|
|
|
|
unsigned m_showTimeout,
|
|
m_hideTimeout;
|
|
};
|
|
//#endif // _WIN32
|
|
#endif // slic3r_Notebook_hpp_
|