diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ac34f5..50bb415 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,9 +50,9 @@ if (SLIC3R_GUI) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}") if (SLIC3R_WX_STABLE) - find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl) + find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl aui net webview) else () - find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl) + find_package(wxWidgets 3.1 REQUIRED COMPONENTS base core adv html gl aui net webview) if (NOT wxWidgets_FOUND) message(FATAL_ERROR "\nCould not find wxWidgets 3.1.\n" @@ -62,7 +62,7 @@ if (SLIC3R_GUI) include(${wxWidgets_USE_FILE}) else () - find_package(wxWidgets 3.2 REQUIRED COMPONENTS html adv gl core base webview aui net media) + find_package(wxWidgets 3.2 REQUIRED COMPONENTS html adv gl core base webview aui net) endif () if(UNIX) diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 2aabbec..6fadaca 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -1027,6 +1027,8 @@ void Choice::BUILD() { set_selection(); } }*/ + //B35 +#if defined(__WIN32__) || defined(__WXMAC__) if (m_opt.enum_def) { if (auto& labels = m_opt.enum_def->labels(); !labels.empty()) { @@ -1059,6 +1061,17 @@ void Choice::BUILD() { set_selection(); } } +#elif defined __linux__ + if (m_opt.enum_def) { + if (auto& labels = m_opt.enum_def->labels(); !labels.empty()) { + bool localized = m_opt.enum_def->has_labels(); + for (const std::string& el : labels) + temp->Append(localized ? _(from_u8(el)) : from_u8(el)); + set_selection(); + } + } +#endif + temp->Bind(wxEVT_MOUSEWHEEL, [this](wxMouseEvent& e) { if (m_suppress_scroll && !m_is_dropped) diff --git a/src/slic3r/GUI/GuideWebView.hpp b/src/slic3r/GUI/GuideWebView.hpp index d233051..bbc9ad2 100644 --- a/src/slic3r/GUI/GuideWebView.hpp +++ b/src/slic3r/GUI/GuideWebView.hpp @@ -26,6 +26,11 @@ #include +//B35 +#if defined __linux__ +#include +#endif + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index ee58490..c24de24 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -859,7 +859,10 @@ void MainFrame::create_preset_tabs() add_created_tab(new TabPrinter(m_tabpanel), wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() == ptFFF ? "printer" : "sla_printer"); //B4 m_printer_view = new PrinterWebView(m_tabpanel); - m_printer_view->Hide(); + //B35 + #if defined(__WIN32__) || defined(__WXMAC__) + m_printer_view->Hide(); + #endif #ifdef _MSW_DARK_MODE if (!wxGetApp().tabs_as_menu()) dynamic_cast(m_tabpanel)->AddPage(m_printer_view, _L("Device"), "tab_monitor_active"); @@ -873,7 +876,10 @@ void MainFrame::create_preset_tabs() if (strlang != "") url = wxString::Format("file://%s/web/guide/index.html?lang=%s", from_u8(resources_dir()), strlang); m_guide_view->load_url(url); - m_guide_view->Hide(); + //B35 + #if defined(__WIN32__) || defined(__WXMAC__) + m_guide_view->Hide(); + #endif #ifdef _MSW_DARK_MODE if (!wxGetApp().tabs_as_menu()) dynamic_cast(m_tabpanel)->AddPage(m_guide_view, _L("Guide"), "userguide"); diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 4356268..e79cc3f 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -25,6 +25,11 @@ #include "wx/textctrl.h" #include +//B35 +#if defined __linux__ +#include +#endif + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp index e2a6cb4..3b15c14 100644 --- a/src/slic3r/GUI/Widgets/DropDown.hpp +++ b/src/slic3r/GUI/Widgets/DropDown.hpp @@ -5,6 +5,12 @@ #include "../wxExtensions.hpp" #include "StateHandler.hpp" #include "PopupWindow.hpp" +//B35 +#if defined __linux__ +#include +#include "wx/dcbuffer.h" +#include "wx/display.h" +#endif #define DD_NO_CHECK_ICON 0x0001 #define DD_NO_TEXT 0x0002 diff --git a/src/slic3r/GUI/Widgets/Label.hpp b/src/slic3r/GUI/Widgets/Label.hpp index e13faf5..7e71517 100644 --- a/src/slic3r/GUI/Widgets/Label.hpp +++ b/src/slic3r/GUI/Widgets/Label.hpp @@ -6,6 +6,11 @@ #define LB_HYPERLINK 0x0020 #define LB_PROPAGATE_MOUSE_EVENT 0x0040 +//B35 +#if defined __linux__ +#include +#include "wx/dcclient.h" +#endif class Label : public wxStaticText { diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp index 9709010..18d6272 100644 --- a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp +++ b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp @@ -3,6 +3,13 @@ #include "../wxExtensions.hpp" + +//B35 +#if defined __linux__ +#include +#include +#endif + class RoundedRectangle : public wxWindow { public: diff --git a/src/slic3r/GUI/Widgets/StateHandler.hpp b/src/slic3r/GUI/Widgets/StateHandler.hpp index c231b8f..8aded43 100644 --- a/src/slic3r/GUI/Widgets/StateHandler.hpp +++ b/src/slic3r/GUI/Widgets/StateHandler.hpp @@ -5,6 +5,13 @@ #include "StateColor.hpp" +//B35 +#if defined __linux__ +#include +#include +#endif + + wxDECLARE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent); class StateHandler : public wxEvtHandler diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp index b617440..998dd44 100644 --- a/src/slic3r/GUI/Widgets/WebView.cpp +++ b/src/slic3r/GUI/Widgets/WebView.cpp @@ -19,6 +19,11 @@ #elif defined __linux__ #include #define WEBKIT_API +//B35 +#if defined __linux__ +#include +#endif + struct WebKitWebView; struct WebKitJavascriptResult; extern "C" { diff --git a/src/slic3r/Utils/Udp.hpp b/src/slic3r/Utils/Udp.hpp index 00ae1cb..d1802c8 100644 --- a/src/slic3r/Utils/Udp.hpp +++ b/src/slic3r/Utils/Udp.hpp @@ -14,6 +14,11 @@ #include #include +//B35 +#if defined __linux__ +#include +#endif + namespace Slic3r {