public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Wrapping up bedrock implementation

Browse Source
This commit is contained in:
Ryan Ward
2026-05-13 10:04:59 -05:00
parent ed53aa99eb
commit cee61e2af0
1144 changed files with 2954 additions and 2660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/settings_view/about_page.rs
+3 -6
View File
@@ -5,10 +5,7 @@ use super::{
},
SettingsSection,
};
use crate::{
appearance::Appearance, channel::ChannelState,
workspace::WorkspaceAction,
};
use crate::{appearance::Appearance, channel::ChannelState, workspace::WorkspaceAction};
use galaxyui::{
assets::asset_cache::AssetSource,
elements::{
@@ -68,8 +65,8 @@ impl SettingsWidget for AboutPageWidget {
let image_path = "bundled/svg/galaxy-logo.svg";
let version = ChannelState::app_version()
.unwrap_or(concat!("v", env!("CARGO_PKG_VERSION")));
let version =
ChannelState::app_version().unwrap_or(concat!("v", env!("CARGO_PKG_VERSION")));
let version_text = ui_builder
.span(version.to_string())
app/src/settings_view/agent_assisted_environment_modal.rs
+1 -1
View File
@@ -4,7 +4,6 @@ use std::{
time::Duration,
};
use pathfinder_color::ColorU;
use galaxy_core::{
features::FeatureFlag, paths::home_relative_path, ui::theme::color::internal_colors,
};
@@ -20,6 +19,7 @@ use galaxyui::{
ui_components::components::UiComponent,
AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use pathfinder_color::ColorU;
use crate::{
appearance::Appearance,
app/src/settings_view/agent_assisted_environment_modal_tests.rs
+1 -1
View File
@@ -4,11 +4,11 @@ use crate::server::server_api::ServerApiProvider;
use crate::test_util::settings::initialize_settings_for_tests;
use crate::workspace::ToastStack;
use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
use std::path::PathBuf;
use galaxy_core::ui::appearance::Appearance;
use galaxyui::elements::{ChildView, Empty};
use galaxyui::platform::WindowStyle;
use galaxyui::{App, AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
use std::path::PathBuf;
fn init_modal_test_models(app: &mut App) {
initialize_settings_for_tests(app);
app/src/settings_view/ai_page.rs
+10 -11
View File
@@ -25,13 +25,12 @@ use crate::settings::{
AgentModeCodingPermissionsType, AgentModeCommandExecutionDenylist,
AgentModeCommandExecutionPredicate, AgentModeQuerySuggestionsEnabled, BedrockAuthMethod,
BedrockAutoLogin, BedrockCrossRegionInference, BedrockEnabled, BedrockFallbackToWarp,
CodeSettings, CodebaseContextEnabled, FileBasedMcpEnabled,
GitOperationsAutogenEnabled, IncludeAgentCommandsInHistory, IntelligentAutosuggestionsEnabled,
MemoryEnabled, NLDInTerminalEnabled, NaturalLanguageAutosuggestionsEnabled,
RuleSuggestionsEnabled, SharedBlockTitleGenerationEnabled,
ShouldRenderCLIAgentToolbar, ShouldRenderUseAgentToolbarForUserCommands,
ShowAgentTips, ShowConversationHistory, ShowHintText,
ThinkingDisplayMode, VoiceInputEnabled, WarpDriveContextEnabled,
CodeSettings, CodebaseContextEnabled, FileBasedMcpEnabled, GitOperationsAutogenEnabled,
IncludeAgentCommandsInHistory, IntelligentAutosuggestionsEnabled, MemoryEnabled,
NLDInTerminalEnabled, NaturalLanguageAutosuggestionsEnabled, RuleSuggestionsEnabled,
SharedBlockTitleGenerationEnabled, ShouldRenderCLIAgentToolbar,
ShouldRenderUseAgentToolbarForUserCommands, ShowAgentTips, ShowConversationHistory,
ShowHintText, ThinkingDisplayMode, VoiceInputEnabled, WarpDriveContextEnabled,
};
use crate::terminal::session_settings::{SessionSettings, SessionSettingsChangedEvent};
use crate::terminal::CLIAgent;
@@ -42,10 +41,6 @@ use crate::view_components::{
use crate::workspaces::user_workspaces::UserWorkspacesEvent;
use ::ai::api_keys::ApiKeyManager;
use enum_iterator::all;
use itertools::Itertools;
use regex::Regex;
use settings::{Setting, ToggleableSetting};
use strum::IntoEnumIterator;
use galaxy_core::channel::ChannelState;
use galaxy_core::context_flag::ContextFlag;
use galaxy_core::features::FeatureFlag;
@@ -69,6 +64,10 @@ use galaxyui::{
Action, AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
ViewHandle,
};
use itertools::Itertools;
use regex::Regex;
use settings::{Setting, ToggleableSetting};
use strum::IntoEnumIterator;
use super::execution_profile_view::{ExecutionProfileView, ExecutionProfileViewEvent};
use super::settings_page::{render_custom_size_header, render_settings_info_banner};
app/src/settings_view/appearance_page.rs
+5 -5
View File
@@ -69,11 +69,6 @@ use crate::{report_error, report_if_error, themes};
use crate::{send_telemetry_from_ctx, server::telemetry::TelemetryEvent};
use ::settings::{Setting, SettingSection, ToggleableSetting};
use enum_iterator::all;
use std::borrow::Cow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::path::PathBuf;
use std::rc::Rc;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_util::path::user_friendly_path;
use galaxyui::elements::{
@@ -90,6 +85,11 @@ use galaxyui::ui_components::radio_buttons::{
use galaxyui::ui_components::slider::SliderStateHandle;
use galaxyui::ui_components::switch::SwitchStateHandle;
use galaxyui::units::IntoPixels;
use std::borrow::Cow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::path::PathBuf;
use std::rc::Rc;
use galaxyui::id;
use galaxyui::{
app/src/settings_view/billing_and_usage_page.rs
+8 -8
View File
@@ -1,12 +1,4 @@
use chrono::Local;
use itertools::Itertools;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::Arc;
use thousands::Separable;
use galaxy_core::ui::theme::Fill;
use galaxy_core::{features::FeatureFlag, ui::appearance::Appearance};
use galaxy_graphql::billing::AddonCreditsOption;
@@ -28,6 +20,14 @@ use galaxyui::{
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, UpdateView, View,
ViewContext, ViewHandle,
};
use itertools::Itertools;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::Arc;
use thousands::Separable;
use settings::Setting;
app/src/settings_view/code_page.rs
+9 -7
View File
@@ -42,12 +42,6 @@ use ai::index::full_source_code_embedding::manager::{
use ai::index::full_source_code_embedding::SyncProgress;
use ai::project_context::model::{ProjectContextModel, ProjectContextModelEvent};
use ai::workspace::WorkspaceMetadata;
use lsp::supported_servers::LSPServerType;
use lsp::{LspManagerModel, LspManagerModelEvent, LspServerModel, LspState};
use pathfinder_color::ColorU;
use std::borrow::Cow;
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use galaxy_core::{
features::FeatureFlag,
report_if_error,
@@ -73,6 +67,12 @@ use galaxyui::{
Action, AppContext, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
ViewHandle,
};
use lsp::supported_servers::LSPServerType;
use lsp::{LspManagerModel, LspManagerModelEvent, LspServerModel, LspState};
use pathfinder_color::ColorU;
use std::borrow::Cow;
use std::collections::HashMap;
use std::path::{Path, PathBuf};
const MAIN_SECTION_MARGIN: f32 = 12.;
const SUB_SECTION_MARGIN: f32 = 8.;
@@ -1541,7 +1541,9 @@ impl CodePageWidget {
label_row.add_child(
Container::new(
ConstrainedBox::new(
status_icon.to_galaxyui_icon(ThemeFill::Solid(color)).finish(),
status_icon
.to_galaxyui_icon(ThemeFill::Solid(color))
.finish(),
)
.with_width(STATUS_ICON_SIZE)
.with_height(STATUS_ICON_SIZE)
app/src/settings_view/directory_color_add_picker.rs
+1 -1
View File
@@ -4,7 +4,6 @@ use std::path::{Path, PathBuf};
use ai::index::full_source_code_embedding::manager::{
CodebaseIndexManager, CodebaseIndexManagerEvent,
};
use settings::Setting;
use galaxy_util::path::user_friendly_path;
use galaxyui::{
elements::{
@@ -14,6 +13,7 @@ use galaxyui::{
platform::Cursor,
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use settings::Setting;
use crate::{
ai::persisted_workspace::{PersistedWorkspace, PersistedWorkspaceEvent},
app/src/settings_view/environments_page.rs
+3 -3
View File
@@ -45,9 +45,6 @@ use crate::{
workspace::{ToastStack, WorkspaceAction},
workspaces::user_workspaces::UserWorkspaces,
};
use instant::Instant;
use pathfinder_geometry::vector::vec2f;
use std::collections::HashMap;
use galaxy_core::ui::color::blend::Blend;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_editor::editor::NavigationKey;
@@ -70,6 +67,9 @@ use galaxyui::{
AppContext, Entity, FocusContext, ModelHandle, SingletonEntity, TypedActionView, View,
ViewContext, ViewHandle,
};
use instant::Instant;
use pathfinder_geometry::vector::vec2f;
use std::collections::HashMap;
mod new_environment_button;
use new_environment_button::NewEnvironmentButtonView;
app/src/settings_view/environments_page_tests.rs
+3 -3
View File
@@ -16,13 +16,13 @@ use crate::test_util::settings::initialize_settings_for_tests;
use crate::workspaces::team_tester::TeamTesterStatus;
use crate::workspaces::user_workspaces::UserWorkspaces;
use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
use instant::Instant;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use galaxy_core::ui::appearance::Appearance;
use galaxyui::elements::Empty;
use galaxyui::platform::WindowStyle;
use galaxyui::{App, AppContext, Element, Entity, TypedActionView, View, WindowId};
use instant::Instant;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
fn make_test_environment(
name: &str,
app/src/settings_view/execution_profile_view.rs
+5 -3
View File
@@ -12,8 +12,6 @@ use crate::settings::AISettings;
use crate::ui_components::icons::Icon;
use crate::view_components::action_button::{ActionButton, ButtonSize, SecondaryTheme};
use crate::TemplatableMCPServerManager;
use std::path::PathBuf;
use uuid::Uuid;
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::ParentElement;
use galaxyui::SingletonEntity;
@@ -25,6 +23,8 @@ use galaxyui::{
fonts::{Properties, Weight},
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
};
use std::path::PathBuf;
use uuid::Uuid;
#[derive(Debug, Clone)]
pub enum ExecutionProfileViewAction {
@@ -508,7 +508,9 @@ fn render_allowlist_denylist_row(
.finish(),
)
.with_margin_left(8.)
.with_border(galaxyui::elements::Border::left(1.).with_border_fill(appearance.theme().outline()))
.with_border(
galaxyui::elements::Border::left(1.).with_border_fill(appearance.theme().outline()),
)
.with_padding_left(8.)
.finish()
}
app/src/settings_view/features/external_editor.rs
+1 -1
View File
@@ -1,12 +1,12 @@
use std::{cell::RefCell, collections::HashMap};
use settings::{Setting, ToggleableSetting};
use galaxy_core::features::FeatureFlag;
use galaxyui::{
elements::{Flex, MouseStateHandle, ParentElement},
ui_components::{components::UiComponent, switch::SwitchStateHandle},
Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use settings::{Setting, ToggleableSetting};
use crate::{
appearance::Appearance,
app/src/settings_view/features/undo_close.rs
+1 -1
View File
@@ -1,6 +1,5 @@
use std::{cell::RefCell, collections::HashMap, time::Duration};
use settings::{Setting, ToggleableSetting};
use galaxyui::{
elements::{
Container, CrossAxisAlignment, Flex, MainAxisAlignment, MouseStateHandle, ParentElement,
@@ -12,6 +11,7 @@ use galaxyui::{
},
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use settings::{Setting, ToggleableSetting};
use crate::{
appearance::Appearance,
app/src/settings_view/features/working_directory.rs
+1 -1
View File
@@ -1,10 +1,10 @@
use itertools::Itertools;
use galaxyui::{
elements::{Container, CrossAxisAlignment, Flex, ParentElement, Shrinkable},
presenter::ChildView,
ui_components::components::{Coords, UiComponent, UiComponentStyles},
Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use itertools::Itertools;
use crate::{
appearance::Appearance,
app/src/settings_view/features_page.rs
+6 -6
View File
@@ -4,11 +4,11 @@ use crate::terminal::input::OPEN_COMPLETIONS_KEYBINDING_NAME;
#[cfg(feature = "local_tty")]
use crate::terminal::session_settings::WorkingDirectoryConfig;
use lazy_static::lazy_static;
use galaxy_core::context_flag::ContextFlag;
use galaxyui::platform::GraphicsBackend;
use galaxyui::rendering::GPUPowerPreference;
use galaxyui::{elements::DispatchEventResult, platform::Cursor};
use lazy_static::lazy_static;
#[cfg(target_os = "linux")]
use {
crate::settings::ForceX11, crate::settings::LinuxAppConfiguration,
@@ -90,11 +90,6 @@ use crate::{features::FeatureFlag, terminal::settings::TerminalSettingsChangedEv
use crate::{report_if_error, send_telemetry_from_ctx, themes, GlobalResourceHandles};
use crate::{root_view::QuakeModePinPosition, workspace::tab_settings::TabSettingsChangedEvent};
use ::settings::{Setting, ToggleableSetting};
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use std::time::Duration;
use strum::IntoEnumIterator;
use galaxy_core::channel::ChannelState;
use galaxy_core::semantic_selection::{
SemanticSelection, SemanticSelectionChangedEvent, SmartSelectEnabled,
@@ -112,6 +107,11 @@ use galaxyui::{
Action, AppContext, DisplayIdx, Entity, EventContext, ModelHandle, SingletonEntity, Tracked,
TypedActionView, View, ViewContext, ViewHandle, WindowId,
};
use std::cell::RefCell;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use std::time::Duration;
use strum::IntoEnumIterator;
cfg_if::cfg_if! {
if #[cfg(target_os = "macos")] {
app/src/settings_view/main_page.rs
+4 -4
View File
@@ -22,10 +22,6 @@ use crate::{auth::auth_manager::AuthManager, server::ids::ServerId};
use crate::{auth::auth_manager::LoginGatedFeature, workspaces::workspace::CustomerType};
use crate::{workspace::WorkspaceAction, workspaces::update_manager::TeamUpdateManager};
use ::settings::{Setting, ToggleableSetting};
use lazy_static::lazy_static;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use std::sync::{Arc, Mutex};
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::icons::Icon;
use galaxy_core::{channel::ChannelState, context_flag::ContextFlag};
@@ -54,6 +50,10 @@ use galaxyui::{fonts::Weight, keymap::ContextPredicate};
use galaxyui::{
Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use lazy_static::lazy_static;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::vec2f;
use std::sync::{Arc, Mutex};
const PHOTO_SIZE: f32 = 40.;
const REFERRAL_CTA: &str = "Earn rewards by sharing Warp with friends & colleagues";
app/src/settings_view/mcp_servers/edit_page.rs
+4 -4
View File
@@ -4,10 +4,6 @@ use std::{collections::HashMap, path::Path};
#[cfg(not(target_family = "wasm"))]
use diesel::SqliteConnection;
#[cfg(not(target_family = "wasm"))]
use parking_lot::Mutex;
use pathfinder_geometry::vector::vec2f;
use uuid::Uuid;
use galaxy_core::{
send_telemetry_from_ctx,
ui::{appearance::Appearance, theme::color::internal_colors},
@@ -25,6 +21,10 @@ use galaxyui::{
ui_components::components::UiComponent,
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
#[cfg(not(target_family = "wasm"))]
use parking_lot::Mutex;
use pathfinder_geometry::vector::vec2f;
use uuid::Uuid;
use crate::{
ai::{
app/src/settings_view/mcp_servers/installation_modal.rs
+1 -1
View File
@@ -10,7 +10,6 @@ use crate::settings_view::mcp_servers::style::{
INSTALLATION_MODAL_PADDING, INSTALLATION_MODAL_TITLE_VERTICAL_SPACING,
};
use crate::view_components::dropdown::{Dropdown, DropdownItem};
use markdown_parser::parse_markdown;
use galaxyui::elements::Shrinkable;
use galaxyui::fonts::{Properties, Weight};
use galaxyui::ui_components::button::ButtonVariant;
@@ -25,6 +24,7 @@ use galaxyui::{
AppContext, Element, Entity, FocusContext, TypedActionView, View, ViewHandle,
};
use galaxyui::{SingletonEntity, ViewContext};
use markdown_parser::parse_markdown;
use crate::ai::mcp::{TemplatableMCPServer, TemplatableMCPServerManager, TemplateVariable};
app/src/settings_view/mcp_servers/list_page.rs
+6 -6
View File
@@ -53,12 +53,6 @@ use crate::{
workspace::Workspace,
workspaces::user_workspaces::UserWorkspaces,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use settings::ToggleableSetting as _;
use std::cmp::Ordering;
use std::{collections::HashMap, path::PathBuf};
use strum::IntoEnumIterator;
use uuid::Uuid;
use galaxy_core::features::FeatureFlag;
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::ui::{appearance::AppearanceEvent, theme::color::internal_colors, Icon};
@@ -74,6 +68,12 @@ use galaxyui::{
},
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use settings::ToggleableSetting as _;
use std::cmp::Ordering;
use std::{collections::HashMap, path::PathBuf};
use strum::IntoEnumIterator;
use uuid::Uuid;
const DESCRIPTION_TEXT: &str = "Add MCP servers to extend the Warp Agent's capabilities. MCP servers expose data sources or tools to agents through a standardized interface, essentially acting like plugins. Add a custom server, or use the presets to get started with popular servers. You can also find team servers that have been shared with you here. ";
app/src/settings_view/mcp_servers/server_card.rs
+2 -2
View File
@@ -1,5 +1,3 @@
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use galaxy_core::{
features::FeatureFlag,
ui::{
@@ -25,6 +23,8 @@ use galaxyui::{
},
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use pathfinder_color::ColorU;
use crate::{
ai::mcp::{
app/src/settings_view/mcp_servers/update_modal.rs
+1 -1
View File
@@ -7,7 +7,6 @@ use crate::ui_components::avatar::{Avatar, AvatarContent};
use crate::ui_components::blended_colors;
use crate::util::time_format::format_approx_duration_from_now;
use chrono::{Local, TimeZone};
use uuid::Uuid;
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::external_product_icon::ExternalProductIcon;
use galaxy_core::ui::icons::Icon;
@@ -25,6 +24,7 @@ use galaxyui::{
platform::Cursor,
AppContext, Element, Entity, TypedActionView, View, ViewContext,
};
use uuid::Uuid;
pub enum UpdateModalBodyEvent {
Cancel,
app/src/settings_view/mcp_servers_page.rs
+2 -2
View File
@@ -1,10 +1,10 @@
use std::collections::HashMap;
use uuid::Uuid;
use galaxyui::{
elements::{ChildView, Container},
ui_components::components::{Coords, UiComponentStyles},
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use std::collections::HashMap;
use uuid::Uuid;
use crate::{
ai::mcp::{
app/src/settings_view/mod.rs
+16 -16
View File
@@ -29,28 +29,12 @@ use billing_and_usage_page::{BillingAndUsagePageEvent, BillingAndUsagePageView};
use code_page::CodeSubpage;
use code_page::{CodeSettingsPageAction, CodeSettingsPageEvent};
use features_page::{FeaturesPageView, FeaturesSettingsPageEvent};
use itertools::Itertools as _;
use keybindings::KeybindingsView;
use main_page::{MainPageAction, MainSettingsPageEvent, MainSettingsPageView};
use mcp_servers_page::MCPServersSettingsPageView;
use nav::{SettingsNavItem, SettingsUmbrella};
use pathfinder_geometry::vector::Vector2F;
use privacy_page::{PrivacyPageView, PrivacyPageViewEvent};
use settings_file_footer::{render_footer, SettingsFooterKind, SettingsFooterMouseStates};
use settings_page::{
MatchData, SettingsPage, SettingsPageEvent, SettingsPageMeta, SettingsPageViewHandle,
HEADER_PADDING,
};
use std::collections::HashMap;
use std::path::PathBuf;
use std::str::FromStr;
use galaxy_core::send_telemetry_from_ctx;
use galaxy_core::{
channel::ChannelState, context_flag::ContextFlag, features::FeatureFlag,
settings::ToggleableSetting as _, ui::theme::color::internal_colors,
};
use galaxy_editor::editor::NavigationKey;
use warpify_page::{WarpifyPageAction, WarpifyPageView};
use galaxyui::Element;
use galaxyui::{
elements::{
@@ -66,6 +50,22 @@ use galaxyui::{
Action, AppContext, Entity, ModelHandle, SingletonEntity, TypedActionView, UpdateView as _,
View, ViewContext, ViewHandle,
};
use itertools::Itertools as _;
use keybindings::KeybindingsView;
use main_page::{MainPageAction, MainSettingsPageEvent, MainSettingsPageView};
use mcp_servers_page::MCPServersSettingsPageView;
use nav::{SettingsNavItem, SettingsUmbrella};
use pathfinder_geometry::vector::Vector2F;
use privacy_page::{PrivacyPageView, PrivacyPageViewEvent};
use settings_file_footer::{render_footer, SettingsFooterKind, SettingsFooterMouseStates};
use settings_page::{
MatchData, SettingsPage, SettingsPageEvent, SettingsPageMeta, SettingsPageViewHandle,
HEADER_PADDING,
};
use std::collections::HashMap;
use std::path::PathBuf;
use std::str::FromStr;
use warpify_page::{WarpifyPageAction, WarpifyPageView};
mod about_page;
mod admin_actions;
app/src/settings_view/nav.rs
+1 -1
View File
@@ -1,6 +1,5 @@
use crate::appearance::Appearance;
use crate::ui_components::icons::Icon;
use pathfinder_geometry::vector::vec2f;
use galaxyui::{
elements::{Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle},
ui_components::{
@@ -8,6 +7,7 @@ use galaxyui::{
components::{Coords, UiComponent, UiComponentStyles},
},
};
use pathfinder_geometry::vector::vec2f;
use super::{
settings_page::{MatchData, NAV_ITEM_LEFT_MARGIN},
app/src/settings_view/pane_manager.rs
+1 -1
View File
@@ -3,8 +3,8 @@ use crate::{
pane_group::{PaneContent, PaneId},
PaneViewLocator,
};
use std::collections::HashMap;
use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity, ViewHandle, WindowId};
use std::collections::HashMap;
use super::SettingsView;
struct SettingsPaneData {
app/src/settings_view/platform/create_api_key_modal.rs
+1 -1
View File
@@ -10,7 +10,6 @@ use crate::{
view_components::{Dropdown as DropdownView, DropdownItem},
};
use chrono::Utc;
use pathfinder_geometry::vector::vec2f;
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{
Border, ChildView, ConstrainedBox, Container, CornerRadius, Empty, Fill, Flex,
@@ -25,6 +24,7 @@ use galaxyui::ui_components::segmented_control::{
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use pathfinder_geometry::vector::vec2f;
const LABEL_FONT_SIZE: f32 = 14.;
const INPUT_WIDTH: f32 = 428.; // 460px - (2 * 16px) padding
app/src/settings_view/platform_page.rs
+2 -2
View File
@@ -20,8 +20,6 @@ use crate::{
util::time_format::format_approx_duration_from_now_utc,
};
use chrono::{DateTime, Utc};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use std::collections::HashMap;
use galaxy_core::features::FeatureFlag;
use galaxyui::{
elements::{
@@ -36,6 +34,8 @@ use galaxyui::{
},
AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use std::collections::HashMap;
const MODAL_WIDTH: f32 = 460.;
const MODAL_HEIGHT: f32 = 320.;
app/src/settings_view/privacy/add_regex_modal.rs
+1 -1
View File
@@ -4,7 +4,6 @@ use crate::{
appearance::Appearance,
editor::{EditorView, PropagateAndNoOpNavigationKeys, SingleLineEditorOptions, TextOptions},
};
use regex::Regex;
use galaxy_editor::editor::NavigationKey;
use galaxyui::elements::{CrossAxisAlignment, Expanded, MainAxisSize};
use galaxyui::{
@@ -15,6 +14,7 @@ use galaxyui::{
},
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use regex::Regex;
const LABEL_FONT_SIZE: f32 = 12.;
app/src/settings_view/privacy_page.rs
+1 -3
View File
@@ -9,9 +9,9 @@ use pathfinder_geometry::vector::vec2f;
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::r#async::{SpawnedFutureHandle, Timer};
use galaxy_core::context_flag::ContextFlag;
use regex::Regex;
use settings::Setting as _;
use galaxy_core::context_flag::ContextFlag;
use galaxy_core::ui::theme::WarpTheme;
use galaxyui::elements::{
@@ -95,8 +95,6 @@ const TELEMETRY_FREE_TIER_NOTE: &str =
const TELEMETRY_DOCS_URL: &str =
"https://docs.warp.dev/support-and-community/privacy-and-security/privacy#what-telemetry-data-does-warp-collect-and-why";
pub struct PrivacyPageView {
page: PageType<Self>,
local_only_icon_tooltip_states: RefCell<HashMap<String, MouseStateHandle>>,
app/src/settings_view/settings_file_footer.rs
+1 -1
View File
@@ -11,7 +11,6 @@ use crate::appearance::Appearance;
use crate::settings::SettingsFileError;
use crate::ui_components::icons::Icon;
use crate::WorkspaceAction;
use pathfinder_color::ColorU;
use galaxy_core::ui::color::coloru_with_opacity;
use galaxy_core::ui::theme::Fill;
use galaxyui::elements::{
@@ -22,6 +21,7 @@ use galaxyui::elements::{
};
use galaxyui::fonts::{FamilyId, Properties, Weight};
use galaxyui::platform::Cursor;
use pathfinder_color::ColorU;
/// Horizontal + vertical padding applied to the footer inside the sidebar.
const FOOTER_PADDING: f32 = 12.;
app/src/settings_view/settings_page.rs
+1 -1
View File
@@ -29,7 +29,6 @@ use crate::{
ui_components::icons::Icon,
view_components::{Dropdown, SubmittableTextInput},
};
use settings::Setting;
use galaxy_core::{
settings::SyncToCloud,
ui::{color::blend::Blend, theme::color::internal_colors},
@@ -52,6 +51,7 @@ use galaxyui::{
units::Pixels,
Action, AppContext, SingletonEntity, ViewContext, ViewHandle,
};
use settings::Setting;
pub const TOGGLE_BUTTON_RIGHT_PADDING: f32 = 5.;
pub const HEADER_PADDING: f32 = 15.;
app/src/settings_view/show_blocks_view.rs
+2 -2
View File
@@ -16,8 +16,6 @@ use crate::{
};
use anyhow::Result;
use chrono::{DateTime, FixedOffset, Local};
use pathfinder_geometry::vector::vec2f;
use std::sync::Arc;
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::ui_components::button::ButtonVariant;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
@@ -36,6 +34,8 @@ use galaxyui::{elements::ScrollbarWidth, fonts::Weight};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
};
use pathfinder_geometry::vector::vec2f;
use std::sync::Arc;
const SCROLLBAR_WIDTH: ScrollbarWidth = ScrollbarWidth::Auto;
app/src/settings_view/tab_menu.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use std::fmt::Display;
use galaxyui::ui_components::button::ButtonVariant;
use std::fmt::Display;
use super::teams_page::TeamsPageAction;
use crate::cloud_object::model::persistence::CloudModel;
app/src/settings_view/teams_page.rs
+2 -2
View File
@@ -51,6 +51,8 @@ use crate::{
use core::default::Default;
use email_address::EmailAddress;
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::FocusContext;
use itertools::Itertools;
use lazy_static::lazy_static;
use pathfinder_color::ColorU;
@@ -59,8 +61,6 @@ use regex::Regex;
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use std::{cmp::Ordering, collections::HashSet};
use galaxy_core::ui::theme::color::internal_colors;
use galaxyui::FocusContext;
use galaxyui::{
clipboard::ClipboardContent,
app/src/settings_view/telemetry.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
use serde_json::Value;
use strum_macros::EnumDiscriminants;
use strum_macros::EnumIter;
use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
#[derive(Debug, EnumDiscriminants)]
#[strum_discriminants(derive(EnumIter))]
app/src/settings_view/update_environment_form.rs
+10 -9
View File
@@ -25,11 +25,6 @@ use crate::{
workspaces::user_workspaces::UserWorkspaces,
ChannelState,
};
use instant::{Duration, Instant};
use log::debug;
#[cfg(not(target_family = "wasm"))]
use std::collections::HashMap;
use url::Url;
use galaxy_core::send_telemetry_from_ctx;
use galaxy_editor::editor::NavigationKey;
use galaxy_graphql::queries::user_github_info::UserGithubInfoResult;
@@ -52,6 +47,11 @@ use galaxyui::{
AppContext, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
ViewHandle,
};
use instant::{Duration, Instant};
use log::debug;
#[cfg(not(target_family = "wasm"))]
use std::collections::HashMap;
use url::Url;
const SUBMIT_BUTTON_FOCUSED: &str = "SubmitButtonFocused";
@@ -3085,10 +3085,11 @@ impl UpdateEnvironmentForm {
};
let icon_size = appearance.ui_font_size();
let icon = ConstrainedBox::new(Icon::Lightbulb.to_galaxyui_icon(text_fill).finish())
.with_width(icon_size)
.with_height(icon_size)
.finish();
let icon =
ConstrainedBox::new(Icon::Lightbulb.to_galaxyui_icon(text_fill).finish())
.with_width(icon_size)
.with_height(icon_size)
.finish();
let text = Text::new(
button_text,
app/src/settings_view/update_environment_form_tests.rs
+1 -1
View File
@@ -17,7 +17,6 @@ use crate::workspaces::team::Team;
use crate::workspaces::team_tester::TeamTesterStatus;
use crate::workspaces::user_workspaces::UserWorkspaces;
use crate::workspaces::workspace::Workspace;
use url::Url;
use galaxy_core::ui::appearance::Appearance;
use galaxyui::elements::{Empty, MouseStateHandle};
use galaxyui::platform::WindowStyle;
@@ -25,6 +24,7 @@ use galaxyui::{
AddSingletonModel, App, AppContext, Element, Entity, SingletonEntity, TypedActionView, View,
WindowId,
};
use url::Url;
#[test]
fn test_parse_repo_input_owner_repo() {
app/src/settings_view/warpify_page.rs
+4 -4
View File
@@ -2,10 +2,6 @@ use std::cell::RefCell;
use std::collections::HashMap;
use std::fmt::Display;
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use regex::Regex;
use settings::{Setting, ToggleableSetting};
use strum::IntoEnumIterator;
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{FormattedTextElement, HighlightedHyperlink};
use galaxyui::keymap::ContextPredicate;
@@ -19,6 +15,10 @@ use galaxyui::{
Action, AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View,
ViewContext, ViewHandle,
};
use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
use regex::Regex;
use settings::{Setting, ToggleableSetting};
use strum::IntoEnumIterator;
use crate::terminal::warpify::settings::{
EnableSshWarpification, SshExtensionInstallMode, UseSshTmuxWrapper, WarpifySettingsChangedEvent,