1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-19 00:51:12 +02:00
Commit Graph

13882 Commits

Author SHA1 Message Date
Vitaly Sverchinsky
62fe78b0ef Affordance cell reference removed from TrackView
Subclasses should provide instances instead

(cherry picked from audacity commit bc8c6d4ccc6ffffa1fb1b30f3a9a5fe578f74ec1)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:51 +02:00
Vitaly Sverchinsky
f969701756 Add LinkType to Track
LinkType replaces old boolean 'linked', mostly for WaveTrack display purposes
Track::GroupChannels splitted into Track::UnlinkChannels and Track::MakeMultiChannelTrack (which is also aware of new LinkType)
LinkConsistensyCheck made virtual to allow Track subclasses to perform type-specific consistensy checks.
Introduces some corner-cases with copy-pasting/old project importing/file importing..., which are handled

(cherry picked from audacity commit 607961da70968c179b60a811ce084b55a94438ec)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:51 +02:00
Vitaly Sverchinsky
39d49be5b4 Minor refactoring for Track class
(cherry picked from audacity commit 96a4342e569e9a6d4158b3ec0729917de73a7cc5)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:51 +02:00
akleja
ddbd9ed0cd Adjust vertical padding
Because we have one less border around the tracks, the Padding needs to be adjusted.

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:51 +02:00
Vitaly Sverchinsky
e9d6aa2c5c Own resizing area added to stereo wave tracks view and affordance view
(cherry picked from audacity commit 7949a0dc86b6e473ffa7fd41d4fe9ddad1e6ba51)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
David Bailes
607e60ab4d Time Shift left/right commands: can fail for stereo track.
Time Shift left/right commands do not work on the right hand channel of a stereo track when clips are not aligned.
This has been a problem since 3.3.0. Between 2.3.1 and 2.4.2 they moved a clip in the right hand channel more than they should, so moving the clip more than the cursor.

Problems and fixes, both in DoClipMove():
1. The reason for the commands not working at all was the track rather than the channel was been passed in the call MakeTrackShifter::Call( *channel, project )
2. The reason for the clip being moved more than it should, was the left hand channel always being passed as the captured track in the call:
state.Init( project, pShifter->GetTrack(), hitTestResult, std::move( uShifter ),
         t0, viewInfo, trackList, syncLocked )

(cherry picked from audacity commit 405847092231f2cf1ddaec25855daa2feeccc566)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
0643115f15 Change channel separator thickness to 1
(cherry picked from audacity commit fd836fc36f)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
6c98a5a2aa In ViewInfo, remove GetLabelWidth() and add comments
(cherry picked from audacity commit cef8e228f9)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
5f2e0fa213 Publicize that all cells in TrackPanel inherit CommonTrackPanelCell
(cherry picked from audacity commit f8e5bb9128)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
b4787b119b Correct the allocation of track panel height for affordances...
... with some reinterpretation of what it means to "set the height" of a track.

Changing height allocation for a reduced separator between panels may also
be done, but that logic should also be localized in TrackPanel.cpp.

(cherry picked from audacity commit 5f7f180a6a)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
1f242372c9 Move some numbers out of ViewInfo.h ...
... Move them to new header TrackPanelConstants.h, to be used only by TrackPanel
and some closely cooperating classes, but not known to the track view, controls,
vertical ruler, or affordance classes.

Also distinguish track from channel separator thickness though these remain
equal.

(cherry picked from audacity commit fba2ef009e)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
cfc1bf35e7 Better document GetHeight of TrackView, rename GetY...
... And explain rectangle calculations in TrackPanel::RefreshTrack

(cherry picked from audacity commit 1a9b4d16e7)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
e8fb7b2803 Rename "Actual" to "Expanded" height which explains purpose better
(cherry picked from audacity commit 579038e341)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
ce2bc7f60e TrackInfo doesn't use the kTopMargin or kBottomMargin constants...
... It only needs their sum, which it will assume is the constant amount of
padding always between tracks (not channels of a track).

(cherry picked from audacity commit 058c729ea5)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
88fe1ee084 Rewrite GetInfoCommand::ExploreTrackPanel...
... implemented simply and more correctly (though not efficiently), hiding
details about the method of rectangle subdivision, and allowing for multiple
sub-views.

