Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pr to main #3

Merged
merged 49 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f9cc915
Correct inaccurate tooltip help
glocq Jan 18, 2024
ff0698b
implemet TODO for LoadSelectedtrackAndPlay
ronso0 Mar 4, 2024
aa7dfca
replace addTracks with addTracksWithTrackIds (which addTracks now cal…
m0dB Oct 14, 2023
3e72119
shortkeys for track list management (between library, playlists, crat…
m0dB Oct 14, 2023
7420341
make [PreviewDeckN],LoadSelectedTrackAndPlay toggle play/pause if the…
ronso0 Mar 4, 2024
9245fdf
keyboard sheet: remove hidden unused objects, sort objects into corre…
ronso0 Mar 4, 2024
6121949
keyboard sheet: preview load+play -> load+play/pause with icon
ronso0 Mar 4, 2024
fcf43be
remove unused /res/Mixxx-Keyboard-Shortcuts.png
ronso0 Mar 5, 2024
659b579
copy from browsetablemodel
m0dB Oct 14, 2023
82525ca
various cleanups (use pVar nomenclature for pointers, removed unneces…
m0dB Oct 28, 2023
e8808c5
ignore ctrl-left/right in wlibrarytableview
Feb 5, 2024
145813c
Add support for "x-special/gnome-copied-files" on Linux (no Linux gua…
daschuer Feb 27, 2024
064510a
removed all methods, and calls to methods, that only had empty implem…
Mar 1, 2024
ad4f5dc
changed order to avoid last pasted track to be unselected
Mar 1, 2024
4773fc7
Crates: add missing isLocked() function
ronso0 Mar 6, 2024
7659cc5
Don't allow removing tracks from locked playlists or crates
ronso0 Mar 6, 2024
c3f1c7e
don't allow pasting tracks into locked playlists/crates or History
ronso0 Mar 6, 2024
cd275f6
CMakeLists: Fix deduplication trap with --preload-file
fwcd Mar 9, 2024
0b382d2
Merge pull request #12926 from ronso0/tracklists_shortkeys
m0dB Mar 9, 2024
2169158
Update src/util/clipboard.cpp
m0dB Mar 9, 2024
a6f1ba4
added helper function getSelectedRows that checks for valid selection…
Mar 9, 2024
a8e3eb8
Merge remote-tracking branch 'mixxx/main' into tracklists_shortkeys
ronso0 Mar 9, 2024
2257d0b
Allow pasting new tracks not already in library
daschuer Mar 11, 2024
bf8578c
Track menu: rephrase BPM -> "Reset" to "Clear BPM and Beatgrid"
ronso0 Mar 12, 2024
042a78b
Track menu: rephrase "Reset" menu -> "Clear"
ronso0 Mar 12, 2024
079e3ff
Apply suggestions from code review
glocq Mar 12, 2024
0338165
Try to fix a warning when concatinating QByteArrays
daschuer Mar 11, 2024
9092286
Break excessively long lines
glocq Mar 12, 2024
64e1677
Use a common QString to avoid repetition
glocq Mar 12, 2024
a0de3e2
Merge pull request #12020 from mixxxdj/tracklists_shortkeys
ronso0 Mar 12, 2024
24b415c
Merge pull request #12590 from glocq/glocq-tooltipcorrection
ronso0 Mar 12, 2024
be541ea
Library: move Analysis, Hidden and Missing into separate directories
ronso0 Jul 4, 2022
12aa4df
Library: move table item delegates to src/library/tabledelegates
ronso0 Mar 12, 2024
c5767c1
Add a workflow for cleaning up the downloads folder at mixxx.org
daschuer Mar 12, 2024
163ef86
Merge pull request #12957 from daschuer/download_cleanup
ronso0 Mar 15, 2024
51e0827
Merge pull request #12944 from fwcd/fix-deduplication-trap
JoergAtGithub Mar 16, 2024
af7eaf6
Merge pull request #12956 from ronso0/lib-src-subdirectories
JoergAtGithub Mar 16, 2024
e74e4c4
Merge pull request #12955 from ronso0/track-menu-reset-clear
JoergAtGithub Mar 16, 2024
a9a4f33
Removed old examples HID keyboard and HID trackpad
JoergAtGithub Mar 17, 2024
6745139
Merge pull request #12977 from JoergAtGithub/removeHidExamplesForKeyb…
daschuer Mar 18, 2024
5e83d6d
Update Changelog
daschuer Mar 13, 2024
6c6345f
Update CHANGELOG
daschuer Mar 18, 2024
99a28be
Don't require push for download_cleanup.yml
daschuer Mar 18, 2024
2d7768e
download_cleanup.yml: move snapshot dir to destination path
daschuer Mar 18, 2024
238ff87
Track widgets: set `show_track_menu` only for main decks ...
ronso0 Mar 18, 2024
9cc57d9
Merge pull request #12920 from ronso0/preview-load-play-pause
daschuer Mar 19, 2024
f9d5b7f
Fix capitals in CHANGELOG
daschuer Mar 19, 2024
57a25b9
Merge pull request #12978 from ronso0/track-prop-menu-fix
daschuer Mar 19, 2024
e666439
Merge pull request #12960 from daschuer/changelog
JoergAtGithub Mar 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .github/workflows/download_cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Clean up downloads

on:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-22.04

steps:
- name: "Set up SSH Agent"
if: env.SSH_PRIVATE_KEY != null
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
SSH_PRIVATE_KEY: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY }}
SSH_HOST: downloads-hostgator.mixxx.org
run: |
ssh-agent -a $SSH_AUTH_SOCK > /dev/null
ssh-add - <<< "${SSH_PRIVATE_KEY}"
mkdir -p "${HOME}/.ssh"
ssh-keyscan "${SSH_HOST}" >> "${HOME}/.ssh/known_hosts"
echo "SSH_AUTH_SOCK=${SSH_AUTH_SOCK}" >> "${GITHUB_ENV}"

- name: Delete obsolete files
if: env.SSH_AUTH_SOCK != null
run: |
mkdir empty_folder
echo build-checks-fix/ >> include_file.txt
echo build-checks-fix/* >> include_file.txt
rsync --verbose --archive --times --recursive --delete --include-from=include_file.txt --exclude=* "empty_folder/" "${SSH_USER}@${SSH_HOST}:${DESTDIR}/"
env:
DESTDIR: public_html/downloads/snapshots
SSH_HOST: downloads-hostgator.mixxx.org
SSH_USER: mixxx
38 changes: 36 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

### Features

* Sync Lock: End of track checking is not needed [#11035](https://github.com/mixxxdj/mixxx/pull/11035)
* BaseExternalLibraryFeature: Add ability to import external playlists as crates [#11852](https://github.com/mixxxdj/mixxx/pull/11852)
* Logging: Include timestamps in messages by default [#11861](https://github.com/mixxxdj/mixxx/pull/11861)
* DlgPrefSound: Fix fetching of sample rate [#11951](https://github.com/mixxxdj/mixxx/pull/11951) [11949](https://github.com/mixxxdj/mixxx/issues/11949)
Expand All @@ -14,16 +13,23 @@
* Playlist feature: add 'Shuffle playlist' sidebar action [#12498](https://github.com/mixxxdj/mixxx/pull/12498)
* New built-in effect: Glitch [#11329](https://github.com/mixxxdj/mixxx/pull/11329)
* Fullscreen toggle rework [#11566](https://github.com/mixxxdj/mixxx/pull/11566)
* Playlists: Update of playlist labels after adding tracks [#12866](https://github.com/mixxxdj/mixxx/pull/12866) [#12761](https://github.com/mixxxdj/mixxx/issues/12761)
* Tracks: Custom text color for played tracks (qss) [#12744](https://github.com/mixxxdj/mixxx/pull/12744) [#5911](https://github.com/mixxxdj/mixxx/issues/5911) [#12912](https://github.com/mixxxdj/mixxx/pull/12912)
* History: Show track count and duration in sidebar [#12811](https://github.com/mixxxdj/mixxx/pull/12811) [#12788](https://github.com/mixxxdj/mixxx/issues/12788)
* fixes around cratetablemodel, remove tracks + don't allow pasting tracks into locked playlists/crates or History [#12926](https://github.com/mixxxdj/mixxx/pull/12926)
* Tootips: Improve `rate_up/down` tooltips, pitch vs. speed [#12590](https://github.com/mixxxdj/mixxx/pull/12590)
* Shortkeys for track list management [#12020](https://github.com/mixxxdj/mixxx/pull/12020)
* Track menu: Rephrase "Reset" to "Clear" [#12955](https://github.com/mixxxdj/mixxx/pull/12955)

### Controller Mappings

* Traktor Kontrol S2 MK3: Add colored hotcues [#4637](https://github.com/mixxxdj/mixxx/pull/4637)
* Pioneer DDJ-FLX4: mapping improvements [#12842](https://github.com/mixxxdj/mixxx/pull/12842)

### Controller Backend

* Send sysex to all handlers [#12827](https://github.com/mixxxdj/mixxx/pull/12827)
* Add control for showing a deck's track menu [#10825](https://github.com/mixxxdj/mixxx/pull/10825)
* Removed old examples HID keyboard and HID trackpad [#12977](https://github.com/mixxxdj/mixxx/pull/12977)

### Experimental QML Skin

Expand All @@ -34,6 +40,8 @@
* fix(qml): Improve knobs by applying selective 4xMSAA on the Arc shape [#12541](https://github.com/mixxxdj/mixxx/pull/12541)
* Add QML interceptor to auto reload on file change [#12795](https://github.com/mixxxdj/mixxx/pull/12795)
* Add multi-sampling settings for QML [#12546](https://github.com/mixxxdj/mixxx/pull/12546) [#12794](https://github.com/mixxxdj/mixxx/pull/12794) [#12536](https://github.com/mixxxdj/mixxx/issues/12536)
* Install qml module on Windows [#12604](https://github.com/mixxxdj/mixxx/pull/12604)
* Add scrolling waveforms [#3967](https://github.com/mixxxdj/mixxx/pull/3967)

### Update to Qt6

Expand All @@ -59,6 +67,7 @@
* Fix track color background with Qt6 [#12380](https://github.com/mixxxdj/mixxx/pull/12380)
* multi-line delegate: fix bg color, Qt6 on Linux [#12478](https://github.com/mixxxdj/mixxx/pull/12478)
* Revert "BaseTrackPlayer: Remove references to WaveformWidgetRenderer when using Qt6" [#12342](https://github.com/mixxxdj/mixxx/pull/12342)
* Fix Tango waveform splitter [#12939](https://github.com/mixxxdj/mixxx/pull/12939)

### Experimental iOs support

Expand All @@ -78,6 +87,20 @@
* MacOsVersion: Rename to AppleOsVersion [#12662](https://github.com/mixxxdj/mixxx/pull/12662)
* macOS: Add more `Q_OS_MACOS` cond-compiles where appropriate [#12663](https://github.com/mixxxdj/mixxx/pull/12663)

### Experimental WebAssembly support

* CMakeLists: Add support for targeting Emscripten/WebAssembly [#12918](https://github.com/mixxxdj/mixxx/pull/12918)
* CMakeLists: Emit better errors for exotic target platforms [#12910](https://github.com/mixxxdj/mixxx/pull/12910)
* Build: Add `PORTMIDI` flag for compiling with(out) PortMidi [#12913](https://github.com/mixxxdj/mixxx/pull/12913)
* DesktopHelper: Compile out process-spawning on WASM too [#12916](https://github.com/mixxxdj/mixxx/pull/12916)
* MixxxApplication: Use `QWasmIntegrationPlugin` when targeting WebAssembly [#12915](https://github.com/mixxxdj/mixxx/pull/12915)
* CMakeLists: Enable asyncify when targeting WASM [#12921](https://github.com/mixxxdj/mixxx/pull/12921)
* Resources: Bundle resources for preloading when targeting Emscripten/WASM [#12922](https://github.com/mixxxdj/mixxx/pull/12922)
* CMakeLists: Add `WASM_ASSERTIONS` option [#12931](https://github.com/mixxxdj/mixxx/pull/12931)
* VersionStore: Recognize Emscripten/WebAssembly [#12940](https://github.com/mixxxdj/mixxx/pull/12940)
* OpenGLWindow: Fix sizing on Wasm by setting `Qt::FramelessWindowHint` [#12945](https://github.com/mixxxdj/mixxx/pull/12945)
* CMakeLists: Require WebGL 2.0 when building for Wasm [#12952](https://github.com/mixxxdj/mixxx/pull/12952)

### Misc Refactorings

* Add missing `<Qt>` include in `defs.h` [#11348](https://github.com/mixxxdj/mixxx/pull/11348)
Expand Down Expand Up @@ -111,10 +134,21 @@
* fix/History: remove obsolete placeholder playlists [#12494](https://github.com/mixxxdj/mixxx/pull/12494)
* Add missing Taglib dependency [#12830](https://github.com/mixxxdj/mixxx/pull/12830)
* fix: typo ;) [#12726](https://github.com/mixxxdj/mixxx/pull/12726)
* refactor: Avoid temporary qlist allocation on midi sysex receive [#12843](https://github.com/mixxxdj/mixxx/pull/12843)
* SoundSourceMP3: fix unused function warning [#12847](https://github.com/mixxxdj/mixxx/pull/12847)
* update libkeyfinder to 2.2.8 [#12853](https://github.com/mixxxdj/mixxx/pull/12853)
* feat(ci): Add eslint rule prefer-template [#12889](https://github.com/mixxxdj/mixxx/pull/12889)
* Labeler: Add `qml` to labeler config [#12911](https://github.com/mixxxdj/mixxx/pull/12911)
* WTrackMenu: Add missing wcoverartlabel.h include [#12924](https://github.com/mixxxdj/mixxx/pull/12924)
* Fix clazy complains and naming [#12935](https://github.com/mixxxdj/mixxx/pull/12935)
* src/library: Sort files into sub-directories [#12956](https://github.com/mixxxdj/mixxx/pull/12956)
* CMakeLists: Fix deduplication trap with `--preload-file` [#12944](https://github.com/mixxxdj/mixxx/pull/12944)
* Add CI runner that allows cleaning up the download server [#12957](https://github.com/mixxxdj/mixxx/pull/12957)
* Update to latest vcpkg dependencies
[#11649](https://github.com/mixxxdj/mixxx/pull/11649)
[#12512](https://github.com/mixxxdj/mixxx/pull/12512)
[#12067](https://github.com/mixxxdj/mixxx/pull/12067)
[#12898](https://github.com/mixxxdj/mixxx/pull/12898)
* GitHub actions updates
[#11544](https://github.com/mixxxdj/mixxx/pull/11544)
[#11508](https://github.com/mixxxdj/mixxx/pull/11508)
Expand Down
43 changes: 22 additions & 21 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -888,8 +888,10 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/engine/sync/internalclock.cpp
src/engine/sync/synccontrol.cpp
src/errordialoghandler.cpp
src/library/analysisfeature.cpp
src/library/analysislibrarytablemodel.cpp
src/library/analysis/analysisfeature.cpp
src/library/analysis/analysislibrarytablemodel.cpp
src/library/analysis/dlganalysis.cpp
src/library/analysis/dlganalysis.ui
src/library/autodj/autodjfeature.cpp
src/library/autodj/autodjprocessor.cpp
src/library/autodj/dlgautodj.cpp
Expand All @@ -903,16 +905,13 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/basesqltablemodel.cpp
src/library/basetrackcache.cpp
src/library/basetracktablemodel.cpp
src/library/bpmdelegate.cpp
src/library/browse/browsefeature.cpp
src/library/browse/browsetablemodel.cpp
src/library/browse/browsethread.cpp
src/library/browse/foldertreemodel.cpp
src/library/colordelegate.cpp
src/library/columncache.cpp
src/library/coverart.cpp
src/library/coverartcache.cpp
src/library/coverartdelegate.cpp
src/library/coverartutils.cpp
src/library/dao/analysisdao.cpp
src/library/dao/autodjcratesdao.cpp
Expand All @@ -923,14 +922,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/dao/settingsdao.cpp
src/library/dao/trackdao.cpp
src/library/dao/trackschema.cpp
src/library/dlganalysis.cpp
src/library/dlganalysis.ui
src/library/dlgcoverartfullsize.cpp
src/library/dlgcoverartfullsize.ui
src/library/dlghidden.cpp
src/library/dlghidden.ui
src/library/dlgmissing.cpp
src/library/dlgmissing.ui
src/library/dlgtagfetcher.cpp
src/library/dlgtagfetcher.ui
src/library/dlgtrackinfo.cpp
Expand All @@ -942,7 +935,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/export/trackexportwizard.cpp
src/library/export/trackexportworker.cpp
src/library/externaltrackcollection.cpp
src/library/hiddentablemodel.cpp
src/library/itunes/itunesdao.cpp
src/library/itunes/itunesfeature.cpp
src/library/itunes/itunesimporter.cpp
Expand All @@ -953,17 +945,18 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/librarycontrol.cpp
src/library/libraryfeature.cpp
src/library/librarytablemodel.cpp
src/library/locationdelegate.cpp
src/library/missingtablemodel.cpp
src/library/missing_hidden/dlghidden.cpp
src/library/missing_hidden/dlghidden.ui
src/library/missing_hidden/dlgmissing.cpp
src/library/missing_hidden/dlgmissing.ui
src/library/missing_hidden/hiddentablemodel.cpp
src/library/missing_hidden/missingtablemodel.cpp
src/library/mixxxlibraryfeature.cpp
src/library/multilineeditdelegate.cpp
src/library/parser.cpp
src/library/parsercsv.cpp
src/library/parserm3u.cpp
src/library/parserpls.cpp
src/library/playcountdelegate.cpp
src/library/playlisttablemodel.cpp
src/library/previewbuttondelegate.cpp
src/library/proxytrackmodel.cpp
src/library/recording/dlgrecording.cpp
src/library/recording/dlgrecording.ui
Expand All @@ -982,10 +975,17 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/library/serato/seratofeature.cpp
src/library/serato/seratoplaylistmodel.cpp
src/library/sidebarmodel.cpp
src/library/stardelegate.cpp
src/library/stareditor.cpp
src/library/starrating.cpp
src/library/tableitemdelegate.cpp
src/library/tabledelegates/bpmdelegate.cpp
src/library/tabledelegates/colordelegate.cpp
src/library/tabledelegates/coverartdelegate.cpp
src/library/tabledelegates/locationdelegate.cpp
src/library/tabledelegates/multilineeditdelegate.cpp
src/library/tabledelegates/playcountdelegate.cpp
src/library/tabledelegates/previewbuttondelegate.cpp
src/library/tabledelegates/stardelegate.cpp
src/library/tabledelegates/stareditor.cpp
src/library/tabledelegates/tableitemdelegate.cpp
src/library/trackcollection.cpp
src/library/trackcollectioniterator.cpp
src/library/trackcollectionmanager.cpp
Expand Down Expand Up @@ -1141,6 +1141,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/track/trackref.cpp
src/util/battery/battery.cpp
src/util/cache.cpp
src/util/clipboard.cpp
src/util/cmdlineargs.cpp
src/util/color/color.cpp
src/util/color/colorpalette.cpp
Expand Down Expand Up @@ -1830,7 +1831,7 @@ if(EMSCRIPTEN)
# This will generate a mixxx.data file containing all the resources.
# See https://emscripten.org/docs/porting/files/packaging_files.html
# TODO: Strip this down by only including what we need (i.e. no macOS/Linux packaging, ...)
target_link_options(mixxx-lib PUBLIC --preload-file "${CMAKE_CURRENT_SOURCE_DIR}/res@/res")
target_link_options(mixxx-lib PUBLIC "--preload-file=${CMAKE_CURRENT_SOURCE_DIR}/res@/res")
endif()

if(WIN32)
Expand Down
Binary file modified res/Mixxx-Keyboard-Shortcuts.pdf
Binary file not shown.
Binary file removed res/Mixxx-Keyboard-Shortcuts.png
Binary file not shown.
18 changes: 0 additions & 18 deletions res/controllers/HID Keyboard.hid.xml.example

This file was deleted.

18 changes: 0 additions & 18 deletions res/controllers/HID Trackpad.hid.xml.example

This file was deleted.

29 changes: 0 additions & 29 deletions res/controllers/HID-Keyboard.js

This file was deleted.

31 changes: 0 additions & 31 deletions res/controllers/HID-Trackpad.js

This file was deleted.

Loading
Loading