first pass of merging in warp (doesn't build)

app/src/settings/import/iterm_parser.rs

@@ -10,27 +10,24 @@ use itertools::Itertools;
 use palette::Srgba;
 use pathfinder_color::ColorU;
 use plist::{Dictionary, Value};
-
-use crate::{
-    root_view::QuakeModePinPosition,
-    settings::{
-        import::config::HotkeyError, ExtraMetaKeys, DEFAULT_MONOSPACE_FONT_NAME,
-        DEFAULT_MONOSPACE_FONT_SIZE,
-    },
-    terminal::{
-        local_tty::shell::is_valid_path_or_command_for_supported_shell,
-        session_settings::{
-            StartupShell, WorkingDirectoryConfig, WorkingDirectoryMode,
-            WorkingDirectoryPerSourceConfig,
-        },
-    },
-};
+use galaxy_core::ui::theme::{AnsiColors, TerminalColors, WarpTheme};
+use galaxyui::fonts::FontInfo;
+use galaxyui::keymap::Keystroke;
+use galaxyui::platform::mac::utils::unicode_char_to_key;
+use galaxyui::DisplayIdx;
 
 use super::config::{
     calculate_accent_color, Config, ConfigError, GlobalHotkey, ImportableSetting, ImportedFont,
     MouseAndScrollReporting, OpacitySettings, ParseableConfig, QuakeModeWindow, SettingType,
     ThemeError, ThemeType,
 };
+use crate::root_view::QuakeModePinPosition;
+use crate::settings::import::config::HotkeyError;
+use crate::settings::{ExtraMetaKeys, DEFAULT_MONOSPACE_FONT_NAME, DEFAULT_MONOSPACE_FONT_SIZE};
+use crate::terminal::local_tty::shell::is_valid_path_or_command_for_supported_shell;
+use crate::terminal::session_settings::{
+    StartupShell, WorkingDirectoryConfig, WorkingDirectoryMode, WorkingDirectoryPerSourceConfig,
+};
 
 extern crate plist;