juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-01 06:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch plugin actions loaded during startup

Browse Source
This commit is contained in:
Andrew
2026-07-13 16:00:25 +08:00
parent 88e3e59c64
commit 5a3e4abb18
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/GUI_App.cpp
View File

@@ -3172,6 +3172,17 @@ bool GUI_App::on_init_inner()
refresh_plugins_dialog(); refresh_plugins_dialog();
}); });
// Register all AppAction sources
m_action_registry.add_source(std::make_unique<ScriptActionSource>());
// m_action_registry.add_source(std::make_unique<AnotherActionSource>());
// m_action_registry.add_source(std::make_unique<YetAnotherActionSource>());
// ...
// Initialize with all added sources
// - register callbacks,
// - then enumerate: upsert all actions into registry
m_action_registry.init();
for (const std::string& plugin_key : plugin_mgr.get_catalog().get_enabled_plugin_keys()) { for (const std::string& plugin_key : plugin_mgr.get_catalog().get_enabled_plugin_keys()) {
if (!plugin_mgr.get_loader().is_plugin_loaded(plugin_key)) { if (!plugin_mgr.get_loader().is_plugin_loaded(plugin_key)) {
plugin_mgr.get_loader().load_plugin(plugin_mgr.get_catalog(), plugin_key, false); plugin_mgr.get_loader().load_plugin(plugin_mgr.get_catalog(), plugin_key, false);
@@ -3179,9 +3190,6 @@ bool GUI_App::on_init_inner()
} }
} }
m_action_registry.add_source(std::make_unique<ScriptActionSource>());
m_action_registry.init();
if (m_agent) if (m_agent)
plugin_mgr.set_cloud_agent(std::dynamic_pointer_cast<OrcaCloudServiceAgent>(m_agent->get_cloud_agent())); plugin_mgr.set_cloud_agent(std::dynamic_pointer_cast<OrcaCloudServiceAgent>(m_agent->get_cloud_agent()));

10
src/slic3r/GUI/ScriptActionSource.cpp
View File

@@ -91,15 +91,7 @@ void ScriptActionSource::start(ActionRegistry& sink)
refresh_capability(capability, ActionChange::Removed); refresh_capability(capability, ActionChange::Removed);
}); });
enumerate(); // enumerate
}
void ScriptActionSource::enumerate()
{
assert(wxThread::IsMain());
assert(m_sink != nullptr);
PluginLoader& loader = PluginManager::instance().get_loader();
std::unordered_map<std::string, std::string> source_names; std::unordered_map<std::string, std::string> source_names;
for (const PluginDescriptor& desc : loader.get_all_loaded_plugin_descriptors()) for (const PluginDescriptor& desc : loader.get_all_loaded_plugin_descriptors())
if (!desc.name.empty()) if (!desc.name.empty())

1
src/slic3r/GUI/ScriptActionSource.hpp
View File

@@ -26,7 +26,6 @@ public:
void start(ActionRegistry& sink) override; void start(ActionRegistry& sink) override;
private: private:
void enumerate();
void refresh_source(const std::string& plugin_key, ActionChange change); void refresh_source(const std::string& plugin_key, ActionChange change);
void refresh_capability(const std::string& plugin_key, const std::string& capability, ActionChange change); void refresh_capability(const std::string& plugin_key, const std::string& capability, ActionChange change);
std::shared_ptr<AppAction> make_action(const std::string& plugin_key, const std::string& capability, std::shared_ptr<AppAction> make_action(const std::string& plugin_key, const std::string& capability,