mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-03 20:13:59 -06:00
A *lot* of import fixes for flatpak (#3909)
* A *lot* of import fixes for flatpak Aside, thank you @hadess for the majority of these fixes. You are the base point for a lot of issues fixed during the creation of this flatpak. * Use slic3r::load_string_file Boost 1.84 removed `boost::fs::load_string_file` so use the func located in Utils.hpp
This commit is contained in:
parent
4110ecc968
commit
951fc8e98a
114 changed files with 214 additions and 45 deletions
|
@ -4,6 +4,8 @@
|
|||
#include "../I18N.hpp"
|
||||
#include "../GUI_App.hpp"
|
||||
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <wx/simplebook.h>
|
||||
#include <wx/dcgraph.h>
|
||||
#include "CalibUtils.hpp"
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#include "AxisCtrlButton.hpp"
|
||||
#include "Label.hpp"
|
||||
#include "libslic3r/libslic3r.h"
|
||||
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal)));
|
||||
|
@ -365,4 +367,4 @@ void AxisCtrlButton::sendButtonEvent()
|
|||
event.SetEventObject(this);
|
||||
event.SetInt(current_pos);
|
||||
GetEventHandler()->ProcessEvent(event);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#include "DropDown.hpp"
|
||||
#include "Label.hpp"
|
||||
|
||||
#include <wx/display.h>
|
||||
#include <wx/dcbuffer.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
#ifdef __WXGTK__
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef slic3r_GUI_DropDown_hpp_
|
||||
#define slic3r_GUI_DropDown_hpp_
|
||||
|
||||
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||
#include <wx/stattext.h>
|
||||
#include "../wxExtensions.hpp"
|
||||
#include "StateHandler.hpp"
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#include "ErrorMsgStaticText.hpp"
|
||||
#include <wx/dcclient.h>
|
||||
|
||||
ErrorMsgStaticText::ErrorMsgStaticText() {}
|
||||
|
||||
|
@ -51,4 +52,4 @@ void ErrorMsgStaticText::paintEvent(wxPaintEvent &evt)
|
|||
SetMinSize(wxSize(-1, line_count * text_height));
|
||||
SetMaxSize(wxSize(-1, line_count * text_height));
|
||||
dc.DrawText(out_txt, 0, 0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#ifndef _WX_ERRORMSGSTATTEXT_H_
|
||||
#define _WX_ERRORMSGSTATTEXT_H_
|
||||
|
||||
#include <wx/panel.h>
|
||||
#include "wx/stattext.h"
|
||||
|
||||
class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel
|
||||
|
@ -19,4 +20,4 @@ public:
|
|||
void SetLabel(wxString msg){m_msg = msg;};
|
||||
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include "StaticBox.hpp"
|
||||
#include "../wxExtensions.hpp"
|
||||
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox)
|
||||
|
@ -369,4 +370,4 @@ void FanSwitchButton::sendButtonEvent()
|
|||
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
|
||||
event.SetEventObject(this);
|
||||
GetEventHandler()->ProcessEvent(event);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
#include "Label.hpp"
|
||||
#include "StaticBox.hpp"
|
||||
#include <wx/intl.h> // For wxLocale
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/settings.h>
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
|
||||
wxFont Label::sysFont(int size, bool bold)
|
||||
{
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include "ProgressBar.hpp"
|
||||
#include "../I18N.hpp"
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
#include "Label.hpp"
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#define slic3r_GUI_PROGRESSDIALOG_hpp_
|
||||
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/progdlg.h"
|
||||
#include "wx/weakref.h"
|
||||
#include "wx/simplebook.h"
|
||||
#include "Button.hpp"
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include "RoundedRectangle.hpp"
|
||||
#include "../wxExtensions.hpp"
|
||||
#include <wx/dcgraph.h>
|
||||
#include <wx/dcclient.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)
|
||||
EVT_PAINT(RoundedRectangle::OnPaint)
|
||||
|
@ -32,4 +33,4 @@ void RoundedRectangle::OnPaint(wxPaintEvent &evt)
|
|||
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
|
||||
dc.DrawRoundedRectangle(0, 0, GetSize().GetWidth(), GetSize().GetHeight(), m_radius);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include "SideButton.hpp"
|
||||
#include "Label.hpp"
|
||||
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(SideButton, wxPanel)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include "SideMenuPopup.hpp"
|
||||
#include "Label.hpp"
|
||||
|
||||
#include <wx/display.h>
|
||||
#include <wx/dcgraph.h>
|
||||
#include "../GUI_App.hpp"
|
||||
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
#ifndef slic3r_GUI_SpinInput_hpp_
|
||||
#define slic3r_GUI_SpinInput_hpp_
|
||||
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/timer.h>
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/valtext.h>
|
||||
#include "StaticBox.hpp"
|
||||
|
||||
class Button;
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#include "StateHandler.hpp"
|
||||
#include <wx/window.h>
|
||||
|
||||
wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent);
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#ifndef slic3r_GUI_StateHandler_hpp_
|
||||
#define slic3r_GUI_StateHandler_hpp_
|
||||
|
||||
#include <memory>
|
||||
#include <wx/event.h>
|
||||
|
||||
#include "StateColor.hpp"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include "StaticBox.hpp"
|
||||
#include "../GUI.hpp"
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(StaticBox, wxWindow)
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#include "Label.hpp"
|
||||
#include "StateColor.hpp"
|
||||
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(StaticLine, wxWindow)
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
#include "StepCtrl.hpp"
|
||||
#include "Label.hpp"
|
||||
|
||||
#include <wx/dc.h>
|
||||
#include <wx/pen.h>
|
||||
|
||||
wxDEFINE_EVENT( EVT_STEP_CHANGING, wxCommandEvent );
|
||||
wxDEFINE_EVENT( EVT_STEP_CHANGED, wxCommandEvent );
|
||||
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
#include "../wxExtensions.hpp"
|
||||
#include "../Utils/MacDarkMode.hpp"
|
||||
|
||||
#include <wx/dcmemory.h>
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
SwitchButton::SwitchButton(wxWindow* parent, wxWindowID id)
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#include "TabCtrl.hpp"
|
||||
|
||||
#include <wx/dc.h>
|
||||
|
||||
wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGING, wxCommandEvent );
|
||||
wxDEFINE_EVENT( wxEVT_TAB_SEL_CHANGED, wxCommandEvent );
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
#include "../wxExtensions.hpp"
|
||||
#include <wx/textctrl.h>
|
||||
#include <wx/stattext.h>
|
||||
#include "StaticBox.hpp"
|
||||
|
||||
wxDECLARE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include "TextCtrl.h"
|
||||
#include "slic3r/GUI/Widgets/Label.hpp"
|
||||
|
||||
#include <wx/dcclient.h>
|
||||
#include <wx/dcgraph.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(TextInput, wxPanel)
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
#include "slic3r/GUI/GUI_App.hpp"
|
||||
#include "slic3r/Utils/MacDarkMode.hpp"
|
||||
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <wx/webviewarchivehandler.h>
|
||||
#include <wx/webviewfshandler.h>
|
||||
#if wxUSE_WEBVIEW_EDGE
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue