From 91e3b9b5a43871c364a8e03d0d156c9110e57cc5 Mon Sep 17 00:00:00 2001 From: thysson2701 Date: Tue, 21 Jul 2026 22:42:44 +0200 Subject: [PATCH] fix(build): sync GUI_App.hpp cloud-provider method declarations with ImageMap cpp --- src/slic3r/GUI/GUI_App.hpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index d2cb1a80fea..83a43ca1ab4 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -463,25 +463,25 @@ public: void ShowUserLogin(bool show = true); void ShowOnlyFilament(); //BBS - void request_login(bool show_user_info = false); - bool check_login(); - void get_login_info(); + void request_login(bool show_user_info = false, const std::string& provider = ORCA_CLOUD_PROVIDER); + bool check_login(const std::string& provider = ORCA_CLOUD_PROVIDER); + void get_login_info(const std::string& provider = ORCA_CLOUD_PROVIDER); bool is_user_login(const std::string& provider = ORCA_CLOUD_PROVIDER); const std::string& get_printer_cloud_provider() const; - void request_user_login(int online_login = 0); - void request_user_handle(int online_login = 0); - void request_user_logout(); - int request_user_unbind(std::string dev_id); + void request_user_login(int online_login = 0, const std::string& provider = ORCA_CLOUD_PROVIDER); + void request_user_handle(int online_login = 0, const std::string& provider = ORCA_CLOUD_PROVIDER); + void request_user_logout(const std::string& provider = ORCA_CLOUD_PROVIDER); + int request_user_unbind(std::string dev_id, const std::string& provider = ORCA_CLOUD_PROVIDER); std::string handle_web_request(std::string cmd); - void handle_script_message(std::string msg); + void handle_script_message(std::string msg, const std::string& provider = ORCA_CLOUD_PROVIDER); void request_model_download(wxString url); void download_project(std::string project_id); void request_project_download(std::string project_id); void request_open_project(std::string project_id); void request_remove_project(std::string project_id); - void handle_http_error(unsigned int status, std::string body); + void handle_http_error(unsigned int status, std::string body, const std::string& provider = ORCA_CLOUD_PROVIDER); void on_http_error(wxCommandEvent &evt); void on_update_machine_list(wxCommandEvent& evt); void on_user_login(wxCommandEvent &evt); @@ -511,16 +511,17 @@ public: void sync_preset(Preset* preset); void start_sync_user_preset(bool with_progress_dlg = false); void stop_sync_user_preset(); - void start_http_server(); - void start_http_server(int port); + void start_http_server(const std::string& provider); + void start_http_server(int port, const std::string& provider); + void post_logout_to_webview(const std::string& provider = ORCA_CLOUD_PROVIDER); void stop_http_server(); void switch_staff_pick(bool on); - void on_show_check_privacy_dlg(int online_login = 0); + void on_show_check_privacy_dlg(int online_login = 0, const std::string& provider = ORCA_CLOUD_PROVIDER); void show_check_privacy_dlg(wxCommandEvent& evt); void on_check_privacy_update(wxCommandEvent &evt); bool check_privacy_update(); - void check_privacy_version(int online_login = 0); + void check_privacy_version(int online_login = 0, const std::string& provider = ORCA_CLOUD_PROVIDER); void check_track_enable(); static bool catch_error(std::function cb, const std::string& err); @@ -563,7 +564,7 @@ public: void load_current_presets(bool active_preset_combox = false, bool check_printer_presets = true, bool sync_filaments_to_nozzles = true); std::vector &get_delete_cache_presets(); std::vector get_delete_cache_presets_lock(); - void delete_preset_from_cloud(std::string setting_id); + void delete_preset_from_cloud(std::string setting_id, std::string preset_file_path); void preset_deleted_from_cloud(std::string setting_id); wxString filter_string(wxString str);