1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-25 14:11:28 +01:00
Commit Graph

3507 Commits

Author SHA1 Message Date
Paul Licameli
d1d0ea022f Merge branch 'master' into scrubbing2 2016-04-27 20:37:39 -04:00
Paul Licameli
1509ff0621 Conditional compilation flag can disabled the checkmarks in scrub sub menu 2016-04-27 20:36:32 -04:00
Paul Licameli
cc9b880852 Conditional compilation flag can disabled the checkmarks in scrub sub menu 2016-04-27 20:35:32 -04:00
Paul Licameli
adf4649f03 Enable scrubbing only when the scrub bar shows 2016-04-27 19:06:55 -04:00
Paul Licameli
5a5775c1c1 Implement showing and hiding of a srub bar portion of the ruler...
... activated by clicking near the left end of the ruler, then using the
context menu.

This is not finished work, but a proof of concept for a possible new scrubbing
UI.
2016-04-27 18:39:47 -04:00
Paul Licameli
68eda0f802 Cursor line in the ruler should always follow that in TrackPanel, as after "j" 2016-04-27 17:48:55 -04:00
Paul Licameli
5086260a60 fix build 2016-04-27 17:45:53 -04:00
Paul Licameli
926dfb7253 Draw the play or record head in the ruler in their former sizes. 2016-04-27 12:41:49 -04:00
Paul Licameli
85e7bf670d Change transport toolbar image for scrubbing. Darker outline. 2016-04-27 11:50:43 -04:00
Paul Licameli
5474ff752d Fix compilation of EXPERIMENTAL_THEMING 2016-04-27 10:49:19 -04:00
Paul Licameli
6a1d387093 Fix assertions and crashes in context menu for scrubber 2016-04-26 15:37:55 -04:00
Paul Licameli
9ab0e42f29 Control scrub with motion, click, drag, wheel almost anywhere in main window...
... if the event is not handled and skipped by sub-windows first, such as for
toolbar button clicks.

(But track panel clicks are skipped even after doing something, so they may
also cause seeking besides other responses.  So click can seek AND set cursor.)

This is meant to make drag to seek and wheel for change of speed easier,
without needing to keep the mouse in the narrow time ruler.

Also lets you click in the ruler, then move in any direction, and not miss the
motion event that should start the scrub playback.

The event handling is a bit of a hack, using propagation.  It does not use
capture.
2016-04-26 12:12:06 -04:00
Paul Licameli
3d222bcd87 Context menu for scrubbing in the ruler 2016-04-26 12:12:06 -04:00
Paul Licameli
c12993a53b Simplify with more uses of HideQuickPlayIndicator() 2016-04-26 12:12:06 -04:00
Paul Licameli
cd57e0a26c Scrubbing phase 2. Scrub starts with click on the indicator in the ruler...
... and works in any of the six tools.

Click and drag in select tool during scrub works just as when not scrubbing.

Seeks now only if you left-click or drag in the ruler, but this may change.

Mouse motion anywhere on the screen controls scrub as before.

No mouse clicks in TrackPanel are used by scrubbing.

