3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GCode viewer using the proper layout when started as a standalone application

Browse source
This commit is contained in:
enricoturri1966 2020-09-08 11:40:06 +02:00
parent 8579184d70
commit ab556a398b
16 changed files with 341 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/MainFrame.hpp
View file

@ -57,7 +57,7 @@ class SettingsDialog : public DPIDialog
MainFrame* m_main_frame { nullptr };
public:
SettingsDialog(MainFrame* mainframe);
~SettingsDialog() {}
~SettingsDialog() = default;
void set_tabpanel(wxNotebook* tabpanel) { m_tabpanel = tabpanel; }
protected:
@ -72,6 +72,9 @@ class MainFrame : public DPIFrame
wxString m_qs_last_output_file = wxEmptyString;
wxString m_last_config = wxEmptyString;
#if ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
wxMenuBar* m_menubar{ nullptr };
#else
wxMenuBar* m_editor_menubar{ nullptr };
wxMenuBar* m_gcodeviewer_menubar{ nullptr };
@ -83,6 +86,7 @@ class MainFrame : public DPIFrame
};
RestoreFromGCodeViewer m_restore_from_gcode_viewer;
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
#endif // ENABLE_GCODE_VIEWER
#if 0
@ -146,6 +150,7 @@ class MainFrame : public DPIFrame
ESettingsLayout m_layout{ ESettingsLayout::Unknown };
#if ENABLE_GCODE_VIEWER
#if !ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
public:
enum class EMode : unsigned char
{
@ -155,6 +160,7 @@ public:
private:
EMode m_mode{ EMode::Editor };
#endif // !ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
#endif // ENABLE_GCODE_VIEWER
protected:
@ -182,16 +188,17 @@ public:
void create_preset_tabs();
void add_created_tab(Tab* panel);
#if ENABLE_GCODE_VIEWER
void init_editor_menubar();
void update_editor_menubar();
void init_gcodeviewer_menubar();
void init_menubar_as_editor();
void init_menubar_as_gcodeviewer();
#if !ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
EMode get_mode() const { return m_mode; }
void set_mode(EMode mode);
#endif // !ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
#else
void init_menubar();
void update_menubar();
#endif // ENABLE_GCODE_VIEWER
void update_menubar();
void update_ui_from_settings();
bool is_loaded() const { return m_loaded; }