diff options
author | YuSanka <yusanka@gmail.com> | 2019-09-19 13:30:16 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2019-09-19 13:30:16 +0300 |
commit | 584b37513f54d625f0f3a7490cd63ce48f83a95f (patch) | |
tree | 4785486f18e72e16f4995c8ad30846874c467ae0 /src/slic3r/GUI/GUI_ObjectList.hpp | |
parent | 76a657ce5217ffb92cfa1b68e2080575186e3244 (diff) |
Implemented possibility to create "shape" as an object (#2865)
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectList.hpp')
-rw-r--r-- | src/slic3r/GUI/GUI_ObjectList.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 13d1106fc..4dd618a90 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -132,6 +132,7 @@ private: MenuWithSeparators m_menu_sla_object; MenuWithSeparators m_menu_instance; MenuWithSeparators m_menu_layer; + MenuWithSeparators m_menu_default; wxMenuItem* m_menu_item_settings { nullptr }; wxMenuItem* m_menu_item_split_instances { nullptr }; @@ -208,7 +209,7 @@ public: void set_tooltip_for_item(const wxPoint& pt); void selection_changed(); - void show_context_menu(); + void show_context_menu(const bool evt_context_menu); #ifndef __WXOSX__ void key_event(wxKeyEvent& event); #endif /* __WXOSX__ */ @@ -240,6 +241,7 @@ public: void create_sla_object_popupmenu(wxMenu*menu); void create_part_popupmenu(wxMenu*menu); void create_instance_popupmenu(wxMenu*menu); + void create_default_popupmenu(wxMenu *menu); wxMenu* create_settings_popupmenu(wxMenu *parent_menu); void create_freq_settings_popupmenu(wxMenu *parent_menu, const bool is_object_settings = true); @@ -248,6 +250,7 @@ public: void load_subobject(ModelVolumeType type); void load_part(ModelObject* model_object, std::vector<std::pair<wxString, bool>> &volumes_info, ModelVolumeType type); void load_generic_subobject(const std::string& type_name, const ModelVolumeType type); + void load_shape_object(const std::string &type_name); void del_object(const int obj_idx); void del_subobject_item(wxDataViewItem& item); void del_settings_from_config(const wxDataViewItem& parent_item); @@ -362,7 +365,7 @@ private: // void OnChar(wxKeyEvent& event); #endif /* __WXOSX__ */ void OnContextMenu(wxDataViewEvent &event); - void list_manipulation(); + void list_manipulation(bool evt_context_menu = false); void OnBeginDrag(wxDataViewEvent &event); void OnDropPossible(wxDataViewEvent &event); |