The Ctrl-Click in TrackPanel is now unused.  Should 2.1.0 behavior be restored?
That was click to quick play, redundant with click in the (lower part of) the
ruler.
2016-04-26 12:12:06 -04:00
Paul Licameli
b0d2f38786 ESC leaves scrubbing even when clicked only; disable scrub menu items when...
... another project is playing
2016-04-26 09:02:38 -04:00
Paul Licameli
6d2528ae10 Update the status bar message as left button switches in an out of seeking. 2016-04-25 16:04:24 -04:00
Paul Licameli
a57ef7a560 When changing the scrub mode via menu command or shortcut, update status bar 2016-04-25 15:43:26 -04:00
Gale Andrews
aab32215ca Best not to use "g" for access keys
because the tail of the "g" obscures the underline
2016-04-25 17:24:37 +01:00
Paul Licameli
ea0274b5fa Change drawing of quick play indicator. It can be green for scrubbing...
... But this isn't used yet.  Also make the scrub head bigger.
2016-04-25 12:19:47 -04:00
Paul Licameli
0071db6f53 Hide quick play indicator when other playback starts...
... but it can reappear when mouse moves.  You may still select a quick play
region during play, to jump playback.
2016-04-25 12:00:58 -04:00
Paul Licameli
d34715d6ad Various other drags could crash Mac debug build if you option-W. Fixed too...
... And I think this fix is now exhaustive.
2016-04-25 01:49:54 -04:00
Paul Licameli
ece29b3ff3 Likewise, don't crash on command-W while dragging in the timeline ruler. 2016-04-25 01:38:07 -04:00
Paul Licameli
cb245d2f79 Drag a slider like input gain, and hit command-W. Don't crash (debug build)! 2016-04-25 01:33:49 -04:00
Paul Licameli
1bdd1a07ab Similarly for Equalization: avoid assertion in debug build, if you ESC...
... while dragging a point in "Draw Curves".
2016-04-25 01:04:38 -04:00
Paul Licameli
08eb840f32 You could get an assertion, on Mac debug build at least, ...
if you hit ESC during drag in the Autoduck dialog.  This fixes that.
2016-04-24 23:56:15 -04:00
Paul Licameli
e988646bdb Supply missing #include 2016-04-24 21:36:00 -04:00
Paul Licameli
853dff4106 Oops, fix crash in the previous. 2016-04-24 19:08:40 -04:00
Paul Licameli
6147705199 Vary status string (leftmost in the status bar) for the four kinds of scrub. 2016-04-24 16:13:07 -04:00
Paul Licameli
1fe0bbf7dc Uncheck scrubbing menu items whenever scrub stops (ESC key, Stop button, other) 2016-04-24 11:59:01 -04:00
Paul Licameli
3dc7524014 Bug1318 fixed again so that generators and effects on Windows still work 2016-04-24 10:33:37 -04:00
Paul Licameli
f2c6fbfc1b Bug1318 fixed again so that generators and effects on Windows still work 2016-04-24 10:32:20 -04:00
Paul Licameli
bc80ffe766 Windows build fixes 2016-04-24 01:12:42 -04:00
Paul Licameli
42bdc274dd Resizing of meter toolbars (docked or undocked) responds to ESC key 2016-04-24 01:01:44 -04:00
Paul Licameli
fad249a603 ESC key can abort the rearranging of toolbars. 2016-04-23 22:10:02 -04:00
Paul Licameli
4fba13bd2a Improved behavior of scrubbing menu items: Checkmarks, and toggling behavior. 2016-04-23 15:07:45 -04:00
Paul Licameli
0c6a358666 Bug1236: Fix drag and drop of imported files onto main window, for Mac...
... As noted in Bugzilla, it was not broken for dragging onto the toolbar icon.

I believe the bug was introduced at bdcefb4850
2016-04-23 09:41:01 -04:00
Paul Licameli
879ecefdaa Bug1318: ESC key or red close button should not leave the app unresponsive...
... I don't fully understand why this fixes it, but I could figure out what
was different between ESC and Cancel button which did not have the problem.
2016-04-23 08:49:11 -04:00
Paul Licameli
367b2c1011 Move command functors to a new header file, and generalize with templates...
... so that member functions of other than AudacityProject may be called.

Will use this new generality soon for scrubbing menu items.
2016-04-23 02:05:36 -04:00
Steve Daulton
8667f23ed5 Delete excess comma 2016-04-22 08:45:49 +01:00
Steve Daulton
92f9de8d54 Update credit
Preference for no 'title' other than team member.
2016-04-22 08:44:25 +01:00
Paul Licameli
71dadc9b79 Bug1052 again: Push play button and change its image as soon as scrub click. 2016-04-21 13:15:59 -04:00
Paul Licameli
fb2bc65168 Exchange the effects of page up and page down keys. 2016-04-21 12:40:11 -04:00
Paul Licameli
26771b6db9 Add transport menu items for scrubbing and seeking...
... This includes new always-seeking modes unlike scrubbing which can switch
to seeking and back according to the left mouse button state.

The reason for this is that visually impaired users should not be required to
click with the mouse in the track panel window to signal seeking.  But mouse
movements can still control scrubbing, because we poll the global mouse
position in the timer, not relying on events from any window object.
2016-04-21 12:13:39 -04:00
James Crook
79a25b1401 Merge pull request #122 from tip2tail/TimerRecordHotfix
Timer Record: Ensure that Stop/Cancel in progress dialog always works
2016-04-21 12:45:08 +01:00
Paul Licameli
169958bdd8 Remove a comment 2016-04-20 19:41:03 -04:00
Paul Licameli
81fae8d71c Rework the ESC key to stop playback as an application event handler...
... So it does not depend on the focused window, and can work when selection
toolbar has focus.  But TrackPanel's escape handling may still take precedence
over it.
2016-04-20 15:34:49 -04:00
Paul Licameli
d26395029f ESC key stops play as well as scrub, but not record. Details: ...
... If there is play but also an escapable drag action in TrackPanel, such as
a change of selection, then ESC aborts the drag.  A second ESC would stop play.

The event handling for these ESC actions may be in the wrong place though.  If
you ctrl-f6 during play so that the selection toolbar gets focus, then ESC
does not work to stop play.
2016-04-20 14:08:18 -04:00
Paul Licameli
d2c8975f8a Stub code for adding status bar messages to timeline. For now, ...
... erase any status message when entering or leaving the timeline.
2016-04-20 12:40:28 -04:00
Gale Andrews
7848042339 More friendly warning about overlong Block File
Agreed several years ago on http://wiki.audacityteam.org/wiki/Wording .
2016-04-20 17:13:08 +01:00