diff options
| author | YuSanka <yusanka@gmail.com> | 2018-09-21 02:33:41 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2018-09-21 02:35:25 +0300 |
| commit | 8b582bbcd1f1f470eee468c658e70bc67d910ae7 (patch) | |
| tree | e87d25afa8db9e3e23bae45fb14c10e0bfdce8e3 /src/slic3r/GUI/MainFrame.hpp | |
| parent | e86f149cbd0ccb09b4477fb44c87ea39517199ad (diff) | |
Menu_bar and preset_tabs are in main window now
Diffstat (limited to 'src/slic3r/GUI/MainFrame.hpp')
| -rw-r--r-- | src/slic3r/GUI/MainFrame.hpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 2156db691..aff8a5985 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -45,8 +45,8 @@ class MainFrame : public wxFrame wxString m_qs_last_output_file = wxEmptyString; wxString m_last_config = wxEmptyString; - ProgressStatusBar* m_statusbar; - AppController* m_appController = nullptr; + ProgressStatusBar* m_statusbar { nullptr }; + AppController* m_appController { nullptr }; std::map<std::string, Tab*> m_options_tabs; wxMenuItem* append_menu_item(wxMenu* menu, @@ -56,10 +56,10 @@ class MainFrame : public wxFrame std::function<void(wxCommandEvent& event)> cb, const std::string& icon = ""); - wxMenuItem* m_menu_item_reslice_now = nullptr; - wxMenu* m_plater_menu = nullptr; - wxMenu* m_object_menu = nullptr; - wxMenu* m_viewMenu = nullptr; + wxMenuItem* m_menu_item_reslice_now { nullptr }; + wxMenu* m_plater_menu { nullptr }; + wxMenu* m_object_menu { nullptr }; + wxMenu* m_viewMenu { nullptr }; std::string get_base_name(const wxString full_name) const ; std::string get_dir_name(const wxString full_name) const ; @@ -70,6 +70,9 @@ public: void init_tabpanel(); + Tab* get_preset_tab(const std::string& name); + void create_preset_tabs(); + void add_created_tab(Tab* panel); void init_menubar(); void update_ui_from_settings(); @@ -90,9 +93,9 @@ public: void select_view(const std::string& direction); - wxPanel* m_plater = nullptr; - wxNotebook* m_tabpanel = nullptr; - wxProgressDialog* m_progress_dialog = nullptr; + wxPanel* m_plater {nullptr}; + wxNotebook* m_tabpanel { nullptr }; + wxProgressDialog* m_progress_dialog { nullptr }; }; } // GUI |