Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

This commit is contained in:
Ryan Ward
2026-05-07 11:29:34 -05:00
parent f4e2475c60
commit a41cbd8cc7
2433 changed files with 14208 additions and 9409 deletions
+6 -6
View File
@@ -2,7 +2,7 @@ use std::collections::HashMap;
use futures_util::FutureExt as _;
use itertools::Itertools as _;
use warpui::{r#async::executor::BackgroundTask, AppContext, SingletonEntity};
use galaxyui::{r#async::executor::BackgroundTask, AppContext, SingletonEntity};
use zbus::{interface, proxy, zvariant};
use crate::channel::ChannelState;
@@ -26,13 +26,13 @@ pub fn teardown(ctx: &mut AppContext) {
/// Returns Ok if an existing instance exists and was reachable.
#[cfg(feature = "release_bundle")]
pub fn pass_startup_args_to_existing_instance(
args: &warp_cli::AppArgs,
args: &galaxy_cli::AppArgs,
) -> Result<(), StartupArgsForwardingError> {
if args.finish_update {
return Err(StartupArgsForwardingError::IgnoredAfterAutoUpdate);
}
warpui::r#async::block_on(async {
galaxyui::r#async::block_on(async {
let conn = zbus::Connection::session().await?;
let proxy = ExistingApplicationProxy::builder(&conn)
.destination(DBusServiceHost::well_known_name())?
@@ -181,7 +181,7 @@ struct DBusServiceHost {
}
impl DBusServiceHost {
fn new(ctx: &mut warpui::ModelContext<Self>) -> Self {
fn new(ctx: &mut galaxyui::ModelContext<Self>) -> Self {
let (tx, rx) = async_channel::unbounded();
// Spawn a background task for the D-Bus server.
@@ -232,7 +232,7 @@ impl DBusServiceHost {
if let Some(server_task) = self.server_task.take() {
server_task.abort();
// Wait until we've torn down the dbus service.
report_if_error!(warpui::r#async::block_on(server_task));
report_if_error!(galaxyui::r#async::block_on(server_task));
}
}
@@ -248,7 +248,7 @@ impl DBusServiceHost {
}
}
impl warpui::Entity for DBusServiceHost {
impl galaxyui::Entity for DBusServiceHost {
type Event = ();
}
+1 -1
View File
@@ -1,6 +1,6 @@
#[allow(deprecated)]
use cocoa::base::id;
use warpui::platform::mac::make_nsstring;
use galaxyui::platform::mac::make_nsstring;
use crate::channel::ChannelState;
+1 -1
View File
@@ -12,7 +12,7 @@ mod mac;
#[cfg(windows)]
pub mod windows;
use warpui::AppContext;
use galaxyui::AppContext;
pub fn init(_ctx: &mut AppContext) {
log::info!("Initializing app services");
+4 -4
View File
@@ -1,10 +1,10 @@
use registry::register_uri_handler;
use warpui::AppContext;
use galaxyui::AppContext;
#[cfg(feature = "release_bundle")]
use {
service_impl::forward_uri_to_sole_running_instance,
single_instance_manager::SingleInstanceManager, thiserror::Error, url::Url,
warp_core::channel::ChannelState,
galaxy_core::channel::ChannelState,
};
mod registry;
@@ -30,7 +30,7 @@ pub enum StartupArgsForwardingError {
#[cfg(feature = "release_bundle")]
pub fn pass_startup_args_to_existing_instance(
args: &warp_cli::AppArgs,
args: &galaxy_cli::AppArgs,
) -> Result<(), StartupArgsForwardingError> {
if args.finish_update {
return Err(StartupArgsForwardingError::IgnoredAfterAutoUpdate);
@@ -39,7 +39,7 @@ pub fn pass_startup_args_to_existing_instance(
return Err(StartupArgsForwardingError::NoExistingInstance);
}
warpui::r#async::block_on(async {
galaxyui::r#async::block_on(async {
if args.urls.is_empty() {
// If there are no URLs on the command line, send one to open a new
// window using the same current working directory as this process.
+1 -1
View File
@@ -1,6 +1,6 @@
use std::ffi::OsString;
use warp_core::channel::ChannelState;
use galaxy_core::channel::ChannelState;
use windows_registry::{CURRENT_USER, HSTRING};
pub(super) fn register_uri_handler() {
+1 -1
View File
@@ -4,7 +4,7 @@ use async_channel::Sender;
use async_trait::async_trait;
use ipc::{Client, ConnectionAddress};
use url::Url;
use warpui::r#async::executor::Background;
use galaxyui::r#async::executor::Background;
use super::single_instance_manager::uri_named_pipe_name;
@@ -2,8 +2,8 @@ use std::sync::LazyLock;
use ipc::ServerBuilder;
use parking_lot::Mutex;
use warp_core::channel::ChannelState;
use warpui::{Entity, ModelContext, SingletonEntity};
use galaxy_core::channel::ChannelState;
use galaxyui::{Entity, ModelContext, SingletonEntity};
use windows::core::Error;
use windows::Win32::Foundation::{CloseHandle, GetLastError, ERROR_ALREADY_EXISTS, HANDLE};