diff --git a/res/translations/mixxx.ts b/res/translations/mixxx.ts
index cad1da232830..6f146099ccb1 100644
--- a/res/translations/mixxx.ts
+++ b/res/translations/mixxx.ts
@@ -2868,14 +2868,14 @@
-
+
Turn Auto DJ on or off.
-
-
-
+
+
+
Enable Auto DJ
@@ -3154,17 +3154,27 @@ You tried to learn: %1,%2
-
+
+ Dumps all ControlObject values to a csv-file saved in the settings path (e.g. ~/.mixxx)
+
+
+
+
+ Dump to csv
+
+
+
+
Log
-
+
Search
-
+
Stats
@@ -3548,11 +3558,6 @@ Apply settings and continue?
Controllers
-
-
- Controllers allow you to control Mixxx with physical devices (for example USB MIDI or HID controllers). Controllers that Mixxx recognizes are shown in the "Controllers" section in the sidebar.
-
-
Mixxx did not detect any controllers. If you connected the controller while Mixxx was running you must restart Mixxx first.
diff --git a/src/dlgautodj.cpp b/src/dlgautodj.cpp
index 5a4808b348e4..04abb225d608 100644
--- a/src/dlgautodj.cpp
+++ b/src/dlgautodj.cpp
@@ -5,6 +5,7 @@
#include "library/playlisttablemodel.h"
#include "widget/wtracktableview.h"
#include "util/assert.h"
+#include "util/time.h"
DlgAutoDJ::DlgAutoDJ(QWidget* parent,
ConfigObject* pConfig,
@@ -32,6 +33,9 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent,
m_pTrackTableView, SLOT(setTrackTableFont(QFont)));
connect(pLibrary, SIGNAL(setTrackTableRowHeight(int)),
m_pTrackTableView, SLOT(setTrackTableRowHeight(int)));
+ connect(m_pTrackTableView, SIGNAL(trackSelected(TrackPointer)),
+ this, SLOT(updateSelectionInfo()));
+
QBoxLayout* box = dynamic_cast(layout());
DEBUG_ASSERT_AND_HANDLE(box) { //Assumes the form layout is a QVBox/QHBoxLayout!
@@ -82,6 +86,8 @@ DlgAutoDJ::DlgAutoDJ(QWidget* parent,
connect(m_pAutoDJProcessor, SIGNAL(autoDJStateChanged(AutoDJProcessor::AutoDJState)),
this, SLOT(autoDJStateChanged(AutoDJProcessor::AutoDJState)));
autoDJStateChanged(m_pAutoDJProcessor->getState());
+
+ updateSelectionInfo();
}
DlgAutoDJ::~DlgAutoDJ() {
@@ -197,3 +203,26 @@ void DlgAutoDJ::setTrackTableFont(const QFont& font) {
void DlgAutoDJ::setTrackTableRowHeight(int rowHeight) {
m_pTrackTableView->setTrackTableRowHeight(rowHeight);
}
+
+void DlgAutoDJ::updateSelectionInfo()
+{
+ int duration = 0;
+
+ QModelIndexList indices = m_pTrackTableView->selectionModel()->selectedRows();
+
+ for (int i = 0; i < indices.size(); ++i) {
+ TrackPointer pTrack = m_pAutoDJTableModel->getTrack(indices.at(i));
+ if (pTrack) {
+ duration += pTrack->getDuration();
+ }
+ }
+
+ QString label;
+
+ if (!indices.isEmpty()) {
+ label.append(Time::formatSeconds(duration, false));
+ label.append(QString(" (%1)").arg(indices.size()));
+ }
+
+ labelSelectionInfo->setText(label);
+}
diff --git a/src/dlgautodj.h b/src/dlgautodj.h
index 3caac21a6010..10c2ceef48ca 100644
--- a/src/dlgautodj.h
+++ b/src/dlgautodj.h
@@ -41,6 +41,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
void autoDJStateChanged(AutoDJProcessor::AutoDJState state);
void setTrackTableFont(const QFont& font);
void setTrackTableRowHeight(int rowHeight);
+ void updateSelectionInfo();
signals:
void addRandomButton(bool buttonChecked);
diff --git a/src/dlgautodj.ui b/src/dlgautodj.ui
index 6201b0c1cc91..ea2b8c164f7c 100644
--- a/src/dlgautodj.ui
+++ b/src/dlgautodj.ui
@@ -131,6 +131,13 @@
+ -
+
+
+
+
+
+
-