diff options
| author | Daniel Jankowski <daniel.jankowski@rub.de> | 2023-08-31 18:55:40 +0200 |
|---|---|---|
| committer | Daniel Jankowski <daniel.jankowski@rub.de> | 2023-08-31 18:55:40 +0200 |
| commit | b4573e4869bd1cf7c0503ebccd86e8a36c790063 (patch) | |
| tree | c5d7123e77a2da7fc4584e2afc46fcb00139b92f | |
| parent | feat: add tabs widget (diff) | |
| download | sl0pstatus-b4573e4869bd1cf7c0503ebccd86e8a36c790063.tar.gz sl0pstatus-b4573e4869bd1cf7c0503ebccd86e8a36c790063.tar.xz sl0pstatus-b4573e4869bd1cf7c0503ebccd86e8a36c790063.zip | |
chore: remove format suffix from config
| -rw-r--r-- | plugin-dev-workspace.kdl | 8 | ||||
| -rw-r--r-- | src/widgets/mode.rs | 28 | ||||
| -rw-r--r-- | src/widgets/tabs.rs | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/plugin-dev-workspace.kdl b/plugin-dev-workspace.kdl index 1118ef8..1dce010 100644 --- a/plugin-dev-workspace.kdl +++ b/plugin-dev-workspace.kdl @@ -13,11 +13,11 @@ layout { plugin location="file:target/wasm32-wasi/debug/zjstatus.wasm" { format "#[bold,italic]{mode} #[fg=255] :: {tabs} {space} #[fg=255,bg=0] {date} " - mode_normal_format "#[fg=0,bg=3]>> {name} <<" - mode_tmux_format "#[fg=255,bg=0]>> tmux <<" + mode_normal "#[fg=0,bg=3]>> {name} <<" + mode_tmux "#[fg=255,bg=0]>> tmux <<" - tab_format "#[fg=255,bg=0] {name}" - tab_active_format "#[fg=255,bg=0,bold] {name}" + tab_normal "#[fg=255,bg=0] {name}" + tab_active "#[fg=255,bg=0,bold] {name}" } } } diff --git a/src/widgets/mode.rs b/src/widgets/mode.rs index 629cd0f..c05384a 100644 --- a/src/widgets/mode.rs +++ b/src/widgets/mode.rs @@ -27,71 +27,71 @@ pub struct ModeWidget { impl ModeWidget { pub fn new(config: BTreeMap<String, String>) -> Self { let mut normal_format_string = ""; - if let Some(form) = config.get("mode_normal_format") { + if let Some(form) = config.get("mode_normal") { normal_format_string = form; } - let locked_format = FormattedPart::from_format_string(match config.get("mode_locked_format") { + let locked_format = FormattedPart::from_format_string(match config.get("mode_locked") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let resize_format = FormattedPart::from_format_string(match config.get("mode_resize_format") { + let resize_format = FormattedPart::from_format_string(match config.get("mode_resize") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let pane_format = FormattedPart::from_format_string(match config.get("mode_pane_format") { + let pane_format = FormattedPart::from_format_string(match config.get("mode_pane") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let tab_format = FormattedPart::from_format_string(match config.get("mode_tab_format") { + let tab_format = FormattedPart::from_format_string(match config.get("mode_tab") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let scroll_format = FormattedPart::from_format_string(match config.get("mode_scroll_format") { + let scroll_format = FormattedPart::from_format_string(match config.get("mode_scroll") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let enter_search_format = FormattedPart::from_format_string(match config.get("mode_enter_search_format") { + let enter_search_format = FormattedPart::from_format_string(match config.get("mode_enter_search") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let search_format = FormattedPart::from_format_string(match config.get("mode_search_format") { + let search_format = FormattedPart::from_format_string(match config.get("mode_search") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let rename_tab_format = FormattedPart::from_format_string(match config.get("mode_rename_tab_format") { + let rename_tab_format = FormattedPart::from_format_string(match config.get("mode_rename_tab") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let rename_pane_format = FormattedPart::from_format_string(match config.get("mode_rename_pane_format") { + let rename_pane_format = FormattedPart::from_format_string(match config.get("mode_rename_pane") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let session_format = FormattedPart::from_format_string(match config.get("mode_session_format") { + let session_format = FormattedPart::from_format_string(match config.get("mode_session") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let move_format = FormattedPart::from_format_string(match config.get("mode_move_format") { + let move_format = FormattedPart::from_format_string(match config.get("mode_move") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let prompt_format = FormattedPart::from_format_string(match config.get("mode_prompt_format") { + let prompt_format = FormattedPart::from_format_string(match config.get("mode_prompt") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); - let tmux_format = FormattedPart::from_format_string(match config.get("mode_tmux_format") { + let tmux_format = FormattedPart::from_format_string(match config.get("mode_tmux") { Some(form) => form.to_string(), None => normal_format_string.to_string(), }); diff --git a/src/widgets/tabs.rs b/src/widgets/tabs.rs index 396be4a..6353251 100644 --- a/src/widgets/tabs.rs +++ b/src/widgets/tabs.rs @@ -14,12 +14,12 @@ pub struct TabsWidget { impl TabsWidget { pub fn new(config: BTreeMap<String, String>) -> Self { let mut normal_tab_format_string = ""; - if let Some(form) = config.get("tab_format") { + if let Some(form) = config.get("tab_normal") { normal_tab_format_string = form; } let active_tab_format = - FormattedPart::from_format_string(match config.get("tab_active_format") { + FormattedPart::from_format_string(match config.get("tab_active") { Some(form) => form.to_string(), None => normal_tab_format_string.to_string(), }); |
