From 1b195f8c5489f9ce61ad5be424e3df4188d6dc5e Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Tue, 15 Feb 2022 01:16:25 -0700 Subject: [PATCH] fix: Change default completion color --- docs/taskwarrior-tui.1 | 144 ++++++++++++++++++++++------------------- src/config.rs | 10 ++- 2 files changed, 83 insertions(+), 71 deletions(-) diff --git a/docs/taskwarrior-tui.1 b/docs/taskwarrior-tui.1 index 56f4c26..2d2982f 100644 --- a/docs/taskwarrior-tui.1 +++ b/docs/taskwarrior-tui.1 @@ -1,5 +1,19 @@ -.\" Automatically generated by Pandoc 2.17.0.1 +.\" Automatically generated by Pandoc 2.17.1.1 .\" +.\" Define V font for inline verbatim, using C font in formats +.\" that render this, and otherwise B font. +.ie "\f[CB]x\f[]"x" \{\ +. ftr V B +. ftr VI BI +. ftr VB B +. ftr VBI BI +.\} +.el \{\ +. ftr V CR +. ftr VI CI +. ftr VB CB +. ftr VBI CBI +.\} .TH "taskwarrior-tui" "1" "" "" "" .hy .SH NAME @@ -8,96 +22,96 @@ taskwarrior-tui \[em] A terminal user interface for taskwarrior (https://github.com/kdheepak/taskwarrior-tui) .SH SYNOPSIS .PP -\f[C]taskwarrior-tui\f[R] +\f[V]taskwarrior-tui\f[R] .PP -\f[B]\f[CB]taskwarrior-tui\f[B]\f[R] is a terminal user interface for -\f[C]taskwarrior\f[R]. +\f[B]\f[VB]taskwarrior-tui\f[B]\f[R] is a terminal user interface for +\f[V]taskwarrior\f[R]. .SH EXAMPLES .TP -\f[B]\f[CB]taskwarrior-tui\f[B]\f[R] -Starts a terminal user interface for \f[C]taskwarrior\f[R]. +\f[V]taskwarrior-tui\f[R] +Starts a terminal user interface for \f[V]taskwarrior\f[R]. .TP -\f[B]\f[CB]alias tt=taskwarrior-tui\f[B]\f[R] -Add the above to your dotfiles to use \f[C]tt\f[R] to start -\f[C]taskwarrior-tui\f[R]. +\f[V]alias tt=taskwarrior-tui\f[R] +Add the above to your dotfiles to use \f[V]tt\f[R] to start +\f[V]taskwarrior-tui\f[R]. .SH KEYBINDINGS .PP Keybindings: .TP -\f[B]\f[CB]Esc\f[B]\f[R] +\f[V]Esc\f[R] Exit current action .TP -\f[B]\f[CB]]\f[B]\f[R] +\f[V]]\f[R] Next view - Go to next view .TP -\f[B]\f[CB][\f[B]\f[R] +\f[V][\f[R] Previous view - Go to previous view .PP Keybindings for task report: .TP -\f[B]\f[CB]/\f[B]\f[R] +\f[V]/\f[R] task {string} - Filter task report .TP -\f[B]\f[CB]a\f[B]\f[R] +\f[V]a\f[R] task add {string} - Add new task .TP -\f[B]\f[CB]d\f[B]\f[R] +\f[V]d\f[R] task {selected} done - Mark task as done .TP -\f[B]\f[CB]e\f[B]\f[R] +\f[V]e\f[R] task {selected} edit - Open selected task in editor .TP -\f[B]\f[CB]j\f[B]\f[R] +\f[V]j\f[R] {selected+=1} - Move down in task report .TP -\f[B]\f[CB]k\f[B]\f[R] +\f[V]k\f[R] {selected-=1} - Move up in task report .TP -\f[B]\f[CB]J\f[B]\f[R] +\f[V]J\f[R] {selected+=pageheight} - Move page down in task report .TP -\f[B]\f[CB]K\f[B]\f[R] +\f[V]K\f[R] {selected-=pageheight} - Move page up in task report .TP -\f[B]\f[CB]g\f[B]\f[R] +\f[V]g\f[R] {selected=first} - Go to top .TP -\f[B]\f[CB]G\f[B]\f[R] +\f[V]G\f[R] {selected=last} - Go to bottom .TP -\f[B]\f[CB]l\f[B]\f[R] +\f[V]l\f[R] task log {string} - Log new task .TP -\f[B]\f[CB]m\f[B]\f[R] +\f[V]m\f[R] task {selected} modify {string} - Modify selected task .TP -\f[B]\f[CB]q\f[B]\f[R] +\f[V]q\f[R] exit - Quit .TP -\f[B]\f[CB]s\f[B]\f[R] +\f[V]s\f[R] task {selected} start/stop - Toggle start and stop .TP -\f[B]\f[CB]t\f[B]\f[R] +\f[V]t\f[R] task {selected} +{tag}/-{tag} - Toggle -{uda.taskwarrior-tui.quick-tag.name} (default: \f[C]next\f[R]) +{uda.taskwarrior-tui.quick-tag.name} (default: \f[V]next\f[R]) .TP -\f[B]\f[CB]u\f[B]\f[R] +\f[V]u\f[R] task undo - Undo .TP -\f[B]\f[CB]v\f[B]\f[R] +\f[V]v\f[R] {toggle mark on selected} - Toggle mark on selected .TP -\f[B]\f[CB]V\f[B]\f[R] +\f[V]V\f[R] {toggle marks on all tasks} - Toggle marks on all tasks in current filter report .TP -\f[B]\f[CB]x\f[B]\f[R] +\f[V]x\f[R] task delete {selected} - Delete .TP -\f[B]\f[CB]z\f[B]\f[R] +\f[V]z\f[R] toggle task info - Toggle task info view .TP -\f[B]\f[CB]A\f[B]\f[R] +\f[V]A\f[R] task {selected} annotate {string} - Annotate current task .TP Ctrl-e @@ -106,97 +120,97 @@ scroll down task details - Scroll task details view down one line Ctrl-y scroll up task details - Scroll task details view up one line .TP -\f[B]\f[CB]!\f[B]\f[R] +\f[V]!\f[R] {string} - Custom shell command .TP -\f[B]\f[CB]1-9\f[B]\f[R] +\f[V]1-9\f[R] {string} - Run user defined shortcuts .TP -\f[B]\f[CB]:\f[B]\f[R] +\f[V]:\f[R] {task id} - Jump to task id .TP -\f[B]\f[CB]c\f[B]\f[R] +\f[V]c\f[R] context switcher menu - Open context switcher menu .TP -\f[B]\f[CB]?\f[B]\f[R] +\f[V]?\f[R] help - Help menu .PP Keybindings for filter / command prompt: .TP -\f[B]\f[CB]Ctrl + f | Right\f[B]\f[R] +\f[V]Ctrl + f | Right\f[R] move forward - Move forward one character .TP -\f[B]\f[CB]Ctrl + b | Left\f[B]\f[R] +\f[V]Ctrl + b | Left\f[R] move backward - Move backward one character .TP -\f[B]\f[CB]Ctrl + h | Backspace\f[B]\f[R] +\f[V]Ctrl + h | Backspace\f[R] backspace - Delete one character back .TP -\f[B]\f[CB]Ctrl + d | Delete\f[B]\f[R] +\f[V]Ctrl + d | Delete\f[R] delete - Delete one character forward .TP -\f[B]\f[CB]Ctrl + a | Home\f[B]\f[R] +\f[V]Ctrl + a | Home\f[R] home - Go to the beginning of line .TP -\f[B]\f[CB]Ctrl + e | End\f[B]\f[R] +\f[V]Ctrl + e | End\f[R] end - Go to the end of line .TP -\f[B]\f[CB]Ctrl + k\f[B]\f[R] +\f[V]Ctrl + k\f[R] delete to end - Delete to the end of line .TP -\f[B]\f[CB]Ctrl + u\f[B]\f[R] +\f[V]Ctrl + u\f[R] delete to beginning - Delete to the beginning of line .TP -\f[B]\f[CB]Ctrl + w\f[B]\f[R] +\f[V]Ctrl + w\f[R] delete previous word - Delete previous word .TP -\f[B]\f[CB]Alt + d\f[B]\f[R] +\f[V]Alt + d\f[R] delete next word - Delete next word .TP -\f[B]\f[CB]Alt + b\f[B]\f[R] +\f[V]Alt + b\f[R] move to previous word - Move to previous word .TP -\f[B]\f[CB]Alt + f\f[B]\f[R] +\f[V]Alt + f\f[R] move to next word - Move to next word .TP -\f[B]\f[CB]Alt + t\f[B]\f[R] +\f[V]Alt + t\f[R] transpose words - Transpose words .TP -\f[B]\f[CB]Up\f[B]\f[R] +\f[V]Up\f[R] scroll history - Go backward in history matching from beginning of line to cursor .TP -\f[B]\f[CB]Down\f[B]\f[R] +\f[V]Down\f[R] scroll history - Go forward in history matching from beginning of line to cursor .TP -\f[B]\f[CB]TAB | Ctrl + n\f[B]\f[R] +\f[V]TAB | Ctrl + n\f[R] tab complete - Open tab completion and selection first element OR cycle to next element .TP -\f[B]\f[CB]BACKTAB | Ctrl + p\f[B]\f[R] +\f[V]BACKTAB | Ctrl + p\f[R] tab complete - Cycle to previous element .PP Keybindings for context switcher: .TP -\f[B]\f[CB]j\f[B]\f[R] +\f[V]j\f[R] {selected+=1} - Move forward a context .TP -\f[B]\f[CB]k\f[B]\f[R] +\f[V]k\f[R] {selected-=1} - Move back a context .PP Keybindings for calendar: .TP -\f[B]\f[CB]j\f[B]\f[R] +\f[V]j\f[R] {selected+=1} - Move forward a year in calendar .TP -\f[B]\f[CB]k\f[B]\f[R] +\f[V]k\f[R] {selected-=1} - Move back a year in calendar .TP -\f[B]\f[CB]J\f[B]\f[R] +\f[V]J\f[R] {selected+=10} - Move forward a decade in calendar .TP -\f[B]\f[CB]K\f[B]\f[R] +\f[V]K\f[R] {selected-=10} - Move back a decade in calendar .SH EXIT STATUSES .TP @@ -204,13 +218,13 @@ Keybindings for calendar: If everything goes OK. .SH AUTHOR .PP -\f[C]taskwarrior-tui\f[R] is maintained by Dheepak `kdheepak' +\f[V]taskwarrior-tui\f[R] is maintained by Dheepak `kdheepak' Krishnamurthy and other contributors. .PP \f[B]Source code:\f[R] -\f[C]https://github.com/kdheepak/taskwarrior-tui/\f[R] +\f[V]https://github.com/kdheepak/taskwarrior-tui/\f[R] .PD 0 .P .PD \f[B]Contributors:\f[R] -\f[C]https://github.com/kdheepak/taskwarrior-tui/graphs/contributors\f[R] +\f[V]https://github.com/kdheepak/taskwarrior-tui/graphs/contributors\f[R] diff --git a/src/config.rs b/src/config.rs index 7ebc1f3..a2a34f6 100644 --- a/src/config.rs +++ b/src/config.rs @@ -127,10 +127,8 @@ impl Config { let uda_style_calendar_title = Self::get_uda_style("calendar.title", data); let uda_style_calendar_today = Self::get_uda_style("calendar.today", data); let uda_style_context_active = Self::get_uda_style("context.active", data); - let uda_style_report_completion_pane = - Self::get_uda_style("report.completion-pane", data).map(|s| s.fg(Color::Black)); - let uda_style_report_completion_pane_highlight = - Self::get_uda_style("report.completion-pane-highlight", data).map(|s| s.fg(Color::Black)); + let uda_style_report_completion_pane = Self::get_uda_style("report.completion-pane", data); + let uda_style_report_completion_pane_highlight = Self::get_uda_style("report.completion-pane-highlight", data); let uda_shortcuts = Self::get_uda_shortcuts(data); let uda_background_process = Self::get_uda_background_process(data); let uda_background_process_period = Self::get_uda_background_process_period(data); @@ -141,8 +139,8 @@ impl Config { let uda_style_calendar_today = uda_style_calendar_today.unwrap_or_else(|| Style::default().add_modifier(Modifier::BOLD)); let uda_style_context_active = uda_style_context_active.unwrap_or_default(); - let uda_style_report_completion_pane = - uda_style_report_completion_pane.unwrap_or_else(|| Style::default().bg(Color::Rgb(223, 223, 223))); + let uda_style_report_completion_pane = uda_style_report_completion_pane + .unwrap_or_else(|| Style::default().fg(Color::Black).bg(Color::Rgb(223, 223, 223))); let uda_style_report_completion_pane_highlight = uda_style_report_completion_pane_highlight.unwrap_or(uda_style_report_completion_pane); let uda_quick_tag_name = Self::get_uda_quick_tag_name(data);