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.

Sign up for GitHub

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

Add harmonic keywheel ui #1695

Merged
merged 35 commits into from
Feb 5, 2021
Merged

Add harmonic keywheel ui #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6c6c3ab
Merge branch '2.3' of [email protected]:mixxxdj/mixxx.git
uklotzde Oct 23, 2020
4340e24
Merge branch 'main'
uklotzde Oct 23, 2020
06b28b6
Merge branch 'main' of [email protected]:mixxxdj/mixxx.git
uklotzde Oct 23, 2020
323e0c0
Merge remote-tracking branch 'upstream/main'
daschuer Oct 27, 2020
839f96a
Merge remote-tracking branch 'upstream/main'
daschuer Oct 30, 2020
747f050
Merge remote-tracking branch 'upstream/main'
daschuer Nov 3, 2020
4744488
Add harmonic keywheel ui
poelzi May 31, 2018
00c0902
Update keywheel.
poelzi Jun 1, 2018
47d2fc7
better keyboard mouse event handling in keywheel window
poelzi Jun 1, 2018
7293de7
Update keywheel colors to match openkey defined colors
poelzi Jun 25, 2018
40dd26a
Skip traditional mode as it only shows redundent informations.
poelzi Jun 25, 2018
1636926
static cast
poelzi Jul 1, 2018
bcfbdbf
Add keywheel to cmake build
poelzi Oct 29, 2020
c6d39c6
Bring keywheel uptodate
poelzi Oct 29, 2020
09bed87
Move keywheel to help menu.
poelzi Nov 13, 2020
d0410f3
Use new connect syntax
poelzi Nov 13, 2020
3e2c56a
fix styling
poelzi Nov 13, 2020
7f523d0
Show traditional layer but hide legend instead.
poelzi Nov 13, 2020
14892db
Merge branch 'main' of https://github.com/mixxxdj/mixxx into harmonic…
poelzi Nov 14, 2020
75f059e
Simplify notation update code
poelzi Nov 14, 2020
085a113
Use ControlObject to recieve settings
poelzi Nov 17, 2020
db6e9f3
Remove unused variable
poelzi Nov 17, 2020
c7f4d81
Merge branch 'main' of https://github.com/mixxxdj/mixxx into harmonic…
poelzi Nov 17, 2020
467af6a
fix windows casting warning
poelzi Nov 18, 2020
c2f1bb9
Merge remote-tracking branch 'origin/main' into main
poelzi Nov 22, 2020
44e1c4d
Merge branch 'main' of https://github.com/mixxxdj/mixxx into main
poelzi Nov 22, 2020
fc4cecf
Merge branch 'main' of https://github.com/mixxxdj/mixxx into main
poelzi Nov 22, 2020
a4cf0c3
Merge branch 'main' of https://github.com/mixxxdj/mixxx into main
poelzi Dec 9, 2020
cfa9603
Merge branch 'main' of https://github.com/mixxxdj/mixxx into harmonic…
poelzi Jan 24, 2021
ed533bb
Cleanup keywheel code
poelzi Jan 24, 2021
e455161
Fix clazy problem with buttonbox
poelzi Jan 24, 2021
abd0c1d
Merge branch 'main' into harmonic-wheel
poelzi Jan 25, 2021
e7cfb5a
Merge branch 'main' of https://github.com/mixxxdj/mixxx into harmonic…
poelzi Jan 25, 2021
cd3fc10
Cleanup Keywheel code
poelzi Jan 25, 2021
a3544c5
Add workaround for wrong SVG size after loading
poelzi Feb 4, 2021
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
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/dialog/dlgaboutdlg.ui
src/dialog/dlgdevelopertools.cpp
src/dialog/dlgdevelopertoolsdlg.ui
src/dialog/dlgkeywheel.cpp
src/dialog/dlgkeywheel.ui
src/dialog/dlgreplacecuecolor.cpp
src/dialog/dlgreplacecuecolordlg.ui
src/effects/builtin/autopaneffect.cpp
Expand Down
Loading