diff --git a/res/Mixxx-Keyboard-Shortcuts.pdf b/res/Mixxx-Keyboard-Shortcuts.pdf
index 38277941820..312a1810125 100644
Binary files a/res/Mixxx-Keyboard-Shortcuts.pdf and b/res/Mixxx-Keyboard-Shortcuts.pdf differ
diff --git a/res/Mixxx-Keyboard-Shortcuts.png b/res/Mixxx-Keyboard-Shortcuts.png
deleted file mode 100644
index a757fadfb12..00000000000
Binary files a/res/Mixxx-Keyboard-Shortcuts.png and /dev/null differ
diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg
index 948f5dfa139..8d3316c89b1 100644
--- a/res/images/templates/ic_template_keyboard_mapping_sheet.svg
+++ b/res/images/templates/ic_template_keyboard_mapping_sheet.svg
@@ -7,7 +7,7 @@
id="svg1180"
sodipodi:docname="ic_template_keyboard_mapping_sheet.svg"
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
- inkscape:export-filename="../../Mixxx-Keyboard-Shortcuts.png"
+ inkscape:export-filename="../../Mixxx-Keyboard-Shortcuts.pdf"
inkscape:export-xdpi="148.322"
inkscape:export-ydpi="148.322"
xml:space="preserve"
@@ -28,14 +28,14 @@
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="4.7711688"
- inkscape:cx="514.23459"
- inkscape:cy="159.18531"
+ inkscape:cx="366.89123"
+ inkscape:cy="166.52104"
inkscape:window-width="1920"
inkscape:window-height="1056"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="layer2"
+ inkscape:current-layer="layer1"
showguides="true" />Mixxx Keyboard mapping sheet templateEach control inside Mixxx is identified by a unique string. These strings are used in the keyboard mappings, the MIDI mappings, and inside Mixxx to gain access to the controls. The following is a list of controls that can be used in any of the above contexts. * for de-de keyboard layout - für Deutsche Tastatur * for en-us keyboard layout * for en-us keyboard layoutMixxx Keyboard mapping sheet templateAutoDJAutoDJdouble
+ id="tspan4">double
clickclickstopload+ playstopload+getLoadedTrack()) {
+ auto* pPlay =
+ ControlObject::getControl(ConfigKey(group, QStringLiteral("play")));
+ double newPlay = pPlay->toBool() ? 0.0 : 1.0;
+ pPlay->set(newPlay);
+ return;
+ }
}
if (clone) {
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 49d4a601d01..10b7b778233 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -1111,19 +1111,17 @@ void WTrackTableView::loadSelectedTrackToGroup(const QString& group, bool play)
m_pConfig->getValue(kConfigKeyAllowTrackLoadToPlayingDeck);
}
// If the track load override is disabled, check to see if a track is
- // playing before trying to load it
- if (!allowLoadTrackIntoPlayingDeck) {
- // TODO(XXX): Check for other than just the first preview deck.
- if (group != "[PreviewDeck1]" &&
- ControlObject::get(ConfigKey(group, "play")) > 0.0) {
- return;
- }
+ // playing before trying to load it.
+ // Always load to preview deck.
+ if (!allowLoadTrackIntoPlayingDeck &&
+ !PlayerManager::isPreviewDeckGroup(group) &&
+ ControlObject::get(ConfigKey(group, "play")) > 0.0) {
+ return;
}
auto index = indices.at(0);
auto* trackModel = getTrackModel();
TrackPointer pTrack;
- if (trackModel &&
- (pTrack = trackModel->getTrack(index))) {
+ if (trackModel && (pTrack = trackModel->getTrack(index))) {
emit loadTrackToPlayer(pTrack, group, play);
}
}