3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 08:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Try to fix sub_menu work(on the Scene) under OSX and Linux

Browse source 
+ some code refactoring for context menu inside ObjectList
This commit is contained in:
YuSanka 2018-12-06 14:49:14 +01:00
parent 79986188a7
commit e382692a3f
5 changed files with 130 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/slic3r/GUI/GUI_ObjectList.hpp
View file

@ -54,6 +54,8 @@ class ObjectList : public wxDataViewCtrl
DynamicPrintConfig *m_default_config {nullptr};
wxWindow *m_parent {nullptr};
wxBitmap m_bmp_modifiermesh;
wxBitmap m_bmp_solidmesh;
wxBitmap m_bmp_support_enforcer;
@ -62,6 +64,13 @@ class ObjectList : public wxDataViewCtrl
wxBitmap m_bmp_cog;
wxBitmap m_bmp_split;
wxMenu m_menu_object;
wxMenu m_menu_part;
wxMenu m_menu_sla_object;
wxMenuItem* m_menu_item_split { nullptr };
wxMenuItem* m_menu_item_split_part { nullptr };
wxMenuItem* m_menu_item_settings { nullptr };
std::vector<wxBitmap*> m_bmp_vector;
int m_selected_object_id = -1;
@ -109,13 +118,14 @@ public:
void on_drop_possible(wxDataViewEvent &event);
void on_drop(wxDataViewEvent &event);
void get_settings_choice(wxMenu *menu, int id, bool is_part);
void menu_item_add_generic(wxMenuItem* &menu, int id, const int type);
wxMenuItem* menu_item_split(wxMenu* menu, int id);
wxMenuItem* menu_item_settings(wxMenu* menu, int id, const bool is_part);
wxMenu* create_object_popupmenu();
wxMenu* create_part_popupmenu();
wxMenu* create_settings_popupmenu(bool is_part);
void get_settings_choice(const wxString& cat_name, const bool is_part);
void menu_item_add_generic(wxMenuItem* &menu, const int type);
wxMenuItem* menu_item_split(wxMenu* menu);
wxMenuItem* menu_item_settings(wxMenu* menu, const bool is_part, const bool is_sla_menu);
void create_object_popupmenu(wxMenu *menu);
void create_sla_object_popupmenu(wxMenu *menu);
void create_part_popupmenu(wxMenu *menu);
wxMenu* create_settings_popupmenu(wxMenu *parent_menu, bool is_part, const bool is_sla_menu);
void update_opt_keys(t_config_option_keys& t_optopt_keys);
@ -127,9 +137,9 @@ public:
void del_settings_from_config();
void del_instances_from_object(const int obj_idx);
bool del_subobject_from_object(const int obj_idx, const int idx, const int type);
void split(const bool split_part);
bool get_volume_by_item(const bool split_part, const wxDataViewItem& item, ModelVolume*& volume);
bool is_splittable_object(const bool split_part);
void split();
bool get_volume_by_item(const wxDataViewItem& item, ModelVolume*& volume);
bool is_splittable();
wxPoint get_mouse_position_in_control();
wxBoxSizer* get_sizer() {return m_sizer;}