leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Split dark and light color schemes

Browse source
This commit is contained in:
Jeremy Soller 2024-02-22 11:18:13 -07:00
parent f5ac834b11
commit 235ebd6180
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
5 changed files with 333 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/config.rs
View file

@ -15,7 +15,7 @@ use crate::fl;
pub const CONFIG_VERSION: u64 = 1; pub const CONFIG_VERSION: u64 = 1;
#[derive(Clone, Copy, Debug, Deserialize, Eq, PartialEq, Serialize)] #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
pub enum AppTheme { pub enum AppTheme {
Dark, Dark,
Light, Light,
@ -32,6 +32,12 @@ impl AppTheme {
} }
} }
#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
pub enum ColorSchemeKind {
Dark,
Light,
}
#[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)] #[derive(Clone, Copy, Debug, Default, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)]
#[serde(transparent)] #[serde(transparent)]
pub struct ColorSchemeId(pub u64); pub struct ColorSchemeId(pub u64);
@ -197,7 +203,8 @@ impl Default for Profile {
#[derive(Clone, CosmicConfigEntry, Debug, Deserialize, Eq, PartialEq, Serialize)] #[derive(Clone, CosmicConfigEntry, Debug, Deserialize, Eq, PartialEq, Serialize)]
pub struct Config { pub struct Config {
pub app_theme: AppTheme, pub app_theme: AppTheme,
pub color_schemes: BTreeMap<ColorSchemeId, ColorScheme>, pub color_schemes_dark: BTreeMap<ColorSchemeId, ColorScheme>,
pub color_schemes_light: BTreeMap<ColorSchemeId, ColorScheme>,
pub font_name: String, pub font_name: String,
pub font_size: u16, pub font_size: u16,
pub font_weight: u16, pub font_weight: u16,
@ -219,7 +226,8 @@ impl Default for Config {
Self { Self {
app_theme: AppTheme::System, app_theme: AppTheme::System,
bold_font_weight: Weight::BOLD.0, bold_font_weight: Weight::BOLD.0,
color_schemes: BTreeMap::new(), color_schemes_dark: BTreeMap::new(),
color_schemes_light: BTreeMap::new(),
dim_font_weight: Weight::NORMAL.0, dim_font_weight: Weight::NORMAL.0,
focus_follow_mouse: false, focus_follow_mouse: false,
font_name: "Fira Mono".to_string(), font_name: "Fira Mono".to_string(),
@ -238,11 +246,43 @@ impl Default for Config {
} }
impl Config { impl Config {
pub fn color_schemes(
&self,
color_scheme_kind: ColorSchemeKind,
) -> &BTreeMap<ColorSchemeId, ColorScheme> {
match color_scheme_kind {
ColorSchemeKind::Dark => &self.color_schemes_dark,
ColorSchemeKind::Light => &self.color_schemes_light,
}
}
pub fn color_schemes_mut(
&mut self,
color_scheme_kind: ColorSchemeKind,
) -> &mut BTreeMap<ColorSchemeId, ColorScheme> {
match color_scheme_kind {
ColorSchemeKind::Dark => &mut self.color_schemes_dark,
ColorSchemeKind::Light => &mut self.color_schemes_light,
}
}
pub fn color_scheme_kind(&self) -> ColorSchemeKind {
if self.app_theme.theme().theme_type.is_dark() {
ColorSchemeKind::Dark
} else {
ColorSchemeKind::Light
}
}
// Get a sorted and adjusted for duplicates list of color scheme names and ids // Get a sorted and adjusted for duplicates list of color scheme names and ids
pub fn color_scheme_names(&self) -> Vec<(String, ColorSchemeId)> { pub fn color_scheme_names(
&self,
color_scheme_kind: ColorSchemeKind,
) -> Vec<(String, ColorSchemeId)> {
let color_schemes = self.color_schemes(color_scheme_kind);
let mut color_scheme_names = let mut color_scheme_names =
Vec::<(String, ColorSchemeId)>::with_capacity(self.color_schemes.len()); Vec::<(String, ColorSchemeId)>::with_capacity(color_schemes.len());
for (color_scheme_id, color_scheme) in self.color_schemes.iter() { for (color_scheme_id, color_scheme) in color_schemes.iter() {
let mut name = color_scheme.name.clone(); let mut name = color_scheme.name.clone();
let mut copies = 1; let mut copies = 1;
@ -294,24 +334,20 @@ impl Config {
} }
// Get current syntax theme based on dark mode // Get current syntax theme based on dark mode
pub fn syntax_theme(&self, profile_id_opt: Option<ProfileId>) -> &str { pub fn syntax_theme(&self, profile_id_opt: Option<ProfileId>) -> (String, ColorSchemeKind) {
let dark = self.app_theme.theme().theme_type.is_dark(); let color_scheme_kind = self.color_scheme_kind();
match profile_id_opt.and_then(|profile_id| self.profiles.get(&profile_id)) { let theme_name = match profile_id_opt.and_then(|profile_id| self.profiles.get(&profile_id))
Some(profile) => { {
if dark { Some(profile) => match color_scheme_kind {
&profile.syntax_theme_dark ColorSchemeKind::Dark => profile.syntax_theme_dark.clone(),
} else { ColorSchemeKind::Light => profile.syntax_theme_light.clone(),
&profile.syntax_theme_light },
} None => match color_scheme_kind {
} ColorSchemeKind::Dark => self.syntax_theme_dark.clone(),
None => { ColorSchemeKind::Light => self.syntax_theme_light.clone(),
if dark { },
&self.syntax_theme_dark };
} else { (theme_name, color_scheme_kind)
&self.syntax_theme_light
}
}
}
} }
pub fn typed_font_stretch(&self) -> Stretch { pub fn typed_font_stretch(&self) -> Stretch {

362
src/main.rs
View file

@ -32,7 +32,10 @@ use std::{
}; };
use tokio::sync::mpsc; use tokio::sync::mpsc;
use config::{AppTheme, ColorScheme, ColorSchemeId, Config, Profile, ProfileId, CONFIG_VERSION}; use config::{
AppTheme, ColorScheme, ColorSchemeId, ColorSchemeKind, Config, Profile, ProfileId,
CONFIG_VERSION,
};
mod config; mod config;
mod mouse_reporter; mod mouse_reporter;
@ -168,7 +171,7 @@ pub struct Flags {
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum Action { pub enum Action {
ColorSchemes, ColorSchemes(ColorSchemeKind),
Copy, Copy,
Find, Find,
PaneFocusDown, PaneFocusDown,
@ -207,7 +210,9 @@ pub enum Action {
impl Action { impl Action {
pub fn message(self, entity_opt: Option<segmented_button::Entity>) -> Message { pub fn message(self, entity_opt: Option<segmented_button::Entity>) -> Message {
match self { match self {
Action::ColorSchemes => Message::ToggleContextPage(ContextPage::ColorSchemes), Action::ColorSchemes(color_scheme_kind) => {
Message::ToggleContextPage(ContextPage::ColorSchemes(color_scheme_kind))
}
Action::Copy => Message::Copy(entity_opt), Action::Copy => Message::Copy(entity_opt),
Action::Find => Message::Find(true), Action::Find => Message::Find(true),
Action::PaneFocusDown => Message::PaneFocusAdjacent(pane_grid::Direction::Down), Action::PaneFocusDown => Message::PaneFocusAdjacent(pane_grid::Direction::Down),
@ -249,15 +254,16 @@ impl Action {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Message { pub enum Message {
AppTheme(AppTheme), AppTheme(AppTheme),
ColorSchemeCollapse(ColorSchemeId), ColorSchemeCollapse,
ColorSchemeDelete(ColorSchemeId), ColorSchemeDelete(ColorSchemeKind, ColorSchemeId),
ColorSchemeExport(ColorSchemeId), ColorSchemeExport(ColorSchemeKind, ColorSchemeId),
ColorSchemeExportResult(ColorSchemeId, DialogResult), ColorSchemeExportResult(ColorSchemeKind, ColorSchemeId, DialogResult),
ColorSchemeExpand(ColorSchemeId), ColorSchemeExpand(ColorSchemeKind, ColorSchemeId),
ColorSchemeRename(ColorSchemeId, String), ColorSchemeRename(ColorSchemeKind, ColorSchemeId, String),
ColorSchemeRenameSubmit, ColorSchemeRenameSubmit,
ColorSchemeImport, ColorSchemeImport(ColorSchemeKind),
ColorSchemeImportResult(DialogResult), ColorSchemeImportResult(ColorSchemeKind, DialogResult),
ColorSchemeTabActivate(widget::segmented_button::Entity),
Config(Config), Config(Config),
Copy(Option<segmented_button::Entity>), Copy(Option<segmented_button::Entity>),
DefaultFont(usize), DefaultFont(usize),
@ -291,12 +297,12 @@ pub enum Message {
ProfileNew, ProfileNew,
ProfileOpen(ProfileId), ProfileOpen(ProfileId),
ProfileRemove(ProfileId), ProfileRemove(ProfileId),
ProfileSyntaxTheme(ProfileId, usize, bool), ProfileSyntaxTheme(ProfileId, ColorSchemeKind, usize),
ProfileTabTitle(ProfileId, String), ProfileTabTitle(ProfileId, String),
SelectAll(Option<segmented_button::Entity>), SelectAll(Option<segmented_button::Entity>),
UseBrightBold(bool), UseBrightBold(bool),
ShowHeaderBar(bool), ShowHeaderBar(bool),
SyntaxTheme(usize, bool), SyntaxTheme(ColorSchemeKind, usize),
SystemThemeChange, SystemThemeChange,
TabActivate(segmented_button::Entity), TabActivate(segmented_button::Entity),
TabActivateJump(usize), TabActivateJump(usize),
@ -320,7 +326,7 @@ pub enum Message {
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum ContextPage { pub enum ContextPage {
ColorSchemes, ColorSchemes(ColorSchemeKind),
Profiles, Profiles,
Settings, Settings,
} }
@ -328,7 +334,7 @@ pub enum ContextPage {
impl ContextPage { impl ContextPage {
fn title(&self) -> String { fn title(&self) -> String {
match self { match self {
Self::ColorSchemes => fl!("color-schemes"), Self::ColorSchemes(_color_scheme_kind) => fl!("color-schemes"),
Self::Profiles => fl!("profiles"), Self::Profiles => fl!("profiles"),
Self::Settings => fl!("settings"), Self::Settings => fl!("settings"),
} }
@ -356,8 +362,9 @@ pub struct App {
zoom_adj: i8, zoom_adj: i8,
zoom_step_names: Vec<String>, zoom_step_names: Vec<String>,
zoom_steps: Vec<u16>, zoom_steps: Vec<u16>,
theme_names: Vec<String>, theme_names_dark: Vec<String>,
themes: HashMap<String, TermColors>, theme_names_light: Vec<String>,
themes: HashMap<(String, ColorSchemeKind), TermColors>,
context_page: ContextPage, context_page: ContextPage,
dialog_opt: Option<Dialog<Message>>, dialog_opt: Option<Dialog<Message>>,
terminal_ids: HashMap<pane_grid::Pane, widget::Id>, terminal_ids: HashMap<pane_grid::Pane, widget::Id>,
@ -368,37 +375,67 @@ pub struct App {
startup_options: Option<tty::Options>, startup_options: Option<tty::Options>,
term_config: TermConfig, term_config: TermConfig,
color_scheme_errors: Vec<String>, color_scheme_errors: Vec<String>,
color_scheme_expanded: Option<ColorSchemeId>, color_scheme_expanded: Option<(ColorSchemeKind, ColorSchemeId)>,
color_scheme_renaming: Option<(ColorSchemeId, String)>, color_scheme_renaming: Option<(ColorSchemeKind, ColorSchemeId, String)>,
color_scheme_rename_id: widget::Id, color_scheme_rename_id: widget::Id,
color_scheme_tab_model: widget::segmented_button::SingleSelectModel,
profile_expanded: Option<ProfileId>, profile_expanded: Option<ProfileId>,
show_advanced_font_settings: bool, show_advanced_font_settings: bool,
modifiers: Modifiers, modifiers: Modifiers,
} }
impl App { impl App {
fn theme_names(&self, color_scheme_kind: ColorSchemeKind) -> &Vec<String> {
match color_scheme_kind {
ColorSchemeKind::Dark => &self.theme_names_dark,
ColorSchemeKind::Light => &self.theme_names_light,
}
}
fn update_color_schemes(&mut self) { fn update_color_schemes(&mut self) {
self.themes = terminal_theme::terminal_themes(); self.themes = terminal_theme::terminal_themes();
for (color_scheme_name, color_scheme_id) in self.config.color_scheme_names() { for &color_scheme_kind in &[ColorSchemeKind::Dark, ColorSchemeKind::Light] {
if let Some(color_scheme) = self.config.color_schemes.get(&color_scheme_id) { for (color_scheme_name, color_scheme_id) in
if self self.config.color_scheme_names(color_scheme_kind)
.themes {
.insert(color_scheme_name.clone(), color_scheme.into()) if let Some(color_scheme) = self
.is_some() .config
.color_schemes(color_scheme_kind)
.get(&color_scheme_id)
{ {
log::warn!( if self
"custom color scheme {:?} replaces builtin one", .themes
color_scheme_name .insert(
); (color_scheme_name.clone(), color_scheme_kind),
color_scheme.into(),
)
.is_some()
{
log::warn!(
"custom {:?} color scheme {:?} replaces builtin one",
color_scheme_kind,
color_scheme_name
);
}
} }
} }
} }
self.theme_names.clear(); self.theme_names_dark.clear();
for theme_name in self.themes.keys() { self.theme_names_light.clear();
self.theme_names.push(theme_name.clone()); for (name, color_scheme_kind) in self.themes.keys() {
match *color_scheme_kind {
ColorSchemeKind::Dark => {
self.theme_names_dark.push(name.clone());
}
ColorSchemeKind::Light => {
self.theme_names_light.push(name.clone());
}
}
} }
self.theme_names self.theme_names_dark
.sort_by(|a, b| lexical_sort::natural_lexical_cmp(a, b));
self.theme_names_light
.sort_by(|a, b| lexical_sort::natural_lexical_cmp(a, b)); .sort_by(|a, b| lexical_sort::natural_lexical_cmp(a, b));
} }
@ -448,10 +485,16 @@ impl App {
self.update_config() self.update_config()
} }
fn save_color_schemes(&mut self) -> Command<Message> { fn save_color_schemes(&mut self, color_scheme_kind: ColorSchemeKind) -> Command<Message> {
// Optimized for just saving color_schemes // Optimized for just saving color_schemes
if let Some(ref config_handler) = self.config_handler { if let Some(ref config_handler) = self.config_handler {
match config_handler.set("color_schemes", &self.config.color_schemes) { match config_handler.set(
match color_scheme_kind {
ColorSchemeKind::Dark => "color_schemes_dark",
ColorSchemeKind::Light => "color_schemes_light",
},
&self.config.color_schemes(color_scheme_kind),
) {
Ok(()) => {} Ok(()) => {}
Err(err) => { Err(err) => {
log::error!("failed to save config: {}", err); log::error!("failed to save config: {}", err);
@ -587,30 +630,45 @@ impl App {
} }
} }
fn color_schemes(&self) -> Element<Message> { fn color_schemes(&self, color_scheme_kind: ColorSchemeKind) -> Element<Message> {
let cosmic_theme::Spacing { space_xxxs, .. } = self.core().system_theme().cosmic().spacing; let cosmic_theme::Spacing { space_xxxs, .. } = self.core().system_theme().cosmic().spacing;
let mut sections = Vec::with_capacity(2 + self.color_scheme_errors.len()); let mut sections = Vec::with_capacity(3 + self.color_scheme_errors.len());
if !self.config.color_schemes.is_empty() { sections.push(
widget::view_switcher::horizontal(&self.color_scheme_tab_model)
.on_activate(Message::ColorSchemeTabActivate)
.into(),
);
if !self.config.color_schemes(color_scheme_kind).is_empty() {
let mut section = widget::settings::view_section(""); let mut section = widget::settings::view_section("");
for (color_scheme_name, color_scheme_id) in self.config.color_scheme_names() { for (color_scheme_name, color_scheme_id) in
let expanded = self.color_scheme_expanded == Some(color_scheme_id); self.config.color_scheme_names(color_scheme_kind)
{
let expanded =
self.color_scheme_expanded == Some((color_scheme_kind, color_scheme_id));
let renaming = match &self.color_scheme_renaming { let renaming = match &self.color_scheme_renaming {
Some((id, value)) if id == &color_scheme_id => Some(value), Some((kind, id, value))
if kind == &color_scheme_kind && id == &color_scheme_id =>
{
Some(value)
}
_ => None, _ => None,
}; };
let button = if expanded { let button = if expanded {
widget::button(icon_cache_get("view-more-symbolic", 16)) widget::button(icon_cache_get("view-more-symbolic", 16))
.on_press(Message::ColorSchemeCollapse(color_scheme_id)) .on_press(Message::ColorSchemeCollapse)
} else { } else {
widget::button(icon_cache_get("view-more-symbolic", 16)) widget::button(icon_cache_get("view-more-symbolic", 16)).on_press(
.on_press(Message::ColorSchemeExpand(color_scheme_id)) Message::ColorSchemeExpand(color_scheme_kind, color_scheme_id),
)
} }
.style(style::Button::Icon); .style(style::Button::Icon);
let menu = menu::color_scheme_menu(color_scheme_id, &color_scheme_name); let menu =
menu::color_scheme_menu(color_scheme_kind, color_scheme_id, &color_scheme_name);
let popover = widget::popover(button, menu).show_popup(expanded); let popover = widget::popover(button, menu).show_popup(expanded);
@ -619,7 +677,11 @@ impl App {
widget::text_input("", value) widget::text_input("", value)
.id(self.color_scheme_rename_id.clone()) .id(self.color_scheme_rename_id.clone())
.on_input(move |value| { .on_input(move |value| {
Message::ColorSchemeRename(color_scheme_id, value) Message::ColorSchemeRename(
color_scheme_kind,
color_scheme_id,
value,
)
}) })
.on_submit(Message::ColorSchemeRenameSubmit) .on_submit(Message::ColorSchemeRenameSubmit)
.into(), .into(),
@ -636,7 +698,7 @@ impl App {
widget::row::with_children(vec![ widget::row::with_children(vec![
widget::horizontal_space(Length::Fill).into(), widget::horizontal_space(Length::Fill).into(),
widget::button::standard(fl!("import")) widget::button::standard(fl!("import"))
.on_press(Message::ColorSchemeImport) .on_press(Message::ColorSchemeImport(color_scheme_kind))
.into(), .into(),
]) ])
.into(), .into(),
@ -716,11 +778,11 @@ impl App {
if expanded { if expanded {
let dark_selected = self let dark_selected = self
.theme_names .theme_names_dark
.iter() .iter()
.position(|theme_name| theme_name == &profile.syntax_theme_dark); .position(|theme_name| theme_name == &profile.syntax_theme_dark);
let light_selected = self let light_selected = self
.theme_names .theme_names_light
.iter() .iter()
.position(|theme_name| theme_name == &profile.syntax_theme_light); .position(|theme_name| theme_name == &profile.syntax_theme_light);
@ -766,10 +828,14 @@ impl App {
//TODO: rename to color-scheme-dark? //TODO: rename to color-scheme-dark?
widget::settings::item::builder(fl!("syntax-dark")).control( widget::settings::item::builder(fl!("syntax-dark")).control(
widget::dropdown( widget::dropdown(
&self.theme_names, &self.theme_names_dark,
dark_selected, dark_selected,
move |theme_i| { move |theme_i| {
Message::ProfileSyntaxTheme(profile_id, theme_i, true) Message::ProfileSyntaxTheme(
profile_id,
ColorSchemeKind::Dark,
theme_i,
)
}, },
), ),
), ),
@ -778,10 +844,14 @@ impl App {
//TODO: rename to color-scheme-light? //TODO: rename to color-scheme-light?
widget::settings::item::builder(fl!("syntax-light")).control( widget::settings::item::builder(fl!("syntax-light")).control(
widget::dropdown( widget::dropdown(
&self.theme_names, &self.theme_names_light,
light_selected, light_selected,
move |theme_i| { move |theme_i| {
Message::ProfileSyntaxTheme(profile_id, theme_i, false) Message::ProfileSyntaxTheme(
profile_id,
ColorSchemeKind::Light,
theme_i,
)
}, },
), ),
), ),
@ -818,11 +888,11 @@ impl App {
AppTheme::System => 0, AppTheme::System => 0,
}; };
let dark_selected = self let dark_selected = self
.theme_names .theme_names_dark
.iter() .iter()
.position(|theme_name| theme_name == &self.config.syntax_theme_dark); .position(|theme_name| theme_name == &self.config.syntax_theme_dark);
let light_selected = self let light_selected = self
.theme_names .theme_names_light
.iter() .iter()
.position(|theme_name| theme_name == &self.config.syntax_theme_light); .position(|theme_name| theme_name == &self.config.syntax_theme_light);
let font_selected = { let font_selected = {
@ -874,17 +944,17 @@ impl App {
.add( .add(
//TODO: rename to color-scheme-dark? //TODO: rename to color-scheme-dark?
widget::settings::item::builder(fl!("syntax-dark")).control(widget::dropdown( widget::settings::item::builder(fl!("syntax-dark")).control(widget::dropdown(
&self.theme_names, &self.theme_names_dark,
dark_selected, dark_selected,
move |index| Message::SyntaxTheme(index, true), move |index| Message::SyntaxTheme(ColorSchemeKind::Dark, index),
)), )),
) )
.add( .add(
//TODO: rename to color-scheme-light? //TODO: rename to color-scheme-light?
widget::settings::item::builder(fl!("syntax-light")).control(widget::dropdown( widget::settings::item::builder(fl!("syntax-light")).control(widget::dropdown(
&self.theme_names, &self.theme_names_light,
light_selected, light_selected,
move |index| Message::SyntaxTheme(index, false), move |index| Message::SyntaxTheme(ColorSchemeKind::Light, index),
)), )),
) )
.add( .add(
@ -1007,7 +1077,7 @@ impl App {
self.pane_model.focus = pane; self.pane_model.focus = pane;
match &self.term_event_tx_opt { match &self.term_event_tx_opt {
Some(term_event_tx) => { Some(term_event_tx) => {
match self.themes.get(self.config.syntax_theme(profile_id_opt)) { match self.themes.get(&self.config.syntax_theme(profile_id_opt)) {
Some(colors) => { Some(colors) => {
let current_pane = self.pane_model.focus; let current_pane = self.pane_model.focus;
if let Some(tab_model) = self.pane_model.active_mut() { if let Some(tab_model) = self.pane_model.active_mut() {
@ -1241,7 +1311,8 @@ impl Application for App {
zoom_adj: 0, zoom_adj: 0,
zoom_step_names, zoom_step_names,
zoom_steps, zoom_steps,
theme_names: Vec::new(), theme_names_dark: Vec::new(),
theme_names_light: Vec::new(),
themes: HashMap::new(), themes: HashMap::new(),
context_page: ContextPage::Settings, context_page: ContextPage::Settings,
dialog_opt: None, dialog_opt: None,
@ -1256,6 +1327,7 @@ impl Application for App {
color_scheme_expanded: None, color_scheme_expanded: None,
color_scheme_renaming: None, color_scheme_renaming: None,
color_scheme_rename_id: widget::Id::unique(), color_scheme_rename_id: widget::Id::unique(),
color_scheme_tab_model: widget::segmented_button::Model::default(),
profile_expanded: None, profile_expanded: None,
show_advanced_font_settings: false, show_advanced_font_settings: false,
modifiers: Modifiers::empty(), modifiers: Modifiers::empty(),
@ -1324,17 +1396,23 @@ impl Application for App {
self.config.app_theme = app_theme; self.config.app_theme = app_theme;
return self.save_config(); return self.save_config();
} }
Message::ColorSchemeCollapse(_color_scheme_id) => { Message::ColorSchemeCollapse => {
self.color_scheme_expanded = None; self.color_scheme_expanded = None;
} }
Message::ColorSchemeDelete(color_scheme_id) => { Message::ColorSchemeDelete(color_scheme_kind, color_scheme_id) => {
self.color_scheme_expanded = None; self.color_scheme_expanded = None;
self.config.color_schemes.remove(&color_scheme_id); self.config
return self.save_color_schemes(); .color_schemes_mut(color_scheme_kind)
.remove(&color_scheme_id);
return self.save_color_schemes(color_scheme_kind);
} }
Message::ColorSchemeExport(color_scheme_id) => { Message::ColorSchemeExport(color_scheme_kind, color_scheme_id) => {
self.color_scheme_expanded = None; self.color_scheme_expanded = None;
if let Some(color_scheme) = self.config.color_schemes.get(&color_scheme_id) { if let Some(color_scheme) = self
.config
.color_schemes(color_scheme_kind)
.get(&color_scheme_id)
{
if self.dialog_opt.is_none() { if self.dialog_opt.is_none() {
let (dialog, command) = Dialog::new( let (dialog, command) = Dialog::new(
DialogKind::SaveFile { DialogKind::SaveFile {
@ -1343,7 +1421,11 @@ impl Application for App {
None, None,
Message::DialogMessage, Message::DialogMessage,
move |result| { move |result| {
Message::ColorSchemeExportResult(color_scheme_id.clone(), result) Message::ColorSchemeExportResult(
color_scheme_kind,
color_scheme_id.clone(),
result,
)
}, },
); );
self.dialog_opt = Some(dialog); self.dialog_opt = Some(dialog);
@ -1351,12 +1433,16 @@ impl Application for App {
} }
} }
} }
Message::ColorSchemeExportResult(color_scheme_id, result) => { Message::ColorSchemeExportResult(color_scheme_kind, color_scheme_id, result) => {
//TODO: show errors in UI //TODO: show errors in UI
self.dialog_opt = None; self.dialog_opt = None;
if let DialogResult::Open(paths) = result { if let DialogResult::Open(paths) = result {
let path = &paths[0]; let path = &paths[0];
if let Some(color_scheme) = self.config.color_schemes.get(&color_scheme_id) { if let Some(color_scheme) = self
.config
.color_schemes(color_scheme_kind)
.get(&color_scheme_id)
{
match ron::ser::to_string_pretty( match ron::ser::to_string_pretty(
&color_scheme, &color_scheme,
ron::ser::PrettyConfig::new(), ron::ser::PrettyConfig::new(),
@ -1385,42 +1471,23 @@ impl Application for App {
} }
} }
} }
Message::ColorSchemeExpand(color_scheme_id) => { Message::ColorSchemeExpand(color_scheme_kind, color_scheme_id) => {
self.color_scheme_expanded = Some(color_scheme_id); self.color_scheme_expanded = Some((color_scheme_kind, color_scheme_id));
} }
Message::ColorSchemeRename(color_scheme_id, color_scheme_name) => { Message::ColorSchemeImport(color_scheme_kind) => {
self.color_scheme_expanded = None;
let focus = self.color_scheme_renaming.is_none();
self.color_scheme_renaming = Some((color_scheme_id, color_scheme_name));
if focus {
return widget::text_input::focus(self.color_scheme_rename_id.clone());
}
}
Message::ColorSchemeRenameSubmit => {
if let Some((color_scheme_id, color_scheme_name)) =
self.color_scheme_renaming.take()
{
if let Some(color_scheme) = self.config.color_schemes.get_mut(&color_scheme_id)
{
color_scheme.name = color_scheme_name;
return self.save_color_schemes();
}
}
}
Message::ColorSchemeImport => {
if self.dialog_opt.is_none() { if self.dialog_opt.is_none() {
self.color_scheme_errors.clear(); self.color_scheme_errors.clear();
let (dialog, command) = Dialog::new( let (dialog, command) = Dialog::new(
DialogKind::OpenMultipleFiles, DialogKind::OpenMultipleFiles,
None, None,
Message::DialogMessage, Message::DialogMessage,
move |result| Message::ColorSchemeImportResult(result), move |result| Message::ColorSchemeImportResult(color_scheme_kind, result),
); );
self.dialog_opt = Some(dialog); self.dialog_opt = Some(dialog);
return command; return command;
} }
} }
Message::ColorSchemeImportResult(result) => { Message::ColorSchemeImportResult(color_scheme_kind, result) => {
self.dialog_opt = None; self.dialog_opt = None;
if let DialogResult::Open(paths) = result { if let DialogResult::Open(paths) = result {
self.color_scheme_errors.clear(); self.color_scheme_errors.clear();
@ -1438,12 +1505,12 @@ impl Application for App {
// Get next color_scheme ID // Get next color_scheme ID
let color_scheme_id = self let color_scheme_id = self
.config .config
.color_schemes .color_schemes(color_scheme_kind)
.last_key_value() .last_key_value()
.map(|(id, _)| ColorSchemeId(id.0 + 1)) .map(|(id, _)| ColorSchemeId(id.0 + 1))
.unwrap_or_default(); .unwrap_or_default();
self.config self.config
.color_schemes .color_schemes_mut(color_scheme_kind)
.insert(color_scheme_id, color_scheme); .insert(color_scheme_id, color_scheme);
} }
Err(err) => { Err(err) => {
@ -1452,7 +1519,40 @@ impl Application for App {
} }
} }
} }
return self.save_color_schemes(); return self.save_color_schemes(color_scheme_kind);
}
}
Message::ColorSchemeRename(color_scheme_kind, color_scheme_id, color_scheme_name) => {
self.color_scheme_expanded = None;
let focus = self.color_scheme_renaming.is_none();
self.color_scheme_renaming =
Some((color_scheme_kind, color_scheme_id, color_scheme_name));
if focus {
return widget::text_input::focus(self.color_scheme_rename_id.clone());
}
}
Message::ColorSchemeRenameSubmit => {
if let Some((color_scheme_kind, color_scheme_id, color_scheme_name)) =
self.color_scheme_renaming.take()
{
if let Some(color_scheme) = self
.config
.color_schemes_mut(color_scheme_kind)
.get_mut(&color_scheme_id)
{
color_scheme.name = color_scheme_name;
return self.save_color_schemes(color_scheme_kind);
}
}
}
Message::ColorSchemeTabActivate(entity) => {
if let Some(color_scheme_kind) =
self.color_scheme_tab_model.data::<ColorSchemeKind>(entity)
{
let context_page = ContextPage::ColorSchemes(*color_scheme_kind);
if self.context_page != context_page {
return self.update(Message::ToggleContextPage(context_page));
}
} }
} }
Message::Config(config) => { Message::Config(config) => {
@ -1749,14 +1849,21 @@ impl Application for App {
self.config.profiles.remove(&profile_id); self.config.profiles.remove(&profile_id);
return self.save_profiles(); return self.save_profiles();
} }
Message::ProfileSyntaxTheme(profile_id, theme_i, dark) => { Message::ProfileSyntaxTheme(profile_id, color_scheme_kind, theme_i) => {
match self.theme_names.get(theme_i) { match self
.theme_names(color_scheme_kind)
.get(theme_i)
.map(|x| x.to_string())
{
Some(theme_name) => { Some(theme_name) => {
if let Some(profile) = self.config.profiles.get_mut(&profile_id) { if let Some(profile) = self.config.profiles.get_mut(&profile_id) {
if dark { match color_scheme_kind {
profile.syntax_theme_dark = theme_name.to_string(); ColorSchemeKind::Dark => {
} else { profile.syntax_theme_dark = theme_name;
profile.syntax_theme_light = theme_name.to_string(); }
ColorSchemeKind::Light => {
profile.syntax_theme_light = theme_name;
}
} }
return self.save_profiles(); return self.save_profiles();
} }
@ -1800,19 +1907,24 @@ impl Application for App {
Message::SystemThemeChange => { Message::SystemThemeChange => {
return self.update_config(); return self.update_config();
} }
Message::SyntaxTheme(index, dark) => match self.theme_names.get(index) { Message::SyntaxTheme(color_scheme_kind, index) => {
Some(theme_name) => { match self.theme_names(color_scheme_kind).get(index) {
if dark { Some(theme_name) => {
self.config.syntax_theme_dark = theme_name.to_string(); match color_scheme_kind {
} else { ColorSchemeKind::Dark => {
self.config.syntax_theme_light = theme_name.to_string(); self.config.syntax_theme_dark = theme_name.to_string();
}
ColorSchemeKind::Light => {
self.config.syntax_theme_light = theme_name.to_string();
}
}
return self.save_config();
}
None => {
log::warn!("failed to find syntax theme with index {}", index);
} }
return self.save_config();
} }
None => { }
log::warn!("failed to find syntax theme with index {}", index);
}
},
Message::TabActivate(entity) => { Message::TabActivate(entity) => {
if let Some(tab_model) = self.pane_model.active_mut() { if let Some(tab_model) = self.pane_model.active_mut() {
tab_model.activate(entity); tab_model.activate(entity);
@ -2058,10 +2170,28 @@ impl Application for App {
// Extra work to do to prepare context pages // Extra work to do to prepare context pages
match self.context_page { match self.context_page {
ContextPage::ColorSchemes => { ContextPage::ColorSchemes(color_scheme_kind) => {
self.color_scheme_errors.clear(); self.color_scheme_errors.clear();
self.color_scheme_expanded = None; self.color_scheme_expanded = None;
self.color_scheme_renaming = None; self.color_scheme_renaming = None;
self.color_scheme_tab_model = widget::segmented_button::Model::default();
let dark_entity = self
.color_scheme_tab_model
.insert()
.text(fl!("dark"))
.data(ColorSchemeKind::Dark)
.id();
let light_entity = self
.color_scheme_tab_model
.insert()
.text(fl!("light"))
.data(ColorSchemeKind::Light)
.id();
self.color_scheme_tab_model
.activate(match color_scheme_kind {
ColorSchemeKind::Dark => dark_entity,
ColorSchemeKind::Light => light_entity,
});
} }
_ => {} _ => {}
} }
@ -2108,7 +2238,7 @@ impl Application for App {
} }
Some(match self.context_page { Some(match self.context_page {
ContextPage::ColorSchemes => self.color_schemes(), ContextPage::ColorSchemes(color_scheme_kind) => self.color_schemes(color_scheme_kind),
ContextPage::Profiles => self.profiles(), ContextPage::Profiles => self.profiles(),
ContextPage::Settings => self.settings(), ContextPage::Settings => self.settings(),
}) })

19
src/menu.rs
View file

@ -17,7 +17,7 @@ use cosmic::{
}; };
use std::collections::HashMap; use std::collections::HashMap;
use crate::{fl, Action, ColorSchemeId, Config, KeyBind, Message}; use crate::{fl, Action, ColorSchemeId, ColorSchemeKind, Config, KeyBind, Message};
macro_rules! menu_button { macro_rules! menu_button {
($($x:expr),+ $(,)?) => ( ($($x:expr),+ $(,)?) => (
@ -108,16 +108,20 @@ pub fn context_menu<'a>(
.into() .into()
} }
pub fn color_scheme_menu<'a>(id: ColorSchemeId, name: &str) -> Element<'a, Message> { pub fn color_scheme_menu<'a>(
kind: ColorSchemeKind,
id: ColorSchemeId,
name: &str,
) -> Element<'a, Message> {
let menu_item = |label, message| menu_button!(widget::text(label)).on_press(message); let menu_item = |label, message| menu_button!(widget::text(label)).on_press(message);
widget::container(column!( widget::container(column!(
menu_item( menu_item(
fl!("rename"), fl!("rename"),
Message::ColorSchemeRename(id, name.to_string()) Message::ColorSchemeRename(kind, id, name.to_string())
), ),
menu_item(fl!("export"), Message::ColorSchemeExport(id)), menu_item(fl!("export"), Message::ColorSchemeExport(kind, id)),
menu_item(fl!("delete"), Message::ColorSchemeDelete(id)), menu_item(fl!("delete"), Message::ColorSchemeDelete(kind, id)),
)) ))
.padding(1) .padding(1)
//TODO: move style to libcosmic //TODO: move style to libcosmic
@ -217,7 +221,10 @@ pub fn menu_bar<'a>(config: &Config, key_binds: &HashMap<KeyBind, Action>) -> El
menu_item(fl!("split-vertical"), Action::PaneSplitVertical), menu_item(fl!("split-vertical"), Action::PaneSplitVertical),
menu_item(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized), menu_item(fl!("pane-toggle-maximize"), Action::PaneToggleMaximized),
MenuTree::new(horizontal_rule(1)), MenuTree::new(horizontal_rule(1)),
menu_item(fl!("menu-color-schemes"), Action::ColorSchemes), menu_item(
fl!("menu-color-schemes"),
Action::ColorSchemes(config.color_scheme_kind()),
),
menu_item(fl!("menu-settings"), Action::Settings), menu_item(fl!("menu-settings"), Action::Settings),
], ],
), ),

6
src/terminal.rs
View file

@ -39,7 +39,7 @@ use tokio::sync::mpsc;
pub use alacritty_terminal::grid::Scroll as TerminalScroll; pub use alacritty_terminal::grid::Scroll as TerminalScroll;
use crate::{ use crate::{
config::{Config as AppConfig, ProfileId}, config::{ColorSchemeKind, Config as AppConfig, ProfileId},
mouse_reporter::MouseReporter, mouse_reporter::MouseReporter,
}; };
@ -519,7 +519,7 @@ impl Terminal {
pub fn set_config( pub fn set_config(
&mut self, &mut self,
config: &AppConfig, config: &AppConfig,
themes: &HashMap<String, Colors>, themes: &HashMap<(String, ColorSchemeKind), Colors>,
zoom_adj: i8, zoom_adj: i8,
) { ) {
let mut update_cell_size = false; let mut update_cell_size = false;
@ -559,7 +559,7 @@ impl Terminal {
update_cell_size = true; update_cell_size = true;
} }
if let Some(colors) = themes.get(config.syntax_theme(self.profile_id_opt)) { if let Some(colors) = themes.get(&config.syntax_theme(self.profile_id_opt)) {
let mut changed = false; let mut changed = false;
for i in 0..color::COUNT { for i in 0..color::COUNT {
if self.colors[i] != colors[i] { if self.colors[i] != colors[i] {

16
src/terminal_theme.rs
View file

@ -6,7 +6,7 @@ use hex_color::HexColor;
use palette::{encoding::Srgb, rgb::Rgb as PRgb, FromColor, Okhsl}; use palette::{encoding::Srgb, rgb::Rgb as PRgb, FromColor, Okhsl};
use std::{collections::HashMap, fs}; use std::{collections::HashMap, fs};
use crate::config::{ColorScheme, ColorSchemeAnsi}; use crate::config::{ColorScheme, ColorSchemeAnsi, ColorSchemeKind};
// Fill missing dim/bright colors with derived values from normal ones. // Fill missing dim/bright colors with derived values from normal ones.
#[allow(dead_code)] #[allow(dead_code)]
@ -335,17 +335,23 @@ fn cosmic_light() -> Colors {
} }
// Get builtin themes // Get builtin themes
pub fn terminal_themes() -> HashMap<String, Colors> { pub fn terminal_themes() -> HashMap<(String, ColorSchemeKind), Colors> {
let mut themes = HashMap::new(); let mut themes = HashMap::new();
themes.insert("COSMIC Dark".to_string(), cosmic_dark()); themes.insert(
themes.insert("COSMIC Light".to_string(), cosmic_light()); ("COSMIC Dark".to_string(), ColorSchemeKind::Dark),
cosmic_dark(),
);
themes.insert(
("COSMIC Light".to_string(), ColorSchemeKind::Light),
cosmic_light(),
);
themes themes
} }
// Helper function to export builtin themes to theme files // Helper function to export builtin themes to theme files
#[allow(dead_code)] #[allow(dead_code)]
pub fn export() { pub fn export() {
for (name, theme) in terminal_themes() { for ((name, _color_scheme_kind), theme) in terminal_themes() {
let color_scheme = ColorScheme::from((name.as_str(), &theme)); let color_scheme = ColorScheme::from((name.as_str(), &theme));
// Ensure conversion to and from ColorScheme matches original theme // Ensure conversion to and from ColorScheme matches original theme