kdheepak/taskwarrior-tui
1
0
Fork 0
mirror of https://github.com/kdheepak/taskwarrior-tui.git synced 2025-08-24 14:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to disable delete on prompt

Browse source
This commit is contained in:
Dheepak Krishnamurthy 2021-07-27 11:58:32 -06:00
parent 22cccd99a6
commit 102ca0ffa0
2 changed files with 54 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/app.rs
View file

@ -570,13 +570,26 @@ impl TaskwarriorTuiApp {
self.draw_context_menu(f, 80, 50);
}
AppMode::TaskDeletePrompt => {
f.set_cursor(rects[1].x + self.delete.pos() as u16 + 1, rects[1].y + 1);
f.render_widget(Clear, rects[1]);
let label = if task_ids.len() > 1 {
format!("Delete Tasks `{}`?", task_ids.join(","))
} else {
format!("Delete Task `{}`?", task_ids.join(","))
};
let x = match self.keyconfig.delete {
Key::Char(c) => c.to_string(),
_ => "Enter".to_string(),
};
let q = match self.keyconfig.quit {
Key::Char(c) => c.to_string(),
_ => "Esc".to_string(),
};
self.draw_command(
f,
rects[1],
self.delete.as_str(),
Span::styled("Delete Task?", Style::default().add_modifier(Modifier::BOLD)),
&format!("Press <{}> to confirm or <{}> to abort.", x, q),
label,
0,
false,
);
}
_ => {
@ -2111,17 +2124,18 @@ impl TaskwarriorTuiApp {
}
}
} else if input == self.keyconfig.delete {
self.mode = AppMode::TaskDeletePrompt;
match self.task_current() {
Some(t) => {
let s = format!(
"Delete task {} - '{}' ? Hit `x` again or `Enter` to confirm. Hit `Esc` to cancel.",
t.id().unwrap_or_default(),
t.description()
);
self.delete.update(&s, s.len())
},
None => self.mode = AppMode::TaskReport,
if self.config.uda_prompt_on_delete {
self.mode = AppMode::TaskDeletePrompt;
if self.task_current().is_none() {
self.mode = AppMode::TaskReport;
}
} else {
match self.task_delete() {
Ok(_) => self.update(true)?,
Err(e) => {
self.mode = AppMode::TaskError;
self.error = e;
}
}
}
} else if input == self.keyconfig.start_stop {
@ -2757,23 +2771,25 @@ impl TaskwarriorTuiApp {
self.dirty = true;
}
},
AppMode::TaskDeletePrompt => match input {
Key::Char('x') | Key::Char('\n') => match self.task_delete() {
Ok(_) => {
self.mode = AppMode::TaskReport;
self.update()?;
AppMode::TaskDeletePrompt => {
if input == self.keyconfig.delete || input == Key::Char('\n') {
match self.task_delete() {
Ok(_) => {
self.mode = AppMode::TaskReport;
self.update(true)?;
}
Err(e) => {
self.mode = AppMode::TaskError;
self.error = e;
}
}
Err(e) => {
self.mode = AppMode::TaskError;
self.error = e;
}
},
Key::Esc => {
} else if input == self.keyconfig.quit || input == Key::Esc {
self.delete.update("", 0);
self.mode = AppMode::TaskReport;
} else {
handle_movement(&mut self.command, input);
}
_ => handle_movement(&mut self.command, input),
},
}
AppMode::TaskError => self.mode = AppMode::TaskReport,
AppMode::Calendar => {
if input == self.keyconfig.quit || input == Key::Ctrl('c') {

10
src/config.rs
View file

@ -65,6 +65,7 @@ pub struct Config {
pub uda_shortcuts: Vec<String>,
pub uda_background_process: String,
pub uda_background_process_period: usize,
pub uda_prompt_on_delete: bool,
}
impl Config {
@ -109,6 +110,7 @@ impl Config {
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_prompt_on_delete = Self::get_uda_prompt_on_delete(data);
Ok(Self {
enabled,
@ -141,6 +143,7 @@ impl Config {
uda_shortcuts,
uda_background_process,
uda_background_process_period,
uda_prompt_on_delete,
})
}
@ -516,6 +519,13 @@ impl Config {
.unwrap_or(false)
}
fn get_uda_prompt_on_delete(data: &str) -> bool {
Self::get_config("uda.taskwarrior-tui.report.prompt-on-delete", data)
.unwrap_or_default()
.get_bool()
.unwrap_or(false)
}
fn get_uda_months_per_row(data: &str) -> usize {
Self::get_config("uda.taskwarrior-tui.calendar.months-per-row", data)
.unwrap_or_default()