parent
6686141d3b
commit
2424eeb74d
10 changed files with 56 additions and 22 deletions
|
|
@ -236,8 +236,6 @@ pub fn start_allowed(cmd: &str) -> bool {
|
|||
| "REPORT"
|
||||
| "CHANGELOG"
|
||||
| "ABOUT"
|
||||
| "PLUGINS"
|
||||
| "PLUGINMANAGER"
|
||||
| "DONATE"
|
||||
| "WEBVERSION"
|
||||
| "HELP"
|
||||
|
|
@ -247,6 +245,8 @@ pub fn start_allowed(cmd: &str) -> bool {
|
|||
| "CUILOAD"
|
||||
| "CUIIMPORT"
|
||||
)
|
||||
|| (!cfg!(target_arch = "wasm32")
|
||||
&& matches!(cmd, "PLUGINS" | "PLUGINMANAGER"))
|
||||
}
|
||||
|
||||
// ── Autocomplete registry — one-shot commands ──────────────────────────────
|
||||
|
|
|
|||
|
|
@ -212,10 +212,17 @@ impl OpenCADStudio {
|
|||
return Some(Task::done(Message::AboutOpen));
|
||||
}
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
"PLUGINS" | "PLUGINMANAGER" => {
|
||||
return Some(Task::done(Message::PluginManagerOpen));
|
||||
}
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
"PLUGINS" | "PLUGINMANAGER" => {
|
||||
self.command_line
|
||||
.push_info("External plugins are available in the desktop app.");
|
||||
}
|
||||
|
||||
"CHANGELOG" => {
|
||||
crate::sys::open_url("https://github.com/HakanSeven12/OpenCADStudio/releases");
|
||||
self.command_line.push_info("Opening release notes...");
|
||||
|
|
|
|||
|
|
@ -1313,6 +1313,7 @@ impl ClipboardDeps {
|
|||
pub enum ModalKind {
|
||||
About,
|
||||
Shortcuts,
|
||||
#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
|
||||
PluginManager,
|
||||
UpdateNotice,
|
||||
Layers,
|
||||
|
|
|
|||
|
|
@ -291,8 +291,11 @@ impl OpenCADStudio {
|
|||
}
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
pub(in crate::app) fn fetch_releases_task(&self, _repo: String) -> Task<Message> {
|
||||
Task::none()
|
||||
pub(in crate::app) fn fetch_releases_task(&self, repo: String) -> Task<Message> {
|
||||
Task::done(Message::PluginReleasesFetched(
|
||||
repo,
|
||||
Err("External plugins are available in the desktop app.".to_string()),
|
||||
))
|
||||
}
|
||||
|
||||
/// Background task: fetch a repository README from its default branch.
|
||||
|
|
@ -306,8 +309,11 @@ impl OpenCADStudio {
|
|||
}
|
||||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
pub(in crate::app) fn fetch_plugin_readme_task(&self, _repo: String) -> Task<Message> {
|
||||
Task::none()
|
||||
pub(in crate::app) fn fetch_plugin_readme_task(&self, repo: String) -> Task<Message> {
|
||||
Task::done(Message::PluginReadmeFetched(
|
||||
repo,
|
||||
Err("Plugin details are available in the desktop app.".to_string()),
|
||||
))
|
||||
}
|
||||
|
||||
/// Background task: download and install the `tag` release of `owner/repo`.
|
||||
|
|
@ -328,7 +334,9 @@ impl OpenCADStudio {
|
|||
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
pub(in crate::app) fn install_task(&self, _repo: String, _tag: String) -> Task<Message> {
|
||||
Task::none()
|
||||
Task::done(Message::PluginInstalled(Err(
|
||||
"External plugins are available in the desktop app.".to_string(),
|
||||
)))
|
||||
}
|
||||
|
||||
/// Gather the full persisted config (all sections) from live app state.
|
||||
|
|
|
|||
|
|
@ -4056,14 +4056,20 @@ impl OpenCADStudio {
|
|||
|
||||
// ── Plugin Manager window ─────────────────────────────────────
|
||||
Message::PluginManagerOpen => {
|
||||
// Refresh the on-disk external-plugin list each time the manager
|
||||
// opens so newly dropped-in packages show up.
|
||||
self.external_plugins = crate::plugin::external::discover();
|
||||
self.marketplace_status.clear();
|
||||
self.active_modal = Some(super::ModalKind::PluginManager);
|
||||
// Fetch the curated registry and release lists for linked repos.
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
{
|
||||
self.command_line
|
||||
.push_info("External plugins are available in the desktop app.");
|
||||
return Task::none();
|
||||
}
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
{
|
||||
// Refresh the on-disk external-plugin list each time the manager
|
||||
// opens so newly dropped-in packages show up.
|
||||
self.external_plugins = crate::plugin::external::discover();
|
||||
self.marketplace_status.clear();
|
||||
self.active_modal = Some(super::ModalKind::PluginManager);
|
||||
// Fetch the curated registry and release lists for linked repos.
|
||||
self.plugin_registry_loading = true;
|
||||
self.plugin_registry_error = None;
|
||||
self.plugin_registry_error_details_open = false;
|
||||
|
|
@ -4100,8 +4106,6 @@ impl OpenCADStudio {
|
|||
}
|
||||
return Task::batch(tasks);
|
||||
}
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
Task::none()
|
||||
}
|
||||
Message::PluginManagerClose => {
|
||||
self.close_active_modal();
|
||||
|
|
|
|||
|
|
@ -2299,12 +2299,12 @@ pub(super) fn start_page_view<'a>(
|
|||
)
|
||||
.into(),
|
||||
outline_btn("Options", Message::OptionsOpen).into(),
|
||||
outline_btn("Plugins", Message::PluginManagerOpen).into(),
|
||||
];
|
||||
// The web build is already in the browser, so only the desktop offers a
|
||||
// link to the web version.
|
||||
// External plugins are native dynamic libraries and the web build is
|
||||
// already in the browser, so both actions are desktop-only.
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
{
|
||||
secondary_items.push(outline_btn("Plugins", Message::PluginManagerOpen).into());
|
||||
// Filled with the active theme's primary colour.
|
||||
secondary_items.push(
|
||||
button(text("OCS Web").size(14))
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
//! <lib<name>.so | .dll | .dylib>
|
||||
//! ```
|
||||
|
||||
#![cfg_attr(target_arch = "wasm32", allow(dead_code))]
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
/// One entry in the curated plugin registry (`plugins/registry.json`).
|
||||
|
|
|
|||
|
|
@ -33,7 +33,9 @@ pub struct MarketView<'a> {
|
|||
pub status: &'a str,
|
||||
}
|
||||
|
||||
// Register the command names for autocomplete.
|
||||
// External plugins are native dynamic libraries, so the browser build must not
|
||||
// advertise a manager it cannot use.
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
inventory::submit!(crate::command::CommandRegistration {
|
||||
names: &["PLUGINS", "PLUGINMANAGER"]
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue