Skip to content

Commit

Permalink
More tool-tip upgrades for issue #114, next do the pattern editor.
Browse files Browse the repository at this point in the history
  • Loading branch information
ahlstromcj committed Aug 14, 2023
1 parent 08a16ce commit c2d3a3a
Show file tree
Hide file tree
Showing 14 changed files with 153 additions and 107 deletions.
7 changes: 5 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TO DO for Seq66 0.99.8
Chris Ahlstrom
2019-04-13 to 2023-08-13
2019-04-13 to 2023-08-14

UI:

Expand All @@ -11,7 +11,10 @@ UI:
Easy to forget to push that button.
- Look into connecting the save-playlist and save-mutes functions.
- Make sure L/R looping buttons (main and song) works.
- Clarify the two transpose button in the song editor.
- Clarify the two transpose buttons in the song editor.
- There is no "Loop Mode" (loop_mode) automation slot.
The slot is a mislabelled record_style automation slot!
- Add the #114 tool-tip upgrades to the pattern editor.

Some of these issues will be pushed off for the distant Seq66v2.

Expand Down
Binary file modified data/share/doc/control_keys.ods
Binary file not shown.
3 changes: 2 additions & 1 deletion doc/latex/tex/patterns_panel.tex
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,9 @@ \subsubsection{Pattern Keys and Clicks}
arrangement of soloing is memorized.
One can clear the queue mode by pressing the normal queue key.

There are more keys defined in the \textbf{Keyboard} dialog, and it is
There are more keys defined in the 'ctrl' file, and it is
worth figuring out what they do, if not documented here.
Also see the installed \texttt{control\_keys.ods} spreadsheet.
For a couple of short, but good, video tutorials about using arming,
queuing, and snapshots, see reference \cite{wootangent1}.

Expand Down
4 changes: 2 additions & 2 deletions libseq66/include/ctrl/automation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ enum class slot
reserved_48, /**< 48: Reserved for expansion. */

/*
* Proposed massive expansion in automation. Record mode selection.
* Massive expansion in automation. Record mode selection.
*/

record_overdub, /**< 49: Select overdub/merge recording triggering. */
Expand All @@ -248,7 +248,7 @@ enum class slot
record_oneshot, /**< 52: Select oneshot recording triggering. */

/*
* Proposed massive expansion in automation. Grid mode selection.
* Massive expansion in automation. Grid mode selection.
*/

grid_loop, /**< 53: Normal operation of the main grid. */
Expand Down
6 changes: 3 additions & 3 deletions libseq66/src/ctrl/opcontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* \library seq66 application
* \author Chris Ahlstrom
* \date 2018-12-04
* \updates 2023-03-18
* \updates 2023-08-14
* \license GNU GPLv2 or above
*
*/
Expand Down Expand Up @@ -186,7 +186,7 @@ opcontrol::automation_slot_name (slot s)
"BPM Page Up", // 14 bpm_page_up
"BPM Page Dn", // 15 bpm_page_dn
"Set Set", // 16 ss_set
"Loop Mode", // 17 loop_mode (increment/decrement)
"Record Style", // 17 record_style (increment/decrement)
"Quan Record", // 18 quan_record
"Reset Sets", // 19 reset_sets
"One-shot", // 20 mod_oneshot *
Expand All @@ -198,7 +198,7 @@ opcontrol::automation_slot_name (slot s)
"Tap BPM", // 26 tap_bpm *
"Start", // 27 start
"Stop", // 28 stop ?
"Reserved 29", // 29 reserved_29
"Loop L/R", // 29 loop_LR
"Toggle Mute", // 30 toggle_mutes *
"Song Pos", // 31 song_pointer

Expand Down
4 changes: 2 additions & 2 deletions libseq66/src/play/performer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* \library seq66 application
* \author Chris Ahlstrom and others
* \date 2018-11-12
* \updates 2023-08-13
* \updates 2023-08-14
* \license GNU GPLv2 or above
*
* Also read the comments in the Seq64 version of this module, perform.
Expand Down Expand Up @@ -9790,7 +9790,7 @@ performer::sm_auto_func_list [] =
* Terminator
*/

