Skip to content

Controllers: Don't needlessly copy presets into user directory #2569

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

Merged
Be-ing merged 57 commits into from
Apr 9, 2020
Merged

Controllers: Don't needlessly copy presets into user directory #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
66585a6
controllers/controllermanager: Make use of the getPresetPaths() function
Holzhaus Mar 18, 2020
05f7ce4
controllers/controllermanager: Rename function to sanitizeString
Holzhaus Mar 18, 2020
d7269cf
controllers/controllermanager: Rework device setup code
Holzhaus Mar 18, 2020
8813212
controllers: Preselect configured mapping in preferences if available
Holzhaus Mar 19, 2020
29b1df8
controllers/dlgprefcontroller: Fix reset of combobox item on apply
Holzhaus Mar 19, 2020
2e314f5
controllers/controllerpresetinfo: Remove unused header file
Holzhaus Mar 19, 2020
bc92e0d
controllers/dlgprefcontroller: Separate user and system presets
Holzhaus Mar 19, 2020
2730b6a
controllers/controllermanager: Always write preset to config on exit
Holzhaus Mar 19, 2020
8b46ef0
controllers/midi: Make MidiControllerPreset's mappings private
Holzhaus Mar 19, 2020
436cd88
controllers: Only write preset to user directory if it's dirty
Holzhaus Mar 19, 2020
7f08658
controllers/dlgprefcontroller: Don't import scripts into user directory
Holzhaus Mar 19, 2020
d94a183
controllers/controllermanager: Rename sanitizeString and move to anon NS
Holzhaus Apr 6, 2020
3e0729a
controllers/controllermanager: Fix assertion if no preset is configured
Holzhaus Apr 6, 2020
8a30f3a
controllers/controllermanager: Use qDebug() instead of qWarning()
Holzhaus Apr 6, 2020
5277c50
controllers/dlgprefcontroller: Move shared enumeration code to method
Holzhaus Apr 6, 2020
6367448
controllers/dlgprefcontroller: Improve some comments
Holzhaus Apr 6, 2020
c2e2db6
controllers/controllermanager: Improve device setup code
Holzhaus Apr 6, 2020
08d52d9
controllers/controllermanager: Remove unused variable
Holzhaus Apr 6, 2020
fb1573c
controllers/dlgprefcontroller: Add icon to user controller presets
Holzhaus Apr 6, 2020
d259421
controllers/controllerpresetinfoenumerator: Add constructor for singl…
Holzhaus Apr 6, 2020
302155e
controllers/dlgprefcontroller: Show Mixxx icon for system presets
Holzhaus Apr 6, 2020
6f5ce05
controllers/dlgprefcontroller: Disable checkbox if no preset selected
Holzhaus Apr 6, 2020
cd14e38
controllers/dlgprefcontroller: Rename "..." to "No Preset" and add icon
Holzhaus Apr 6, 2020
00b625f
controllers/controllermanager: Fix typo in debug message
Holzhaus Apr 6, 2020
dd1ed97
Merge branch 'master' of github.com:mixxxdj/mixxx into controller-fix…
Holzhaus Apr 7, 2020
12f083e
controllers/midi/midimessage: Use desc in MidiInputMapping == operator
Holzhaus Apr 7, 2020
5ee9c9b
controllers/midi/midimessage: Fix MidiInputMapping == operator
Holzhaus Apr 7, 2020
fc97ef7
controllers/controllermanager: Add "(edited)" suffix to changed presets
Holzhaus Apr 7, 2020
390d3dd
controllers: Add some comments to undocumented classes
Holzhaus Apr 7, 2020
02ee5c4
controllers/controllermanager: Remove obsolete importScript method
Holzhaus Apr 7, 2020
98d50b0
controllers: Always load scripts from mapping dir (with system as…
Holzhaus Apr 7, 2020
cb12d22
controllers/dlgprefcontroller: Add "(built-in)" to system scripts
Holzhaus Apr 7, 2020
148a4e6
controllers: Move script file search code into ControllerPreset class
Holzhaus Apr 7, 2020
86829df
controllers/controllerpreset: Remove leftover qDebug() statement
Holzhaus Apr 7, 2020
6ac15f1
controllers/controllerpresetfilehandler: Use for loop instead of foreach
Holzhaus Apr 7, 2020
4fe397b
controllers: Move controller script file handling to FileHandler classes
Holzhaus Apr 7, 2020
a93cd8d
controllers: Make applyPreset initializeScripts param optional
Holzhaus Apr 8, 2020
4322094
controllers/controllermanager: Replace foreach for for loops
Holzhaus Apr 8, 2020
e18e5d6
controllers/controllerpresetfilehandler: Improve script file search code
Holzhaus Apr 8, 2020
814b243
controllers/controllerpresetfilehandler: Remove wrong debug assertion
Holzhaus Apr 8, 2020
a0d395f
controllers/controllerpresetfilehandler: Improve comments
Holzhaus Apr 8, 2020
e59d465
controllers/dlgprefcontroller: Remove unused presetDir code
Holzhaus Apr 8, 2020
d4ee388
controllers/controllerengine: Fix warnings for older Qt5 versions
Holzhaus Apr 8, 2020
13c2d59
controllers: Move savePreset() from Controller into Preset classes
Holzhaus Apr 8, 2020
f79cdf2
controllers: Move preset saving from ControllerManger to Preferences
Holzhaus Apr 8, 2020
ffec734
controllers/dlgprefcontroller: Reload user presets after saving
Holzhaus Apr 8, 2020
c562f66
controllers/dlgprefcontroller: Remove obsolete method
Holzhaus Apr 8, 2020
b4db43b
controllers/dlgprefcontroller: Fix dirty detection in slotApply()
Holzhaus Apr 8, 2020
6dcffce
controllers/dlgprefcontroller: Reset dialog dirty state on apply
Holzhaus Apr 8, 2020
47f1ccd
controllers/dlgprefcontroller: Remove wrong dirty state change
Holzhaus Apr 8, 2020
420ceb9
controllers/dlgprefcontroller: Add acomment
Holzhaus Apr 8, 2020
54c38e1
controllers/controllermanager: Return QFileInfo in findPresetFile()
Holzhaus Apr 8, 2020
9dc6ff7
Merge branch 'master' of github.com:mixxxdj/mixxx into controller-fix…
Holzhaus Apr 8, 2020
00ad201
controllers/dlgprefcontroller: Add edited suffix to filenames
Holzhaus Apr 8, 2020
419ccf4
controllers/dlgprefcontroller: Tick Enabled checkbox on preset change
Holzhaus Apr 9, 2020
b9079e0
controllers/dlgprefcontroller: Display "No scripts" for scriptless pr…
Holzhaus Apr 9, 2020
4760291
controllers: Fix comments and include guards
Holzhaus Apr 9, 2020
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 @@ -217,6 +217,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/controllers/keyboard/keyboardeventfilter.cpp
src/controllers/learningutils.cpp
src/controllers/midi/midicontroller.cpp
src/controllers/midi/midicontrollerpreset.cpp
Comment thread
Holzhaus marked this conversation as resolved.
src/controllers/midi/midicontrollerpresetfilehandler.cpp
src/controllers/midi/midienumerator.cpp
src/controllers/midi/midimessage.cpp
Expand Down Expand Up @@ -1979,6 +1980,7 @@ if(HID)
target_sources(mixxx-lib PRIVATE
src/controllers/hid/hidcontroller.cpp
src/controllers/hid/hidenumerator.cpp
src/controllers/hid/hidcontrollerpreset.cpp
src/controllers/hid/hidcontrollerpresetfilehandler.cpp
)
target_compile_definitions(mixxx-lib PUBLIC __HID__)
Expand Down
1 change: 1 addition & 0 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,7 @@ def sources(self, build):
"src/controllers/midi/midimessage.cpp",
"src/controllers/midi/midiutils.cpp",
"src/controllers/midi/midicontroller.cpp",
"src/controllers/midi/midicontrollerpreset.cpp",
"src/controllers/midi/midicontrollerpresetfilehandler.cpp",
"src/controllers/midi/midienumerator.cpp",
"src/controllers/midi/midioutputhandler.cpp",
Expand Down
1 change: 1 addition & 0 deletions build/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def configure(self, build, conf):

def sources(self, build):
sources = ['src/controllers/hid/hidcontroller.cpp',
'src/controllers/hid/hidcontrollerpreset.cpp',
'src/controllers/hid/hidenumerator.cpp',
'src/controllers/hid/hidcontrollerpresetfilehandler.cpp']

Expand Down
67 changes: 67 additions & 0 deletions res/images/ic_custom.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading