juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into cad-mainline

Browse Source
This commit is contained in:
SoftFever
2026-09-18 14:01:23 +08:00
committed by GitHub
parent 4ebac62519 a77209af8f
commit f1f68ffc3f
2596 changed files with 133083 additions and 118866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/MainFrame.hpp
+5 -1
View File
@@ -72,6 +72,7 @@ class Plater;
class DesignPanel;
#endif
class MainFrame;
class WebViewPanel;
class ParamsDialog;
#ifdef __WXGTK__
class ResizeEdgePanel;
@@ -100,7 +101,6 @@ class SettingsDialog : public DPIDialog//DPIDialog
{
//wxNotebook* m_tabpanel { nullptr };
Notebook* m_tabpanel{ nullptr };
MainFrame* m_main_frame { nullptr };
wxMenuBar* m_menubar{ nullptr };
public:
SettingsDialog(MainFrame* mainframe);
@@ -185,6 +185,7 @@ class MainFrame : public DPIFrame
{
FileHistory(int max) : wxFileHistory(max) {}
std::wstring GetThumbnailUrl(int index) const;
bool GetPublished(int index) const;
virtual void AddFileToHistory(const wxString &file);
virtual void RemoveFileFromHistory(size_t i);
@@ -195,6 +196,7 @@ class MainFrame : public DPIFrame
void SetMaxFiles(int max);
private:
std::deque<std::string> m_thumbnails;
std::deque<bool> m_published_files; // parallel to m_thumbnails: is it a published 3mf?
bool m_load_called = false;
};
@@ -348,6 +350,8 @@ public:
bool can_upload() const;
void save_project();
bool save_project_as(const wxString& filename = wxString());
// Open the Publish dialog and export the selected settings as a published 3MF.
void publish_project();
void add_to_recent_projects(const wxString& filename);
void get_recent_projects(boost::property_tree::wptree &tree, int images);