PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-06-01 12:39:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Tech ENABLE_GCODE_VIEWER_AS_STATE set as default

Browse Source
This commit is contained in:
enricoturri1966
2020-08-03 15:00:19 +02:00
parent 0eb6ba96d6
commit 0840b2328a
13 changed files with 91 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/MainFrame.hpp
View File

@@ -68,7 +68,7 @@ class MainFrame : public DPIFrame
wxString m_qs_last_input_file = wxEmptyString;
wxString m_qs_last_output_file = wxEmptyString;
wxString m_last_config = wxEmptyString;
#if ENABLE_GCODE_VIEWER_AS_STATE
#if ENABLE_GCODE_VIEWER
wxMenuBar* m_editor_menubar{ nullptr };
wxMenuBar* m_gcodeviewer_menubar{ nullptr };
@@ -79,7 +79,7 @@ class MainFrame : public DPIFrame
};
RestoreFromGCodeViewer m_restore_from_gcode_viewer;
#endif // ENABLE_GCODE_VIEWER_AS_STATE
#endif // ENABLE_GCODE_VIEWER
#if 0
wxMenuItem* m_menu_item_repeat { nullptr }; // doesn't used now
@@ -134,14 +134,14 @@ class MainFrame : public DPIFrame
Old,
New,
Dlg,
#if ENABLE_GCODE_VIEWER_AS_STATE
#if ENABLE_GCODE_VIEWER
GCodeViewer
#endif // ENABLE_GCODE_VIEWER_AS_STATE
#endif // ENABLE_GCODE_VIEWER
};
ESettingsLayout m_layout{ ESettingsLayout::Unknown };
#if ENABLE_GCODE_VIEWER_AS_STATE
#if ENABLE_GCODE_VIEWER
public:
enum class EMode : unsigned char
{
@@ -151,7 +151,7 @@ public:
private:
EMode m_mode{ EMode::Editor };
#endif // ENABLE_GCODE_VIEWER_AS_STATE
#endif // ENABLE_GCODE_VIEWER
protected:
virtual void on_dpi_changed(const wxRect &suggested_rect);
@@ -173,7 +173,7 @@ public:
void init_tabpanel();
void create_preset_tabs();
void add_created_tab(Tab* panel);
#if ENABLE_GCODE_VIEWER_AS_STATE
#if ENABLE_GCODE_VIEWER
void init_editor_menubar();
void update_editor_menubar();
void init_gcodeviewer_menubar();
@@ -183,7 +183,7 @@ public:
#else
void init_menubar();
void update_menubar();
#endif // ENABLE_GCODE_VIEWER_AS_STATE
#endif // ENABLE_GCODE_VIEWER
void update_ui_from_settings();
bool is_loaded() const { return m_loaded; }