This function can be exercised by choosing Boxes in the Track Info item of
Extra > Scriptables II

This commit leaves one fewer call to each of TrackView::GetY() and
TrackView::GetHeight()

(cherry picked from audacity commit 1880c14f11)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
3bdb6412e1 Hide details of screenshot rectangle computations in TrackPanel
(cherry picked from audacity commit 8cbad20228)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
376f6acb90 Enable support for move sematics for EnvelopeHandle and BackgroundHandle
(cherry picked from audacity commit 63ce4db946)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Paul Licameli
c410309ef4 Fix dangling pointers to Project from LyricsWindow.cpp
(cherry picked from audacity commit 0ee9cbd83e)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
30aaad2a1b Splitting mSelIndex
Using mTextEditIndex for tracking active text box index, and mNavigationIndex used to track selection for keyboard navigation purposes See #1195

(cherry picked from audacity commit b90b5cfd47)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
b482f8308c Redundant state removed
(cherry picked from audacity commit 068ef4c36f)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
54fe74896b Label text selection outline removed
(cherry picked from audacity commit 21ec893f76)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
e293af8776 Label affordance: dragging label with bar between handles
(cherry picked from audacity commit 542a9be2ea)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
d261985898 Label drawing changes
Changing bar size between label handles, minor refactoring (making named constants, which should ease changing drawing geometry, without necessety to make changes to internals)

(cherry picked from audacity commit 17a7de639f)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Vitaly Sverchinsky
89fa2cb996 Defaulting label font size to be system preferred
(cherry picked from audacity commit 97094e852c)

Signed-off-by: akleja <storspov@gmail.com>
2021-09-30 12:42:50 +02:00
Emily Mabrey
eb774a449c Merge pull request from tenacityteam/cmake-git-describe-fix
CMake: `GIT_DESCRIBE` fix

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/646
2021-09-29 15:59:20 -04:00
Emily Mabrey
13b2273a89 Add Git describe validation
Validate the output CMake list for `git_output` is the right length

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-28 18:43:33 -04:00
Emily Mabrey
b8896742f8 Fix GIT_DESCRIBE generation
Initially attempt to find tags excluding "Audacity-" and "DarkAudacity-"
Allow graceful fallback case for "Audacity-" tags
Add logic to remove "DarkAudacity-" tag prefix to match "Audacity-" tag behavior

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-28 15:40:04 -04:00
Emily Mabrey
c72c1dc2b6 Merge pull request from tenacityteam/auto-flatpak-ci
Enable auto runs of flatpak CI

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/648
2021-09-27 20:31:46 -04:00
Emily Mabrey
b450069a86 Enable auto runs of flatpak CI
Flatpak CI should now run automatically when flatpak specific files are changed

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-27 12:27:47 -04:00
TheEvilSkeleton
fe5b64a1c2 Flatpak: Remove leftover tenacity.desktop name
We have recently switched to rDNS schema. A little part was left out.

This change was merged ASAP, bypassing the normal review process,
because it is a follow up for a change that inadvertently resulted in
our Flatpak builds breaking.

Follow-up of 198d49b773.

Signed-off-by: TheEvilSkeleton <theevilskeleton@riseup.net>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Reference-to: https://github.com/tenacityteam/tenacity/pull/647
2021-09-27 14:50:50 +00:00
Emily Mabrey
ff10653f15 Merge pull request from tenacityteam/emabrey/build-info-clang
Fix clang compiler build info

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/626
2021-09-27 01:59:41 -04:00
lmarz
198d49b773 Rename freedesktop and metainfo files to reverse DNS schema
Based on the suggestion made by Mart Raudsepp.

"Regular installs should have reverse DNS notation desktop and
metainfo files as well. This becomes important if we ever make use
of things like dbus service activation further down the line. And
renaming it then will break peoples app shortcuts and other things."

Signed-off-by: Leon Marz <main@lmarz.org>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Helped-by: Mart Raudsepp <leio@gentoo.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/642
2021-09-27 05:49:51 +00:00
SteveDaulton
e776c2f7e4 Update license for Steve Daulton's bundled Nyquist plug-ins
Cherry-picked from upstream Audacity project as seen here:

