browser with target action

config/config_arranger.edn

@@ -2,14 +2,6 @@
 
 (info "A session grid.")
 
-(view 
-  (bsp/a                      :view-dialog
-    (bsp/s (fixed/y         1 :view-transport)
-      (bsp/n (fixed/y       1 :view-status)
-        (fill/xy (bsp/a
-          (fill/xy (align/e   :view-pool))
-                              :view-arranger))))))
-
 (keys
   (layer-if :focus-message     "./keys_message.edn")
   (layer-if :focus-device-add  "./keys_device_add.edn")
@@ -24,3 +16,11 @@
   (layer                       "./keys_clock.edn")
   (layer                       "./keys_arranger.edn")
   (layer                       "./keys_global.edn"))
+
+(view
+  (bsp/a                      :view-dialog
+    (bsp/s (fixed/y         1 :view-transport)
+      (bsp/n (fixed/y       1 :view-status)
+        (fill/xy (bsp/a
+          (fill/xy (align/e   :view-pool))
+                              :view-arranger))))))

config/config_groovebox.edn

@@ -11,10 +11,8 @@
   (layer                       "./keys_sampler.edn")
   (layer                       "./keys_global.edn"))
 
-(view (bsp/a :view-dialog
+(view (bsp/a :view-dialog (bsp/w :view-meters-output (bsp/e :view-meters-input
-  (bsp/w :view-meters-output (bsp/e :view-meters-input
+  (bsp/n (fixed/y 6 (bsp/e :view-sample-status :view-sample-viewer))
-    (bsp/n (fixed/y 6 (bsp/e :view-sample-status :view-sample-viewer))
+    (bsp/e
-      (bsp/e
+      (fill/y (align/n (bsp/s :view-status-v (bsp/s :view-ports-status (bsp/s :view-editor-status :view-pool)))))
-        (fill/y (align/n (bsp/s :view-status-v (bsp/s :view-ports-status
+      (bsp/e :view-samples-keys :view-editor)))))))
-          (bsp/s :view-editor-status :view-pool)))))
-        (bsp/e :view-samples-keys :view-editor)))))))

config/config_sampler.edn

@@ -2,12 +2,12 @@
 
 (info "A sampling soundboard.")
 
+(keys
+  (layer "./keys_sampler.edn")
+  (layer "./keys_global.edn"))
+
 (view
   (bsp/a                :view-dialog
     (bsp/s (fixed/y   1 :view-transport)
       (bsp/n (fixed/y 1 :view-status)
         (fill/xy        :view-samples-grid)))))
-
-(keys
-  (layer "./keys_sampler.edn")
-  (layer "./keys_global.edn"))

config/config_sequencer.edn

@@ -2,14 +2,6 @@
 
 (info "A MIDI sequencer.")
 
