juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-05 01:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/plugin-feature' into feature/speed-dial

Browse Source 
# Conflicts:
#	src/slic3r/GUI/PluginsDialog.hpp
This commit is contained in:
Andrew
2026-07-17 13:59:56 +08:00
parent a86202b45b b663f851fe
commit b4f6573753
151 changed files with 5116 additions and 1422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/PluginsDialog.hpp
View File

@@ -52,6 +52,13 @@ private:
void open_plugin_on_cloud(const std::string& sharing_token);
void open_plugin_hub();
void on_script_message(const nlohmann::json& payload) override;
// Runs one web command on a clean main-loop stack; see on_script_message.
void handle_web_command(const nlohmann::json& payload);
// Re-raises this dialog after a transient modal it opened (file dialog, message box,
// progress dialog). Native macOS panels end by re-activating the app's main window
// (the mainframe) instead of this webview-hosting dialog, burying it; wx only
// compensates for generic wxDialog modals (wxDialog::EndModal raises the parent).
void restore_z_order();
void send_plugins();
void set_plugin_sort(const std::string& sort_key, const std::string& sort_order);
@@ -60,7 +67,7 @@ private:
bool get_descriptor(const std::string& plugin_key, Slic3r::PluginDescriptor& descriptor) const;
std::shared_ptr<PluginCapabilityInterface> get_capability(const std::string& plugin_key, PluginCapabilityType type, const std::string& capability_name) const;
void refresh_plugin_catalog_async(const wxString& title, const wxString& message, bool fetch_cloud);
void refresh_plugin_metadata_async(const wxString& title, const wxString& message, bool fetch_cloud);
void refresh_plugins();
void toggle_plugin(const std::string& plugin_key, bool enabled);
void toggle_plugin_capability(const std::string& plugin_key, PluginCapabilityType type, const std::string& capability_name, bool enabled);
@@ -69,7 +76,7 @@ private:
void install_plugin_from_file();
bool install_plugin_package(const std::string& package_path);
bool install_cloud_plugin(const std::string& uuid, const std::string& version, const wxString& name);
void run_script_plugin(const std::string& plugin_key, const std::string& capability_name);
void run_script_plugin_capability(const std::string& plugin_key, const std::string& capability_name);
// Pushes a one-line result into the web footer status bar (level: "success" | "warn" | "error" | "info"),
// used for every plugin/capability operation instead of a modal box so the dialog stays non-disruptive.
void show_status(const wxString& message, const char* level);
@@ -108,7 +115,8 @@ private:
timer->Start(100);
std::thread([alive,
std::thread([this,
alive,
progress,
timer,
run = std::forward<Run>(run),
@@ -125,7 +133,8 @@ private:
if (wxTheApp == nullptr)
return;
wxTheApp->CallAfter([alive,
wxTheApp->CallAfter([this,
alive,
progress,
timer,
on_finish = std::move(on_finish),
@@ -135,6 +144,7 @@ private:
if (alive->load(std::memory_order_acquire)) {
progress->Destroy();
restore_z_order();
on_finish();
} else if (finish_after_dialog_destroyed) {
on_finish();