From 89a8103bad129deb112821ba1adbdf1b0767849b Mon Sep 17 00:00:00 2001 From: Rudokhvist Date: Fri, 19 Sep 2025 11:08:36 +0300 Subject: [PATCH 1/2] fix build --- src/slic3r/GUI/GUI_App.cpp | 13 ++++++++++++- src/slic3r/GUI/GUI_App.hpp | 8 ++++++-- src/slic3r/GUI/MainFrame.cpp | 2 +- src/slic3r/GUI/PrinterWebView.hpp | 2 ++ src/slic3r/GUI/SelectMachine.hpp | 2 ++ src/slic3r/GUI/SendMultiMachinePage.cpp | 2 ++ src/slic3r/GUI/SyncBoxInfoDialog.cpp | 2 ++ src/slic3r/GUI/SyncBoxInfoDialog.hpp | 3 ++- src/slic3r/GUI/WebUserLoginDialog.cpp | 2 ++ 9 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 14626a7..8dfd59c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4258,15 +4258,18 @@ wxString GUI_App::transition_tridid(int trid_id, bool is_n3s) const //QDS void GUI_App::request_login(bool show_user_info) { +#if QDT_RELEASE_TO_PUBLIC ShowUserLogin(); if (show_user_info) { get_login_info(); } +#endif } void GUI_App::get_login_info() { +#if QDT_RELEASE_TO_PUBLIC // if (m_agent) { // if (m_agent->is_user_login()) { // std::string login_cmd = m_agent->build_login_cmd(); @@ -4339,13 +4342,16 @@ void GUI_App::get_login_info() GUI::wxGetApp().run_script_left(strJS); m_qidi_login = false; } +#endif } bool GUI_App::is_user_login() { +#if QDT_RELEASE_TO_PUBLIC if (m_agent) { return m_agent->is_user_login(); } +#endif return false; } @@ -4353,6 +4359,7 @@ bool GUI_App::is_user_login() bool GUI_App::check_login() { bool result = false; +#if QDT_RELEASE_TO_PUBLIC if (m_agent) { result = m_agent->is_user_login(); } @@ -4360,6 +4367,7 @@ bool GUI_App::check_login() if (!result) { ShowUserLogin(); } +#endif return result; } @@ -5119,10 +5127,13 @@ void GUI_App::check_update(bool show_tips, int by_user) //B y41 void GUI_App::check_new_version(bool show_tips, int by_user) { +#if QDT_RELEASE_TO_PUBLIC QIDINetwork qidi; qidi.check_new_version(show_tips, by_user); +#endif } +#if QDT_RELEASE_TO_PUBLIC void GUI_App::update_versioninfo(QIDIVersion version) { version_info.url = version.url; @@ -5130,7 +5141,7 @@ void GUI_App::update_versioninfo(QIDIVersion version) version_info.description = version.description; version_info.force_upgrade = version.force_upgrade; } - +#endif //QDS pop up a dialog and download files void GUI_App::request_new_version(int by_user) diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index dbb42ff..ff1edaf 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -271,8 +271,9 @@ private: wxColour m_color_selected_btn_bg; bool m_force_colors_update { false }; //#endif - +#if QDT_RELEASE_TO_PUBLIC std::vector m_devices; +#endif std::vector m_mode_palette; @@ -437,9 +438,10 @@ public: #endif //_MSW_DARK_MODE //#endif - +#if QDT_RELEASE_TO_PUBLIC std::vector get_devices() { return m_devices; }; void set_devices(std::vector devices) { m_devices = devices; }; +#endif const wxFont& small_font() { return m_small_font; } @@ -719,7 +721,9 @@ public: const ColorRGB& get_picking_color() const; //y +#if QDT_RELEASE_TO_PUBLIC void update_versioninfo(QIDIVersion version); +#endif private: int updating_qidi_networking(); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 56fbc1f..c254132 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -71,7 +71,7 @@ #include //y -#ifdef QDT_RELEASE_TO_PUBLIC +#if QDT_RELEASE_TO_PUBLIC #include "../QIDI/QIDINetwork.hpp" #endif diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 413e8cf..9b8fad4 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -39,7 +39,9 @@ #include //B64 +#if QDT_RELEASE_TO_PUBLIC #include "../QIDI/QIDINetwork.hpp" +#endif #include #include "./Widgets/SwitchButton.hpp" #include "./Widgets/DeviceButton.hpp" diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index 0aaec6c..4e9fe59 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -346,7 +346,9 @@ private: Machine_info select_machine; //w42 +#if QDT_RELEASE_TO_PUBLIC Box_info machine_filament_info; +#endif bool has_box_machine = false; diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index ea6bb0f..c957159 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -1881,6 +1881,7 @@ void SendMultiMachinePage::StopThread() { } void SendMultiMachinePage::ThreadWorker() { +#if QDT_RELEASE_TO_PUBLIC QIDINetwork qidi; wxString msg = ""; while (!m_stopThread) { @@ -1892,6 +1893,7 @@ void SendMultiMachinePage::ThreadWorker() { temp_obj->ams_exist_bits = qidi.get_box_state(msg, temp_obj->dev_url, temp_obj->dev_apikey) ? 1 : 0; } } +#endif } void SendMultiMachinePage::OnClose(wxCloseEvent& event) diff --git a/src/slic3r/GUI/SyncBoxInfoDialog.cpp b/src/slic3r/GUI/SyncBoxInfoDialog.cpp index cee9dd8..a853a84 100644 --- a/src/slic3r/GUI/SyncBoxInfoDialog.cpp +++ b/src/slic3r/GUI/SyncBoxInfoDialog.cpp @@ -3432,6 +3432,7 @@ void GetBoxInfoDialog::synchronization(wxCommandEvent &event) #endif } +#if QDT_RELEASE_TO_PUBLIC void GetBoxInfoDialog::generate_filament_id(GUI::Box_info& machine_filament_info) { std::string filament_id = "QD"; @@ -3468,6 +3469,7 @@ void GetBoxInfoDialog::update_filament_info(GUI::Box_info& machine_filament_info std::string preset_name_box = wxGetApp().get_tab(Preset::TYPE_PRINTER)->get_presets()->get_edited_preset().name; m_plater->box_msg.box_list_preset_name = preset_name_box; } +#endif void GetBoxInfoDialog::cancel(wxCommandEvent &event) { diff --git a/src/slic3r/GUI/SyncBoxInfoDialog.hpp b/src/slic3r/GUI/SyncBoxInfoDialog.hpp index e131598..1e1df7d 100644 --- a/src/slic3r/GUI/SyncBoxInfoDialog.hpp +++ b/src/slic3r/GUI/SyncBoxInfoDialog.hpp @@ -385,9 +385,10 @@ public: void on_dpi_changed(const wxRect& suggested_rect) override; void init_printer_combox(); std::string NormalizeVendor(const std::string& str); +#if QDT_RELEASE_TO_PUBLIC void generate_filament_id(GUI::Box_info& machine_filament_info); void update_filament_info(GUI::Box_info& machine_filament_info); - +#endif std::vector m_printer_ip; std::vector m_printer_api_key; diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 94bc6b1..b4828d9 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -25,7 +25,9 @@ #include #include +#if QDT_RELEASE_TO_PUBLIC #include "../QIDI/QIDINetwork.hpp" +#endif #include From 4648145b677ad5b60667b2440e4db6f6f31b0263 Mon Sep 17 00:00:00 2001 From: Rudokhvist Date: Fri, 19 Sep 2025 18:12:47 +0300 Subject: [PATCH 2/2] switch to new tool for appimage building --- src/platform/unix/build_appimage.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/unix/build_appimage.sh.in b/src/platform/unix/build_appimage.sh.in index 8e67e86..6732037 100644 --- a/src/platform/unix/build_appimage.sh.in +++ b/src/platform/unix/build_appimage.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -APPIMAGETOOLURL="https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage" +APPIMAGETOOLURL="https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" APP_IMAGE="@SLIC3R_APP_KEY@_ubu64.AppImage"