diff --git a/README.md b/README.md index 35760d9..f1dec67 100644 --- a/README.md +++ b/README.md @@ -34,12 +34,12 @@ These keybindings are hardcoded for now. In the future it may be desirable to have them configurable. * Navigate through the screens using the F-keys: - * `F1`: Debug log - * `F2`: Queue - * `F3`: Search - * `F4`: Playlists + * `F1`: Queue + * `F2`: Search + * `F3`: Playlists * `d` deletes the currently selected track * `c` clears the entire playlist +* `F9`: Debug log * Tracks and playlists can be played using `Return` and queued using `Space` * `Shift-p` toggles playback of a track * `Shift-s` stops a track diff --git a/src/main.rs b/src/main.rs index 5312b66..226c9d0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -162,21 +162,15 @@ fn main() { let layout = ui::layout::Layout::new(status) .view("search", BoxView::with_full_height(search.view), "Search") + .view("log", logview_scroller, "Log") .view("playlists", playlists.view.take().unwrap(), "Playlists") - .view("queue", queueview.view.take().unwrap(), "Queue") - .view("log", logview_scroller, "Log"); + .view("queue", queueview.view.take().unwrap(), "Queue"); cursive.add_fullscreen_layer(layout.with_id("main")); - cursive.add_global_callback(Key::F1, move |s| { - s.call_on_id("main", |v: &mut ui::layout::Layout| { - v.set_view("log"); - }); - }); - { let ev = event_manager.clone(); - cursive.add_global_callback(Key::F2, move |s| { + cursive.add_global_callback(Key::F1, move |s| { s.call_on_id("main", |v: &mut ui::layout::Layout| { v.set_view("queue"); }); @@ -184,7 +178,7 @@ fn main() { }); } - cursive.add_global_callback(Key::F3, move |s| { + cursive.add_global_callback(Key::F2, move |s| { s.call_on_id("main", |v: &mut ui::layout::Layout| { v.set_view("search"); }); @@ -192,7 +186,7 @@ fn main() { { let ev = event_manager.clone(); - cursive.add_global_callback(Key::F4, move |s| { + cursive.add_global_callback(Key::F3, move |s| { s.call_on_id("main", |v: &mut ui::layout::Layout| { v.set_view("playlists"); }); @@ -200,6 +194,12 @@ fn main() { }); } + cursive.add_global_callback(Key::F9, move |s| { + s.call_on_id("main", |v: &mut ui::layout::Layout| { + v.set_view("log"); + }); + }); + // cursive event loop while cursive.is_running() { cursive.step();