aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoronielfa <[email protected]>2020-07-30 23:01:03 +0100
committeronielfa <[email protected]>2020-07-30 23:01:03 +0100
commite794c6ecf133df248471b465a7553d454b527399 (patch)
tree0fb5b4cbce0ccb979e438ee8e2b7e2496da9963a /src
parent7e44bbff6d7f572f5f92b3a6b0f1d5e523379ba4 (diff)
parent2dafbfe51b2b4ebafc21fe68a9b909ebe3a4e23b (diff)
Merge remote-tracking branch 'origin/master' into feature/larger-names
Diffstat (limited to 'src')
-rw-r--r--src/app/impl_self.rs3
-rw-r--r--src/main.rs14
2 files changed, 4 insertions, 13 deletions
diff --git a/src/app/impl_self.rs b/src/app/impl_self.rs
index a806dc5..39882be 100644
--- a/src/app/impl_self.rs
+++ b/src/app/impl_self.rs
@@ -251,7 +251,8 @@ impl App {
251 "mnext" | "month-next" => "month-next (alias: mnext)", 251 "mnext" | "month-next" => "month-next (alias: mnext)",
252 "tup" | "track-up" => "track-up <auto-habit-name> (alias: tup)", 252 "tup" | "track-up" => "track-up <auto-habit-name> (alias: tup)",
253 "tdown" | "track-down" => "track-down <auto-habit-name> (alias: tdown)", 253 "tdown" | "track-down" => "track-down <auto-habit-name> (alias: tdown)",
254 "q" | "quit" => "quit", 254 "q" | "quit" => "quit dijo",
255 "w" | "write" => "write current state to disk (alias: w)",
255 "h"|"?" | "help" => "help [<command>|commands|keys] (aliases: h, ?)", 256 "h"|"?" | "help" => "help [<command>|commands|keys] (aliases: h, ?)",
256 "cmds" | "commands" => "add, add-auto, delete, month-{prev,next}, track-{up,down}, help, quit", 257 "cmds" | "commands" => "add, add-auto, delete, month-{prev,next}, track-{up,down}, help, quit",
257 "keys" => "TODO", // TODO (view?) 258 "keys" => "TODO", // TODO (view?)
diff --git a/src/main.rs b/src/main.rs
index 609738e..84fd8ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,13 +12,7 @@ use crate::command::{open_command_window, Command};
12use crate::utils::{load_configuration_file, AppConfig}; 12use crate::utils::{load_configuration_file, AppConfig};
13 13
14use clap::{App as ClapApp, Arg}; 14use clap::{App as ClapApp, Arg};
15 15use cursive::pancurses;
16#[cfg(any(target_os = "linux", target_os = "macos"))]
17use cursive::termion;
18
19#[cfg(target_os = "windows")]
20use cursive::crossterm;
21
22use cursive::views::{LinearLayout, NamedView}; 16use cursive::views::{LinearLayout, NamedView};
23use lazy_static::lazy_static; 17use lazy_static::lazy_static;
24 18
@@ -68,11 +62,7 @@ fn main() {
68 println!("{}", h); 62 println!("{}", h);
69 } 63 }
70 } else { 64 } else {
71 #[cfg(target_os = "windows")] 65 let mut s = pancurses().unwrap();
72 let mut s = crossterm().unwrap();
73
74 #[cfg(any(target_os = "linux", target_os = "macos"))]
75 let mut s = termion().unwrap();
76 66
77 let app = App::load_state(); 67 let app = App::load_state();
78 let layout = NamedView::new( 68 let layout = NamedView::new(