-(view
-  (bsp/a                      :view-dialog
-    (bsp/s (fixed/y         1 :view-transport)
-      (bsp/n (fixed/y       1 :view-status)
-        (fill/xy (bsp/a
-          (fill/xy (align/e   :view-pool))
-                              :view-editor)))))
-
 (keys
   (layer-if :focus-browser    "./keys_browser.edn")
   (layer-if :mode-pool-rename "./keys_rename.edn")
@@ -17,3 +9,11 @@
   (layer                      "./keys_editor.edn")
   (layer                      "./keys_clock.edn")
   (layer                      "./keys_global.edn"))
+
+(view
+  (bsp/a                      :view-dialog
+    (bsp/s (fixed/y         1 :view-transport)
+      (bsp/n (fixed/y       1 :view-status)
+        (fill/xy (bsp/a
+          (fill/xy (align/e   :view-pool))
+                              :view-editor)))))

config/config_transport.edn

@@ -2,8 +2,8 @@
 
 (info "A JACK transport controller.")
 
-(view :view-transport)
-
 (keys
   (layer "./keys_clock.edn")
   (layer "./keys_global.edn"))
+
+(view :view-transport)

config/keys_global.edn

@@ -1,9 +1,9 @@
-(@esc dialog :dialog-none)
+(@esc      dialog :dialog-none)
-(@f1  dialog :dialog-help)
+(@f1       dialog :dialog-help)
-(@f6  dialog :dialog-save)
+(@f6       dialog :dialog-save)
-(@f8  dialog :dialog-options)
+(@f8       dialog :dialog-options)
-(@f9  dialog :dialog-load)
+(@f9       dialog :dialog-load)
-(@f10 dialog :dialog-quit)
+(@f10      dialog :dialog-quit)
 
 (@u undo 1)
 (@r redo 1)

config/keys_sampler.edn

@@ -2,7 +2,11 @@
 (@down    sampler select :sample-below)
 (@left    sampler select :sample-to-left)
 (@right   sampler select :sample-to-right)
+
 (@r       sampler record-toggle :sample-selected)
 (@shift-R sampler record-cancel)
 (@p       sampler play-sample :sample-selected)
 (@P       sampler stop-sample :sample-selected)
+
+(@shift-f6 dialog :dialog-import-sample)
+(@shift-f9 dialog :dialog-export-sample)

crates/app/src/model.rs

@@ -67,7 +67,7 @@ impl App {
     }
     pub fn browser (&self) -> Option<&Browser> {
         self.dialog.as_ref().and_then(|dialog|match dialog {
-            Dialog::Save(b) | Dialog::Load(b) => Some(b),
+            Dialog::Browser(_, b) => Some(b),
             _ => None
         })
     }
@@ -156,11 +156,20 @@ pub enum Dialog {
     Menu(usize),
     Device(usize),
     Message(Message),
-    Save(Browser),
+    Browser(BrowserTarget, Browser),
-    Load(Browser),
     Options,
 }
 
+#[derive(Clone, Debug)]
+pub enum BrowserTarget {
+    SaveProject,
+    LoadProject,
+    ImportSample(Arc<RwLock<Option<Sample>>>),
+    ExportSample(Arc<RwLock<Option<Sample>>>),
+    ImportClip(Arc<RwLock<Option<MidiClip>>>),
+    ExportClip(Arc<RwLock<Option<MidiClip>>>),
+}
+
 /// Various possible messages
 #[derive(PartialEq, Clone, Copy, Debug)]
 pub enum Message {
@@ -235,10 +244,22 @@ impl App {
         Some(Dialog::Menu(0))
     }
     fn dialog_save (&self) -> Option<Dialog> {
-        Some(Dialog::Save(Default::default()))
+        Some(Dialog::Browser(BrowserTarget::SaveProject, Default::default()))
     }
     fn dialog_load (&self) -> Option<Dialog> {
-        Some(Dialog::Load(Default::default()))
+        Some(Dialog::Browser(BrowserTarget::LoadProject, Default::default()))
+    }
+    fn dialog_import_clip (&self) -> Option<Dialog> {
+        Some(Dialog::Browser(BrowserTarget::ImportClip(Default::default()), Default::default()))
+    }
+    fn dialog_export_clip (&self) -> Option<Dialog> {
+        Some(Dialog::Browser(BrowserTarget::ExportClip(Default::default()), Default::default()))
+    }
+    fn dialog_import_sample (&self) -> Option<Dialog> {
+        Some(Dialog::Browser(BrowserTarget::ImportSample(Default::default()), Default::default()))
+    }
+    fn dialog_export_sample (&self) -> Option<Dialog> {
+        Some(Dialog::Browser(BrowserTarget::ExportSample(Default::default()), Default::default()))
     }
     fn dialog_options (&self) -> Option<Dialog> {
         Some(Dialog::Options)

crates/app/src/view.rs

@@ -64,18 +64,19 @@ impl App {
     }
     pub fn view_ports_status (&self) -> impl Content<TuiOut> + use<'_> {
         self.project.get_track().map(|track|Bsp::s(
-            Fixed::y(4.max(track.sequencer.midi_ins.len() as u16), Align::n(Map::south(1,
+            Fixed::y(2.max(track.sequencer.midi_ins.len() as u16), Align::n(Map::south(1,
                 ||track.sequencer.midi_ins.iter(),
                 |port, index|Fixed::x(20, FieldV(
                     self.color,
-                    format!("IN  {index}: "),
+                    format!("MIDI in {index}: "),
                     format!("{}", port.name())))))),
-            Fixed::y(4.max(track.sequencer.midi_outs.len() as u16), Align::n(Map::south(1,
+            Fixed::y(2.max(track.sequencer.midi_outs.len() as u16), Align::n(Map::south(1,
                 ||track.sequencer.midi_outs.iter(),
                 |port, index|Fixed::x(20, FieldV(
                     self.color,
-                    format!("OUT {index}: "),
+                    format!("MIDI out {index}:"),
-                    format!("{}", port.name()))))))))
+                    format!("{}", port.name()))))))
+        ))
     }
     pub fn view_arranger (&self) -> impl Content<TuiOut> + use<'_> {
         ArrangerView::new(&self.project, self.editor.as_ref())
@@ -116,10 +117,8 @@ impl App {
                             self.view_dialog_menu().boxed(),
                         Dialog::Help(offset) =>
                             self.view_dialog_help(*offset).boxed(),
-                        Dialog::Save(browser) =>
+                        Dialog::Browser(target, browser) =>
-                            self.view_dialog_save(browser).boxed(),
+                            self.view_dialog_browser(target, browser).boxed(),
-                        Dialog::Load(browser) =>
-                            self.view_dialog_load(browser).boxed(),
                         Dialog::Options =>
                             self.view_dialog_options().boxed(),
                         Dialog::Device(index) =>
@@ -162,11 +161,19 @@ impl App {
     pub fn view_dialog_message <'a> (&'a self, message: &'a Message) -> impl Content<TuiOut> + use<'a> {
         Bsp::s(message, Bsp::s("", "[ OK ]"))
     }
-    pub fn view_dialog_save <'a> (&'a self, browser: &'a Browser) -> impl Content<TuiOut> + use<'a> {
+    pub fn view_dialog_browser <'a> (&'a self, target: &BrowserTarget, browser: &'a Browser) -> impl Content<TuiOut> + use<'a> {
         Bsp::s(
-            Fill::x(Align::w(Margin::xy(1, 1, Bsp::e(
+            Padding::xy(3, 1, Fill::x(Align::w(FieldV(
-                Tui::bold(true, " Save project: "),
+                self.color,
-                Shrink::x(3, Fixed::y(1, RepeatH("🭻"))))))),
+                match target {
+                    BrowserTarget::SaveProject     => "Save project:",
+                    BrowserTarget::LoadProject     => "Load project:",
+                    BrowserTarget::ImportSample(_) => "Import sample:",
+                    BrowserTarget::ExportSample(_) => "Export sample:",
+                    BrowserTarget::ImportClip(_)   => "Import clip:",
+                    BrowserTarget::ExportClip(_)   => "Export clip:",
+                },
+                Shrink::x(3, Fixed::y(1, Tui::fg(Tui::g(96), RepeatH("🭻")))))))),
             Outer(true, Style::default().fg(Tui::g(96)))
                 .enclose(Fill::xy(browser)))
     }
@@ -178,6 +185,22 @@ impl App {
             Outer(true, Style::default().fg(Tui::g(96)))
                 .enclose(Fill::xy(browser)))
     }
+    pub fn view_dialog_export <'a> (&'a self, browser: &'a Browser) -> impl Content<TuiOut> + use<'a> {
+        Bsp::s(
+            Fill::x(Align::w(Margin::xy(1, 1, Bsp::e(
+                Tui::bold(true, " Export: "),
+                Shrink::x(3, Fixed::y(1, RepeatH("🭻"))))))),
+            Outer(true, Style::default().fg(Tui::g(96)))
+                .enclose(Fill::xy(browser)))
+    }
+    pub fn view_dialog_import <'a> (&'a self, browser: &'a Browser) -> impl Content<TuiOut> + use<'a> {
+        Bsp::s(
+            Fill::x(Align::w(Margin::xy(1, 1, Bsp::e(
+                Tui::bold(true, " Import: "),
+                Shrink::x(3, Fixed::y(1, RepeatH("🭻"))))))),
+            Outer(true, Style::default().fg(Tui::g(96)))
+                .enclose(Fill::xy(browser)))
+    }
     pub fn view_dialog_options <'a> (&'a self) -> impl Content<TuiOut> + use<'a> {
         "TODO"
     }

crates/device/src/sampler/sampler_view.rs

@@ -246,9 +246,9 @@ fn draw_info_v (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> +
             Fill::x(Align::w(FieldH(theme, "Gain  ", format!("{}",     sample.gain)))),
         ))
     }), Thunk::new(move||Tui::fg(Red, col!(
-        "× No sample.",
+        Tui::bold(true, "× No sample."),
-        "Press record",
+        "[r] record",
-        "or import.",
+        "[Shift-F9] import",
     ))))
 }