juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 03:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated settings menu according to the view mode

Browse Source 
+ Created new class PrusaMenu, derived from wxMenu and contains pointers to the separators.
This commit is contained in:
YuSanka
2019-01-25 13:16:32 +01:00
parent 9f734a073f
commit 5a7061a7fb
6 changed files with 99 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/GUI_ObjectList.hpp
View File

@@ -14,6 +14,7 @@
class wxBoxSizer;
class wxMenuItem;
class PrusaObjectDataViewModel;
class PrusaMenu;
namespace Slic3r {
class ConfigOptionsGroup;
@@ -104,15 +105,14 @@ 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;
wxMenu m_menu_instance;
PrusaMenu m_menu_object;
PrusaMenu m_menu_part;
PrusaMenu m_menu_sla_object;
PrusaMenu m_menu_instance;
wxMenuItem* m_menu_item_split { nullptr };
wxMenuItem* m_menu_item_split_part { nullptr };
wxMenuItem* m_menu_item_settings { nullptr };
wxMenuItem* m_menu_item_split_instances { nullptr };
wxMenuItem* m_mi_volumes_settings_separator { nullptr };
std::vector<wxBitmap*> m_bmp_vector;
@@ -163,7 +163,7 @@ public:
void get_settings_choice(const wxString& category_name);
void append_menu_item_add_generic(wxMenuItem* menu, const int type);
void append_menu_items_add_volume(wxMenu* menu, wxMenuItem* *item_separator);
void append_menu_items_add_volume(wxMenu* menu);
wxMenuItem* append_menu_item_split(wxMenu* menu);
wxMenuItem* append_menu_item_settings(wxMenu* menu);
wxMenuItem* append_menu_item_change_type(wxMenu* menu);
@@ -173,6 +173,7 @@ public:
void create_part_popupmenu(wxMenu*menu);
void create_instance_popupmenu(wxMenu*menu);
wxMenu* create_settings_popupmenu(wxMenu *parent_menu);
void create_freq_settings_popupmenu(wxMenu *parent_menu);
void update_opt_keys(t_config_option_keys& t_optopt_keys);