{ automation::slot::max, &performer::automation_no_op }
{ automation::slot::max, &performer::automation_no_op }
};

} // namespace seq66
Expand Down
58 changes: 27 additions & 31 deletions seq_qt5/forms/qperfeditframe64.ui
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<x>0</x>
<y>0</y>
<width>16</width>
<height>306</height>
<height>310</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -116,7 +116,7 @@
<x>0</x>
<y>0</y>
<width>689</width>
<height>308</height>
<height>312</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -207,7 +207,7 @@
</size>
</property>
<property name="toolTip">
<string>TIme-line and L and R markers.</string>
<string>Time-line and L and R markers.</string>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -316,7 +316,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Undo the previous operation(s).</string>
<string>Undo previous operation(s). [ Ctrl-Z ]</string>
</property>
<property name="statusTip">
<string/>
Expand Down Expand Up @@ -350,7 +350,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Redo the last operations(s).</string>
<string>Redo last operations(s). [ Shift-Ctrl-Z ]</string>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -378,8 +378,7 @@
</size>
</property>
<property name="toolTip">
<string>If active, the piano roll scrolls to
follow progress bar.</string>
<string>Set piano roll to follow progress bar.</string>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -414,7 +413,7 @@ follow progress bar.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Zoom out horizontally in the piano roll.
<string>Zoom out horizontally in piano roll.
[ z ] The 0 key resets zoom.</string>
</property>
<property name="statusTip">
Expand Down Expand Up @@ -443,7 +442,7 @@ follow progress bar.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Zoom in horizontally in the piano roll.
<string>Zoom in horizontally in piano roll.
[ Z ] The 0 key resets zoom.</string>
</property>
<property name="text">
Expand Down Expand Up @@ -497,10 +496,9 @@ to leave ]</string>
</size>
</property>
<property name="toolTip">
<string>Turns on &quot;song record&quot; snap. An added
trigger snaps to the full length of the
pattern or to the snap setting.
Growing occurs at snap length.</string>
<string>Set &quot;song record&quot; snap. An added
trigger snaps to the length of the pattern
or snap setting. Growth occurs at snap length.</string>
</property>
<property name="text">
<string>Snap</string>
Expand Down Expand Up @@ -528,9 +526,9 @@ Growing occurs at snap length.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Selects the movement and sizing snap
value. &quot;L&quot; = full length. &quot;1/N&quot; means 1/Nth
of a measure. Affects the L/R markers. Use
<string>Selects movement and sizing snap
value. &quot;L&quot; = full length. &quot;1/N&quot; is 1/Nth
of a measure. Affects L/R markers. Use
L only for short patterns.</string>
</property>
<property name="currentIndex">
Expand Down Expand Up @@ -589,7 +587,7 @@ Transposition is done during playback.</string>
<widget class="QPushButton" name="btnLoop">
<property name="minimumSize">
<size>
<width>28</width>
<width>36</width>
<height>28</height>
</size>
</property>
Expand All @@ -603,8 +601,7 @@ Transposition is done during playback.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Sets looping between the L and R
markers.</string>
<string>Set looping between L/R markers.</string>
</property>
<property name="text">
<string>Loop</string>
Expand Down Expand Up @@ -639,7 +636,7 @@ markers.</string>
<widget class="QPushButton" name="btnCollapse">
<property name="minimumSize">
<size>
<width>40</width>
<width>36</width>
<height>28</height>
</size>
</property>
Expand All @@ -653,7 +650,7 @@ markers.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Collapse pattern between L and R markers.</string>
<string>Collapse pattern between L/R markers.</string>
</property>
<property name="text">
<string/>
Expand All @@ -670,7 +667,7 @@ markers.</string>
<widget class="QPushButton" name="btnExpand">
<property name="minimumSize">
<size>
<width>40</width>
<width>36</width>
<height>28</height>
</size>
</property>
Expand All @@ -684,7 +681,7 @@ markers.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Expand space between L and R markers.</string>
<string>Expand space between L/R markers.</string>
</property>
<property name="text">
<string/>
Expand All @@ -701,7 +698,7 @@ markers.</string>
<widget class="QPushButton" name="btnExpandCopy">
<property name="minimumSize">
<size>
<width>40</width>
<width>36</width>
<height>28</height>
</size>
</property>
Expand All @@ -715,8 +712,7 @@ markers.</string>
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Expand and copy between the
L and R markers.</string>
<string>Expand and copy between L/R markers.</string>
</property>
<property name="text">
<string/>
Expand Down Expand Up @@ -744,8 +740,8 @@ L and R markers.</string>
</size>
</property>
<property name="toolTip">
<string>Expands the piano roll to the right
to allow more room for editing.</string>
<string>Expand piano roll to the right
for more editing room.</string>
</property>
<property name="text">
<string>--&gt;</string>
Expand Down Expand Up @@ -775,7 +771,7 @@ to allow more room for editing.</string>
</size>
</property>
<property name="toolTip">
<string>Resets the Trigger Transpose to 0.</string>
<string>Resets Trigger Transpose to 0.</string>
</property>
<property name="text">
<string>TT</string>
Expand All @@ -799,7 +795,7 @@ to allow more room for editing.</string>
<property name="toolTip">
<string>Transposition value for Trigger Transpose.
Range: -60 to +60 (5 octaves each way).
Apply it to a trigger block via Ctrl-right-click.
Apply it to a trigger via Shift-Right click.
To reset, set to 0 and apply it.</string>
</property>
</widget>
Expand All @@ -819,7 +815,7 @@ To reset, set to 0 and apply it.</string>
</size>
</property>
<property name="toolTip">
<string>Shows the duration of the song based
<string>Shows duration of the song based
on the longest track or Song layout.
Click to toggle between H:M:S and B:B:T
format.</string>
Expand Down
Loading

0 comments on commit c2d3a3a

Please sign in to comment.