From d3718f0b782fe2f786f24bfb5f43c1989768833e Mon Sep 17 00:00:00 2001 From: unspeaker Date: Thu, 7 Nov 2024 02:20:03 +0100 Subject: [PATCH] shorten command names --- crates/tek_sequencer/src/sequencer_cmd.rs | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/crates/tek_sequencer/src/sequencer_cmd.rs b/crates/tek_sequencer/src/sequencer_cmd.rs index 1f4f6987..ee0ebb47 100644 --- a/crates/tek_sequencer/src/sequencer_cmd.rs +++ b/crates/tek_sequencer/src/sequencer_cmd.rs @@ -14,7 +14,7 @@ enum SequencerCommand { } #[derive(Clone, PartialEq)] pub enum PhrasePoolCommand { - Previous, + Prev, Next, MoveUp, MoveDown, @@ -40,9 +40,9 @@ pub enum PhraseRenameCommand { pub enum PhraseLengthCommand { Begin, Next, - Previous, - Increment, - Decrement, + Prev, + Inc, + Dec, Set(usize), Confirm, Cancel, @@ -53,8 +53,8 @@ pub enum PhraseEditorCommand { ToggleDirection, EnterEditMode, ExitEditMode, - NoteLengthDecrement, - NoteLengthIncrement, + NoteLengthDec, + NoteLengthInc, TimeZoomIn, TimeZoomOut, NoteAppend, @@ -96,7 +96,7 @@ impl HandleKey for Sequencer { impl HandleKey for PhrasePool { fn match_input (&self, from: &TuiInput) -> Option { match from.event() { - key!(KeyCode::Up) => Some(PhrasePoolCommand::Previous), + key!(KeyCode::Up) => Some(PhrasePoolCommand::Prev), key!(KeyCode::Down) => Some(PhrasePoolCommand::Next), key!(KeyCode::Char(',')) => Some(PhrasePoolCommand::MoveUp), key!(KeyCode::Char('.')) => Some(PhrasePoolCommand::MoveDown), @@ -131,10 +131,10 @@ impl HandleKey for PhrasePool { impl HandleKey for PhrasePool { fn match_input (&self, from: &TuiInput) -> Option { match from.event() { - key!(KeyCode::Up) => Some(PhraseLengthCommand::Increment), - key!(KeyCode::Down) => Some(PhraseLengthCommand::Decrement), + key!(KeyCode::Up) => Some(PhraseLengthCommand::Inc), + key!(KeyCode::Down) => Some(PhraseLengthCommand::Dec), key!(KeyCode::Right) => Some(PhraseLengthCommand::Next), - key!(KeyCode::Left) => Some(PhraseLengthCommand::Previous), + key!(KeyCode::Left) => Some(PhraseLengthCommand::Prev), key!(KeyCode::Enter) => Some(PhraseLengthCommand::Confirm), key!(KeyCode::Esc) => Some(PhraseLengthCommand::Cancel), _ => None @@ -147,8 +147,8 @@ impl HandleKey for PhraseEditor { key!(KeyCode::Char('`')) => Some(PhraseEditorCommand::ToggleDirection), key!(KeyCode::Enter) => Some(PhraseEditorCommand::EnterEditMode), key!(KeyCode::Esc) => Some(PhraseEditorCommand::ExitEditMode), - key!(KeyCode::Char('[')) => Some(PhraseEditorCommand::NoteLengthDecrement), - key!(KeyCode::Char(']')) => Some(PhraseEditorCommand::NoteLengthIncrement), + key!(KeyCode::Char('[')) => Some(PhraseEditorCommand::NoteLengthDec), + key!(KeyCode::Char(']')) => Some(PhraseEditorCommand::NoteLengthInc), key!(KeyCode::Char('a')) => Some(PhraseEditorCommand::NoteAppend), key!(KeyCode::Char('s')) => Some(PhraseEditorCommand::NoteSet), key!(KeyCode::Char('-')) => Some(PhraseEditorCommand::TimeZoomOut), @@ -224,7 +224,7 @@ impl Command> for SequencerCommand { impl Command> for PhrasePoolCommand { fn run (&self, state: &mut PhrasePool) -> Perhaps { match self { - Self::Previous => { + Self::Prev => { state.select_prev() }, Self::Next => { @@ -319,13 +319,13 @@ impl Command> for PhraseLengthCommand { Self::Begin => { unreachable!(); }, - Self::Previous => { + Self::Prev => { focus.prev() }, Self::Next => { focus.next() }, - Self::Increment => match focus { + Self::Inc => match focus { PhraseLengthFocus::Bar => { *length += 4 * PPQ }, @@ -336,7 +336,7 @@ impl Command> for PhraseLengthCommand { *length += 1 }, }, - Self::Decrement => match focus { + Self::Dec => match focus { PhraseLengthFocus::Bar => { *length = length.saturating_sub(4 * PPQ) }, @@ -387,10 +387,10 @@ impl Command> for PhraseEditorCommand { Self::TimeZoomIn => { state.time_zoom_in() }, - Self::NoteLengthDecrement => { + Self::NoteLengthDec => { state.note_length_dec() }, - Self::NoteLengthIncrement => { + Self::NoteLengthInc => { state.note_length_inc() }, Self::NotePageUp => {