diff --git a/crates/hypercolor-ui/src/api/client.rs b/crates/hypercolor-ui/src/api/client.rs index 5d3e7b842..298af10da 100644 --- a/crates/hypercolor-ui/src/api/client.rs +++ b/crates/hypercolor-ui/src/api/client.rs @@ -425,7 +425,7 @@ fn validate_relative_path(path: &str) -> ApiResult<()> { || path.chars().any(char::is_control) { return Err(ApiError::Network( - "authenticated daemon API URLs must be relative".to_owned(), + "authenticated Hypercolor API URLs must be relative".to_owned(), )); } Ok(()) @@ -459,7 +459,7 @@ async fn browser_send( ) -> Result { let url = daemon_url(&request.path).ok_or_else(|| super::http_transport::HttpTransportError { - message: "verified daemon connection is unavailable".to_owned(), + message: "verified Hypercolor connection is unavailable".to_owned(), })?; let mut builder = RequestBuilder::new(&url).method(browser_method(request.method)); if let Some(token) = authorization_token() { diff --git a/crates/hypercolor-ui/src/api/system.rs b/crates/hypercolor-ui/src/api/system.rs index cbaf82212..8cf28c5c7 100644 --- a/crates/hypercolor-ui/src/api/system.rs +++ b/crates/hypercolor-ui/src/api/system.rs @@ -91,7 +91,7 @@ pub async fn fetch_status() -> ApiResult { let system: SystemResource = client::fetch_json("/api/v1/system").await?; system .status - .ok_or_else(|| ApiError::Parse("System status requires daemon read access".to_owned())) + .ok_or_else(|| ApiError::Parse("System status requires Hypercolor read access".to_owned())) } /// Fetch the latest system sensor snapshot. diff --git a/crates/hypercolor-ui/src/app.rs b/crates/hypercolor-ui/src/app.rs index e9acea577..cb8c75bbe 100644 --- a/crates/hypercolor-ui/src/app.rs +++ b/crates/hypercolor-ui/src/app.rs @@ -1006,7 +1006,7 @@ fn ApiKeyPrompt(on_unlock: Callback) -> impl IntoView { diff --git a/crates/hypercolor-ui/src/components/settings_sections.rs b/crates/hypercolor-ui/src/components/settings_sections.rs index dbfe4c036..6d23613b8 100644 --- a/crates/hypercolor-ui/src/components/settings_sections.rs +++ b/crates/hypercolor-ui/src/components/settings_sections.rs @@ -860,7 +860,7 @@ pub fn NetworkSection( "Advanced options for development and debugging" ) -> i {move || match hints.get() { Some(Ok(Some(hints))) => view! {
-

"Install on this computer"

+

"Install on the connected computer"

{hints.into_iter().map(|hint| view! {
{hint.command}

{hint.note}

}).collect_view()} @@ -86,7 +86,7 @@ fn OpenRgbStatusView(status: OpenRgbStatus, desktop_hints_ready: Signal) -

{format!("{} routes have output disabled", status.output_disabled_count)}

-

"Install on the daemon host"

+

"Install on the connected computer"

{host_hints.iter().cloned().map(|hint| view! {
{hint.command}

{hint.note}

}).collect_view()} diff --git a/crates/hypercolor-ui/src/components/settings_sections/session.rs b/crates/hypercolor-ui/src/components/settings_sections/session.rs index abb939ffc..70aa2a86e 100644 --- a/crates/hypercolor-ui/src/components/settings_sections/session.rs +++ b/crates/hypercolor-ui/src/components/settings_sections/session.rs @@ -416,7 +416,7 @@ fn macos_owner_choice(identity: &ServiceIdentity) -> Option String { match (identity.run_mode, identity.manager) { (DaemonRunMode::SupervisedChild, _) => "Hypercolor.app".to_owned(), - (DaemonRunMode::Standalone, _) => "a terminal-launched daemon".to_owned(), + (DaemonRunMode::Standalone, _) => "Hypercolor running from a terminal".to_owned(), (_, Some(ServiceManager::Launchd)) => "launchd service".to_owned(), (_, Some(ServiceManager::Homebrew)) => "Homebrew service".to_owned(), (_, Some(ServiceManager::Systemd)) => "systemd service".to_owned(), @@ -431,7 +431,7 @@ const fn owner_choice_label(owner: MacosDaemonOwnerChoice) -> &'static str { MacosDaemonOwnerChoice::AppSidecar => "Use Hypercolor.app", MacosDaemonOwnerChoice::DirectLaunchd => "Use launchd service", MacosDaemonOwnerChoice::Homebrew => "Use Homebrew service", - MacosDaemonOwnerChoice::Standalone => "Use the terminal daemon", + MacosDaemonOwnerChoice::Standalone => "Use Hypercolor from the terminal", } } @@ -461,10 +461,10 @@ fn macos_owner_outcome_message(outcome: &MacosOwnerCoordinatorOutcome) -> String fn owner_remedy_label(remedy: &MacosOwnerRemedy) -> String { match remedy { MacosOwnerRemedy::StopStandaloneOwner { pid } => { - format!("Quit the terminal-launched daemon (process {pid}), then try again.") + format!("Quit Hypercolor running from the terminal (process {pid}), then try again.") } MacosOwnerRemedy::RestartStandalone { pid } => { - format!("Restart the terminal-launched daemon (process {pid}), then try again.") + format!("Restart Hypercolor running from the terminal (process {pid}), then try again.") } MacosOwnerRemedy::StartAppSidecar => "Start Hypercolor.app.".to_owned(), MacosOwnerRemedy::StartLaunchdService => "Start the launchd service.".to_owned(), @@ -489,7 +489,7 @@ fn humanize_owner(owner: &str) -> String { "app_sidecar" => "Hypercolor.app".to_owned(), "launchd_service" | "direct_launchd" => "launchd service".to_owned(), "homebrew_service" | "homebrew" => "Homebrew service".to_owned(), - "standalone" => "a terminal-launched daemon".to_owned(), + "standalone" => "Hypercolor running from a terminal".to_owned(), value => { let mut value = value.replace('_', " "); if let Some(first) = value.get_mut(0..1) { @@ -740,10 +740,13 @@ mod tests { recovery_required: None, }; - assert_eq!(humanize_owner("standalone"), "a terminal-launched daemon"); + assert_eq!( + humanize_owner("standalone"), + "Hypercolor running from a terminal" + ); assert_eq!( humanize_identity(&ServiceIdentity::STANDALONE), - "a terminal-launched daemon" + "Hypercolor running from a terminal" ); assert_eq!( macos_owner_choices(&status), diff --git a/crates/hypercolor-ui/src/pages/effects.rs b/crates/hypercolor-ui/src/pages/effects.rs index 1a74e3dfa..c8b66ec0d 100644 --- a/crates/hypercolor-ui/src/pages/effects.rs +++ b/crates/hypercolor-ui/src/pages/effects.rs @@ -368,13 +368,13 @@ pub fn EffectsPage() -> impl IntoView { effect.name, match effect_error.fallback.as_deref() { Some("clear_zones") => { - "The daemon cleared this effect from the active scene after a render failure." + "Hypercolor cleared this effect from the active scene after a render failure." .to_owned() } Some(fallback) if !fallback.is_empty() => { - format!("The daemon applied fallback \"{fallback}\" after a render failure.") + format!("Hypercolor applied fallback \"{fallback}\" after a render failure.") } - _ => "The daemon reported a render failure for this effect.".to_owned(), + _ => "Hypercolor reported a render failure for this effect.".to_owned(), }, )) }); diff --git a/crates/hypercolor-ui/src/ws/transport.rs b/crates/hypercolor-ui/src/ws/transport.rs index d4da0a08b..1a67ffc8b 100644 --- a/crates/hypercolor-ui/src/ws/transport.rs +++ b/crates/hypercolor-ui/src/ws/transport.rs @@ -211,7 +211,7 @@ fn validate_relative_path(path: &str) -> Result<(), WebSocketTransportError> { return Ok(()); } Err(WebSocketTransportError { - message: "authenticated daemon WebSocket URLs must be relative".to_owned(), + message: "authenticated Hypercolor WebSocket URLs must be relative".to_owned(), }) } @@ -224,7 +224,7 @@ impl WebSocketTransport for BrowserWebSocketTransport { events: WebSocketEventHandler, ) -> Result, WebSocketTransportError> { let url = build_ws_url(&request.path).ok_or_else(|| WebSocketTransportError { - message: "verified daemon WebSocket route is unavailable".to_owned(), + message: "verified Hypercolor WebSocket route is unavailable".to_owned(), })?; let socket = arraybuffer_websocket(&url, &request.protocol).map_err(|error| { WebSocketTransportError {