df091bbde3

Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
2021-09-23 20:30:56 +02:00
Joakim Gyllström
75b90ce4be Opt in for macOS dark mode support 2021-09-23 20:25:16 +02:00
Haelwenn (lanodan) Monnier
7230f6a393 cmake: Add install target for libnyquist
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2021-09-23 12:08:51 +03:00
Sol Fisher Romanoff
4445aaabb3 CONTRIBUTING.md: clarify send-email requirements
Signed-off-by: Sol Fisher Romanoff <sol@solfisher.com>
2021-09-23 11:07:29 +03:00
Panagiotis Vasilopoulos
a1e7fd1aab ControlToolBar: Reorder icons
Although we expect that this change will probably put off long-time Audacity
users, we believe that it's easier to reach the buttons that are used the
most if they are placed on the right.

Controversial change is controversial, but better now than later.

Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Reference-to: https://github.com/tenacityteam/tenacity/pull/402
2021-09-23 08:00:17 +00:00
Emily Mabrey
cf6ce76ce1 Merge pull request from tenacityteam/emabrey/vcpkg-setapikey-poc
Enable Nuget caching locally

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/629
2021-09-21 19:52:47 -04:00
Emily Mabrey
7085e096cb Resume using default vcpkg binary source
This change prevents requring vcpkg downloads twice

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-20 23:28:35 -04:00
Emily Mabrey
0f861b97b0 Add automatic local nuget config
CMake now automatically generates `nuget.config` with a read-only PAT

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-20 23:23:43 -04:00
Emily Mabrey
70eca6b9aa Add nuget.config to .gitignore
Prevent leaking PAT in a place where GH can see it and revoke it

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-20 23:23:43 -04:00
Emily Mabrey
2e84f0c03f Remove nuget.config
Modify cmake_build workflow to no longer remove automatically
Remove nuget.config file from repository

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-20 23:23:43 -04:00
Panagiotis Vasilopoulos
dbe4b564d4 Added Tenacity version in CMakeLists.txt
Doesn't change anything functionality-wise for now, particularly because of
my hesitation with this change as far as hard-coding the version again as a
fallback is concerned.

Audacity's version variable was also reverted in contrast to
56c953a14d for compatibility reasons with older
project files or for project file compatibility with newer versions of
Audacity.

Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
2021-09-19 16:04:33 +02:00
Mondanzo
a7db3db5a9 Replace Audacity references in macOS manifest
Signed-off-by: Mondanzo <danzo@mondanzo.de>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Reference-to: https://github.com/tenacityteam/tenacity/pull/632
2021-09-19 07:57:37 +00:00
lmarz
0b4074d35e Show wxWidgets version in About dialog
Signed-off-by: Leon Marz <main@lmarz.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/634
2021-09-19 07:29:00 +00:00
Sol Fisher Romanoff
0ccf25c27d Merge remote-tracking branch 'lanodan/bugfix/cmake-wayland-vst'
The VST plugin done via GTK for non-apple & non-windows pulls
<gdk/gdkx.h>, which is specific to X11 and thus isn't available in a
pure-wayland system.

Reference-to: https://github.com/tenacityteam/tenacity/pull/620
2021-09-17 16:14:45 +03:00
Emily Mabrey
0f131bf848 Merge pull request from tenacityteam/emabrey/fix-skip-ci
Disable build skipping action temporarily
This was merged without review on an emergency basis

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/633
2021-09-16 18:30:06 -04:00
Emily Mabrey
2903c8f29c Disable CI build skip
Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-16 18:22:38 -04:00
Emily Mabrey
4b3778ec7c Lockdown skip ci action version
Use SHA of 3.4.1 version of fkirc/skip-duplicate-actions

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
2021-09-16 17:14:35 -04:00
Juozas
0a71cad2df Add --tags parameter to git describe command
This commit contains a workaround for git describe command using only
annotated tags and not all tags known to repository when generating its
output. Adding such parameter to git command line should change its
behavior to more proper one.

Signed-off-by: Juozas <juozaspo@gmail.com>
Reference-to: https://github.com/tenacityteam/tenacity/pull/586
2021-09-16 16:18:23 +00:00