Skip to content

Commit

Permalink
Merge pull request #14248 from audministrator/2.5
Browse files Browse the repository at this point in the history
Library menu: change "Engine DJ Prime" to "Engine DJ"
  • Loading branch information
ronso0 authored Feb 20, 2025
2 parents 8a918e2 + 4f21079 commit ee147d8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/library/export/dlglibraryexport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ DlgLibraryExport::DlgLibraryExport(
pLayout->addLayout(pButtonBarLayout, 3, 0, 1, 2);

setLayout(pLayout);
setWindowTitle(tr("Export Library to Engine Prime"));
//: "Engine DJ" must not be translated
setWindowTitle(tr("Export Library to Engine DJ"));

show();
raise();
Expand Down
2 changes: 1 addition & 1 deletion src/library/export/dlglibraryexport.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class DlgLibraryExport : public QDialog {

signals:
/// The startEnginePrimeExport signal is emitted when sufficient information
/// has been gathered from the user to kick off an Engine Prime export, and
/// has been gathered from the user to kick off an Engine DJ export, and
/// details of the request are provided as part of the signal.
void startEnginePrimeExport(QSharedPointer<mixxx::EnginePrimeExportRequest>);

Expand Down
4 changes: 2 additions & 2 deletions src/library/export/engineprimeexportjob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void exportMetadata(
int hotCueIndex = pCue->getHotCue(); // Note: Mixxx uses 0-based.
if (hotCueIndex < 0 || hotCueIndex >= kMaxHotCues) {
qInfo() << "Skipping hot cue" << hotCueIndex
<< "as the Engine Prime format only supports at most"
<< "as the Engine DJ format only supports at most"
<< kMaxHotCues << "hot cues.";
continue;
}
Expand Down Expand Up @@ -653,7 +653,7 @@ void EnginePrimeExportJob::run() {
emit jobProgress(currProgress);
}

qInfo() << "Engine Prime Export Job completed successfully";
qInfo() << "Engine DJ Export Job completed successfully";
emit completed(m_trackRefs.size(), m_crateIds.size());
}

Expand Down
4 changes: 2 additions & 2 deletions src/library/export/engineprimeexportjob.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ namespace mixxx {

struct EnginePrimeExportRequest;

/// The Engine Prime export job performs the work of exporting the Mixxx
/// library to an external Engine Prime (also known as "Engine Library")
/// The Engine DJ export job performs the work of exporting the Mixxx
/// library to an external Engine DJ (also known as "Engine Library")
/// database, using the libdjinterop library, in accordance with the export
/// request with which it is constructed.
class EnginePrimeExportJob : public QThread {
Expand Down
4 changes: 2 additions & 2 deletions src/widget/wmainmenubar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ void WMainMenuBar::initialize() {
pLibraryMenu->addAction(pLibraryRescan);

#ifdef __ENGINEPRIME__
QString exportTitle = tr("E&xport Library to Engine Prime");
QString exportText = tr("Export the library to the Engine Prime format");
QString exportTitle = tr("E&xport Library to Engine DJ");
QString exportText = tr("Export the library to the Engine DJ format");
auto* pLibraryExport = new QAction(exportTitle, this);
pLibraryExport->setStatusTip(exportText);
pLibraryExport->setWhatsThis(buildWhatsThis(exportTitle, exportText));
Expand Down

0 comments on commit ee147d8

Please sign in to comment.