Merge pull request #125 from kdheepak/key-binding

This commit is contained in:
Dheepak Krishnamurthy 2021-02-28 23:21:12 -07:00 committed by GitHub
commit 29643874e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 23 deletions

View file

@ -197,6 +197,9 @@ uda.taskwarrior-tui.task-report.show-info=true
uda.taskwarrior-tui.task-report.looping=true uda.taskwarrior-tui.task-report.looping=true
uda.taskwarrior-tui.style.context.active=black on rgb444 uda.taskwarrior-tui.style.context.active=black on rgb444
uda.taskwarrior-tui.style.calendar.title=black on rgb444 uda.taskwarrior-tui.style.calendar.title=black on rgb444
uda.taskwarrior-tui.keyconfig.quit=Q
uda.taskwarrior-tui.keyconfig.done=x
uda.taskwarrior-tui.keyconfig.delete=d
``` ```
</details> </details>

View file

@ -66,54 +66,68 @@ impl Default for KeyConfig {
impl KeyConfig { impl KeyConfig {
pub fn update(&mut self) -> Result<(), Box<dyn Error>> { pub fn update(&mut self) -> Result<(), Box<dyn Error>> {
self.quit = self.get_config("taskwarrior-tui.keyconfig.quit").unwrap_or(self.quit); self.quit = self
.get_config("uda.taskwarrior-tui.keyconfig.quit")
.unwrap_or(self.quit);
self.refresh = self self.refresh = self
.get_config("taskwarrior-tui.keyconfig.refresh") .get_config("uda.taskwarrior-tui.keyconfig.refresh")
.unwrap_or(self.refresh); .unwrap_or(self.refresh);
self.go_to_bottom = self self.go_to_bottom = self
.get_config("taskwarrior-tui.keyconfig.go-to-bottom") .get_config("uda.taskwarrior-tui.keyconfig.go-to-bottom")
.unwrap_or(self.go_to_bottom); .unwrap_or(self.go_to_bottom);
self.go_to_top = self self.go_to_top = self
.get_config("taskwarrior-tui.keyconfig.go-to-top") .get_config("uda.taskwarrior-tui.keyconfig.go-to-top")
.unwrap_or(self.go_to_top); .unwrap_or(self.go_to_top);
self.down = self.get_config("taskwarrior-tui.keyconfig.down").unwrap_or(self.down); self.down = self
self.up = self.get_config("taskwarrior-tui.keyconfig.up").unwrap_or(self.up); .get_config("uda.taskwarrior-tui.keyconfig.down")
.unwrap_or(self.down);
self.up = self.get_config("uda.taskwarrior-tui.keyconfig.up").unwrap_or(self.up);
self.page_down = self self.page_down = self
.get_config("taskwarrior-tui.keyconfig.page-down") .get_config("uda.taskwarrior-tui.keyconfig.page-down")
.unwrap_or(self.page_down); .unwrap_or(self.page_down);
self.page_up = self self.page_up = self
.get_config("taskwarrior-tui.keyconfig.page-up") .get_config("uda.taskwarrior-tui.keyconfig.page-up")
.unwrap_or(self.page_up); .unwrap_or(self.page_up);
self.delete = self self.delete = self
.get_config("taskwarrior-tui.keyconfig.delete") .get_config("uda.taskwarrior-tui.keyconfig.delete")
.unwrap_or(self.delete); .unwrap_or(self.delete);
self.done = self.get_config("taskwarrior-tui.keyconfig.done").unwrap_or(self.done); self.done = self
.get_config("uda.taskwarrior-tui.keyconfig.done")
.unwrap_or(self.done);
self.start_stop = self self.start_stop = self
.get_config("taskwarrior-tui.keyconfig.start-stop") .get_config("uda.taskwarrior-tui.keyconfig.start-stop")
.unwrap_or(self.start_stop); .unwrap_or(self.start_stop);
self.undo = self.get_config("taskwarrior-tui.keyconfig.undo").unwrap_or(self.undo); self.undo = self
self.edit = self.get_config("taskwarrior-tui.keyconfig.edit").unwrap_or(self.edit); .get_config("uda.taskwarrior-tui.keyconfig.undo")
.unwrap_or(self.undo);
self.edit = self
.get_config("uda.taskwarrior-tui.keyconfig.edit")
.unwrap_or(self.edit);
self.modify = self self.modify = self
.get_config("taskwarrior-tui.keyconfig.modify") .get_config("uda.taskwarrior-tui.keyconfig.modify")
.unwrap_or(self.modify); .unwrap_or(self.modify);
self.shell = self.get_config("taskwarrior-tui.keyconfig.shell").unwrap_or(self.shell); self.shell = self
self.log = self.get_config("taskwarrior-tui.keyconfig.log").unwrap_or(self.log); .get_config("uda.taskwarrior-tui.keyconfig.shell")
self.add = self.get_config("taskwarrior-tui.keyconfig.add").unwrap_or(self.add); .unwrap_or(self.shell);
self.log = self.get_config("uda.taskwarrior-tui.keyconfig.log").unwrap_or(self.log);
self.add = self.get_config("uda.taskwarrior-tui.keyconfig.add").unwrap_or(self.add);
self.annotate = self self.annotate = self
.get_config("taskwarrior-tui.keyconfig.annotate") .get_config("uda.taskwarrior-tui.keyconfig.annotate")
.unwrap_or(self.annotate); .unwrap_or(self.annotate);
self.filter = self self.filter = self
.get_config("taskwarrior-tui.keyconfig.filter") .get_config("uda.taskwarrior-tui.keyconfig.filter")
.unwrap_or(self.filter); .unwrap_or(self.filter);
self.zoom = self.get_config("taskwarrior-tui.keyconfig.zoom").unwrap_or(self.zoom); self.zoom = self
.get_config("uda.taskwarrior-tui.keyconfig.zoom")
.unwrap_or(self.zoom);
self.context_menu = self self.context_menu = self
.get_config("taskwarrior-tui.keyconfig.context-menu") .get_config("uda.taskwarrior-tui.keyconfig.context-menu")
.unwrap_or(self.context_menu); .unwrap_or(self.context_menu);
self.next_tab = self self.next_tab = self
.get_config("taskwarrior-tui.keyconfig.next-tab") .get_config("uda.taskwarrior-tui.keyconfig.next-tab")
.unwrap_or(self.next_tab); .unwrap_or(self.next_tab);
self.previous_tab = self self.previous_tab = self
.get_config("taskwarrior-tui.keyconfig.previous-tab") .get_config("uda.taskwarrior-tui.keyconfig.previous-tab")
.unwrap_or(self.previous_tab); .unwrap_or(self.previous_tab);
self.check() self.check()
} }