Merge lp://qastaging/~hile/mixxx/presetinfo into lp://qastaging/~mixxxdevelopers/mixxx/trunk
Proposed by
Ilkka Tuohela
| Status: | Merged |
|---|---|
| Merged at revision: | 3228 |
| Proposed branch: | lp://qastaging/~hile/mixxx/presetinfo |
| Merge into: | lp://qastaging/~mixxxdevelopers/mixxx/trunk |
| Diff against target: |
1143 lines (+660/-83) 15 files modified
mixxx/src/controllers/controller.cpp (+2/-0) mixxx/src/controllers/controller.h (+10/-0) mixxx/src/controllers/controllermanager.cpp (+36/-31) mixxx/src/controllers/controllermanager.h (+8/-1) mixxx/src/controllers/controllerpreset.h (+7/-0) mixxx/src/controllers/controllerpresetinfo.cpp (+232/-0) mixxx/src/controllers/controllerpresetinfo.h (+87/-0) mixxx/src/controllers/dlgprefcontroller.cpp (+64/-12) mixxx/src/controllers/dlgprefcontroller.h (+5/-1) mixxx/src/controllers/dlgprefcontrollerdlg.ui (+128/-38) mixxx/src/controllers/hid/hidcontroller.cpp (+64/-0) mixxx/src/controllers/hid/hidcontroller.h (+3/-0) mixxx/src/controllers/midi/midicontroller.cpp (+5/-0) mixxx/src/controllers/midi/midicontroller.h (+2/-0) mixxx/src/dlgpreferences.cpp (+7/-0) |
| To merge this branch: | bzr merge lp://qastaging/~hile/mixxx/presetinfo |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mixxx Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Patches for reading the info section from controller XML files, and using this information in the controller dialogs. Implements a presetInfo container and manager class, linked to ControllerManager.
Other minor details in the branch:
- added presetinfo product matching to controller, allows automatic mapping matching to controller
- implement controller ordering by name, use this in preferences
- added methods to process 'device category', for informational purposes only
- add a DeviceCategory field to controller preferences, show HID device info here. This helps choosing between keyboard and mice etc
- minor reformatting of the UI for controllers, adding description and making the text fields wrapped and static width
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
