Skip to content
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

Jump to bottom

library: right align BPM, duration & bitrate values #11634

Merged
merged 5 commits into from
Jun 10, 2023
Merged

library: right align BPM, duration & bitrate values #11634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73ddcb8
library: right align BPM, duration & bitrate values
ronso0 Jun 6, 2023
2fb5f3c
Library: set BPM column precision in Pref > Library
ronso0 Jun 8, 2023
360cf34
Pref Library: remove obsolete search options init
ronso0 Jun 8, 2023
efcd106
Pref Library: improve alignment of spinboxes and lables
ronso0 Jun 9, 2023
2f008d3
Pref Library: avoid undesired value changes when scrolling
ronso0 Jun 9, 2023
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
39 changes: 37 additions & 2 deletions src/library/basetracktablemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,24 @@ QSqlDatabase cloneDatabase(

} // anonymous namespace

// static
constexpr int BaseTrackTableModel::kBpmColumnPrecisionDefault;
constexpr int BaseTrackTableModel::kBpmColumnPrecisionMinimum;
constexpr int BaseTrackTableModel::kBpmColumnPrecisionMaximum;

int BaseTrackTableModel::s_bpmColumnPrecision =
kBpmColumnPrecisionDefault;

// static
void BaseTrackTableModel::setBpmColumnPrecision(int precision) {
VERIFY_OR_DEBUG_ASSERT(precision >= BaseTrackTableModel::kBpmColumnPrecisionMinimum) {
precision = BaseTrackTableModel::kBpmColumnPrecisionMinimum;
}
VERIFY_OR_DEBUG_ASSERT(precision <= BaseTrackTableModel::kBpmColumnPrecisionMaximum) {
precision = BaseTrackTableModel::kBpmColumnPrecisionMaximum;
}
s_bpmColumnPrecision = precision;
}
//static
QStringList BaseTrackTableModel::defaultTableColumns() {
return kDefaultTableColumns;
Expand Down Expand Up @@ -426,7 +444,8 @@ QVariant BaseTrackTableModel::data(
role != Qt::EditRole &&
role != Qt::CheckStateRole &&
role != Qt::ToolTipRole &&
role != kDataExportRole) {
role != kDataExportRole &&
role != Qt::TextAlignmentRole) {
return QVariant();
}

Expand Down Expand Up @@ -571,6 +590,21 @@ QVariant BaseTrackTableModel::roleValue(
break;
}
M_FALLTHROUGH_INTENDED;
// Right align BPM, duraation and bitrate so big/small values can easily be
// spotted by length (number of digits)
case Qt::TextAlignmentRole: {
switch (field) {
case ColumnCache::COLUMN_LIBRARYTABLE_BPM:
case ColumnCache::COLUMN_LIBRARYTABLE_DURATION:
case ColumnCache::COLUMN_LIBRARYTABLE_BITRATE: {
// We need to cast to int due to a bug similar to
// https://bugreports.qt.io/browse/QTBUG-67582
return static_cast<int>(Qt::AlignVCenter | Qt::AlignRight);
}
default:
return QVariant(); // default AlignLeft for all other columns
}
}
case Qt::DisplayRole:
switch (field) {
case ColumnCache::COLUMN_LIBRARYTABLE_DURATION: {
Expand Down Expand Up @@ -688,7 +722,8 @@ QVariant BaseTrackTableModel::roleValue(
if (role == Qt::ToolTipRole || role == kDataExportRole) {
return QString::number(bpm.value(), 'f', 4);
} else {
return QString::number(bpm.value(), 'f', 1);
// custom precision, set in DlgPrefLibrary
return QString::number(bpm.value(), 'f', s_bpmColumnPrecision);
}
} else {
return QChar('-');
Expand Down
7 changes: 7 additions & 0 deletions src/library/basetracktablemodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ class BaseTrackTableModel : public QAbstractTableModel, public TrackModel {
const QString& mood) const override;
#endif // __EXTRA_METADATA__

static constexpr int kBpmColumnPrecisionDefault = 1;
static constexpr int kBpmColumnPrecisionMinimum = 0;
static constexpr int kBpmColumnPrecisionMaximum = 10;
static void setBpmColumnPrecision(int precision);

protected:
static constexpr int defaultColumnWidth() {
return 50;
Expand Down Expand Up @@ -271,4 +276,6 @@ class BaseTrackTableModel : public QAbstractTableModel, public TrackModel {
int countValidColumnHeaders() const;

TrackId m_previewDeckTrackId;

static int s_bpmColumnPrecision;
};
5 changes: 5 additions & 0 deletions src/library/library_prefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ const ConfigKey mixxx::library::prefs::kEnableSearchHistoryShortcutsConfigKey =
mixxx::library::prefs::kConfigGroup,
QStringLiteral("EnableSearchHistoryShortcuts")};

const ConfigKey mixxx::library::prefs::kBpmColumnPrecisionConfigKey =
ConfigKey{
mixxx::library::prefs::kConfigGroup,
QStringLiteral("BpmColumnPrecision")};

// The "Export" suffix in the key is kept for backward compatibility
const ConfigKey mixxx::library::prefs::kSyncTrackMetadataConfigKey =
ConfigKey{
Expand Down
2 changes: 2 additions & 0 deletions src/library/library_prefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ extern const ConfigKey kEnableSearchCompletionsConfigKey;

extern const ConfigKey kEnableSearchHistoryShortcutsConfigKey;

extern const ConfigKey kBpmColumnPrecisionConfigKey;

extern const ConfigKey kEditMetadataSelectedClickConfigKey;

extern const ConfigKey kHistoryMinTracksToKeepConfigKey;
Expand Down
66 changes: 56 additions & 10 deletions src/preferences/dialog/dlgpreflibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <QUrl>

#include "defs_urls.h"
#include "library/basetracktablemodel.h"
#include "library/dlgtrackmetadataexport.h"
#include "library/library.h"
#include "library/library_prefs.h"
Expand Down Expand Up @@ -78,13 +79,15 @@ DlgPrefLibrary::DlgPrefLibrary(
this,
&DlgPrefLibrary::slotRowHeightValueChanged);

spinbox_bpm_precision->setMinimum(BaseTrackTableModel::kBpmColumnPrecisionMinimum);
spinbox_bpm_precision->setMaximum(BaseTrackTableModel::kBpmColumnPrecisionMaximum);
connect(spinbox_bpm_precision,
QOverload<int>::of(&QSpinBox::valueChanged),
this,
&DlgPrefLibrary::slotBpmColumnPrecisionChanged);

searchDebouncingTimeoutSpinBox->setMinimum(WSearchLineEdit::kMinDebouncingTimeoutMillis);
searchDebouncingTimeoutSpinBox->setMaximum(WSearchLineEdit::kMaxDebouncingTimeoutMillis);
const auto searchDebouncingTimeoutMillis =
m_pConfig->getValue(
kSearchDebouncingTimeoutMillisConfigKey,
WSearchLineEdit::kDefaultDebouncingTimeoutMillis);
searchDebouncingTimeoutSpinBox->setValue(searchDebouncingTimeoutMillis);
connect(searchDebouncingTimeoutSpinBox,
QOverload<int>::of(&QSpinBox::valueChanged),
this,
Expand Down Expand Up @@ -131,12 +134,37 @@ DlgPrefLibrary::DlgPrefLibrary(
this,
&DlgPrefLibrary::slotSyncTrackMetadataToggled);

// Avoid undesired spinbox value changes while scrolling the preferences page
setFocusPolicyInstallEventFilter(spinbox_bpm_precision);
setFocusPolicyInstallEventFilter(spinbox_history_track_duplicate_distance);
setFocusPolicyInstallEventFilter(spinbox_history_min_tracks_to_keep);
setFocusPolicyInstallEventFilter(spinBoxRowHeight);
setFocusPolicyInstallEventFilter(searchDebouncingTimeoutSpinBox);

// Initialize the controls after all slots have been connected
slotUpdate();
}

DlgPrefLibrary::~DlgPrefLibrary() = default;

void DlgPrefLibrary::setFocusPolicyInstallEventFilter(QSpinBox* box) {
box->setFocusPolicy(Qt::StrongFocus);
box->installEventFilter(this);
}

// Catch scroll events over spinboxes and pass them to the scroll area instead.
bool DlgPrefLibrary::eventFilter(QObject* obj, QEvent* e) {
if (e->type() == QEvent::Wheel) {
// Reject scrolling only if widget is unfocused.
// Object to widget cast is needed to check the focus state.
QSpinBox* spin = qobject_cast<QSpinBox*>(obj);
if (spin && !spin->hasFocus()) {
QApplication::sendEvent(verticalLayout, e);
return true;
}
}
return QObject::eventFilter(obj, e);
}
void DlgPrefLibrary::slotShow() {
m_bAddedDirectory = false;
}
Expand Down Expand Up @@ -199,21 +227,25 @@ void DlgPrefLibrary::slotResetToDefaults() {
checkBox_SyncTrackMetadata->setChecked(false);
checkBox_SeratoMetadataExport->setChecked(false);
checkBox_use_relative_path->setChecked(false);
checkBox_show_rhythmbox->setChecked(true);
checkBox_show_banshee->setChecked(true);
checkBox_show_itunes->setChecked(true);
checkBox_show_traktor->setChecked(true);
checkBox_show_rekordbox->setChecked(true);
checkBoxEditMetadataSelectedClicked->setChecked(kEditMetadataSelectedClickDefault);
radioButton_dbclick_deck->setChecked(true);
spinbox_bpm_precision->setValue(BaseTrackTableModel::kBpmColumnPrecisionDefault);

radioButton_cover_art_fetcher_medium->setChecked(true);

spinBoxRowHeight->setValue(Library::kDefaultRowHeightPx);
setLibraryFont(QApplication::font());
searchDebouncingTimeoutSpinBox->setValue(
WSearchLineEdit::kDefaultDebouncingTimeoutMillis);
checkBoxEnableSearchCompletions->setChecked(WSearchLineEdit::kCompletionsEnabledDefault);
checkBoxEnableSearchHistoryShortcuts->setChecked(
WSearchLineEdit::kHistoryShortcutsEnabledDefault);

checkBox_show_rhythmbox->setChecked(true);
checkBox_show_banshee->setChecked(true);
checkBox_show_itunes->setChecked(true);
checkBox_show_traktor->setChecked(true);
checkBox_show_rekordbox->setChecked(true);
}

void DlgPrefLibrary::slotUpdate() {
Expand Down Expand Up @@ -299,11 +331,18 @@ void DlgPrefLibrary::slotUpdate() {
m_iOriginalTrackTableRowHeight = m_pLibrary->getTrackTableRowHeight();
spinBoxRowHeight->setValue(m_iOriginalTrackTableRowHeight);
setLibraryFont(m_originalTrackTableFont);

const auto searchDebouncingTimeoutMillis =
m_pConfig->getValue(
kSearchDebouncingTimeoutMillisConfigKey,
WSearchLineEdit::kDefaultDebouncingTimeoutMillis);
searchDebouncingTimeoutSpinBox->setValue(searchDebouncingTimeoutMillis);

const auto bpmColumnPrecision =
m_pConfig->getValue(
kBpmColumnPrecisionConfigKey,
BaseTrackTableModel::kBpmColumnPrecisionDefault);
spinbox_bpm_precision->setValue(bpmColumnPrecision);
}

void DlgPrefLibrary::slotCancel() {
Expand Down Expand Up @@ -550,6 +589,13 @@ void DlgPrefLibrary::updateSearchLineEditHistoryOptions() {
WSearchLineEdit::kHistoryShortcutsEnabledDefault));
}

void DlgPrefLibrary::slotBpmColumnPrecisionChanged(int bpmPrecision) {
m_pConfig->setValue(
kBpmColumnPrecisionConfigKey,
bpmPrecision);
BaseTrackTableModel::setBpmColumnPrecision(bpmPrecision);
}

void DlgPrefLibrary::slotSyncTrackMetadataToggled() {
if (isVisible() && checkBox_SyncTrackMetadata->isChecked()) {
mixxx::DlgTrackMetadataExport::showMessageBoxOncePerSession();
Expand Down
3 changes: 3 additions & 0 deletions src/preferences/dialog/dlgpreflibrary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@ class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg {
void slotSelectFont();
void slotSyncTrackMetadataToggled();
void slotSearchDebouncingTimeoutMillisChanged(int);
void slotBpmColumnPrecisionChanged(int bpmPrecision);
void slotSeratoMetadataExportClicked(bool);

private:
void setFocusPolicyInstallEventFilter(QSpinBox* box);
bool eventFilter(QObject* object, QEvent* event) override;
void initializeDirList();
void setLibraryFont(const QFont& font);
void updateSearchLineEditHistoryOptions();
Expand Down
42 changes: 29 additions & 13 deletions src/preferences/dialog/dlgpreflibrarydlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@
</property>
<layout class="QGridLayout" name="gridLayout_track_table_view">

<item row="1" column="0" colspan="2">
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="checkBoxEditMetadataSelectedClicked">
<property name="text">
<string>Edit metadata after clicking selected track</string>
</property>
</widget>
</item>

<item row="2" column="0">
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="doubeClickActionLabel">
<property name="text">
<string>Track Double-Click Action:</string>
Expand All @@ -172,7 +172,7 @@
</widget>
</item>

<item row="3" column="0">
<item row="3" column="0" colspan="3">
<widget class="QRadioButton" name="radioButton_dbclick_deck">
<property name="text">
<string>Load track to next available deck</string>
Expand All @@ -182,28 +182,43 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="4" column="0" colspan="3">
<widget class="QRadioButton" name="radioButton_dbclick_bottom">
<property name="text">
<string>Add track to Auto DJ queue (bottom)</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="5" column="0" colspan="3">
<widget class="QRadioButton" name="radioButton_dbclick_top">
<property name="text">
<string>Add track to Auto DJ queue (top)</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="6" column="0" colspan="3">
<widget class="QRadioButton" name="radioButton_dbclick_ignore">
<property name="text">
<string>Ignore</string>
</property>
</widget>
</item>

<item row="7" column="0">
<widget class="QLabel" name="bpmPrecisionLabel">
<property name="text">
<string>BPM display precision:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<widget class="QSpinBox" name="spinbox_bpm_precision">
</widget>
</item>

</layout>
</widget>
</item><!-- Track Table View -->
Expand All @@ -215,7 +230,7 @@
</property>
<layout class="QGridLayout" name="gridLayout_history">

<item row="1" column="0" colspan="2">
<item row="1" column="0">
<widget class="QLabel" name="label_history_track_duplicate_distance">
<property name="text">
<string>Track duplicate distance</string>
Expand All @@ -228,7 +243,7 @@
</property>
</widget>
</item>
<item row="1" column="2">
<item row="1" column="1" colspan="2">
<widget class="QSpinBox" name="spinbox_history_track_duplicate_distance">
<property name="toolTip">
<string>When playing a track again log it to the session history only if more than N other tracks have been played in the meantime</string>
Expand All @@ -245,7 +260,7 @@
</widget>
</item>

<item row="2" column="0" colspan="2">
<item row="2" column="0">
<widget class="QLabel" name="label_history_cleanup">
<property name="toolTip">
<string>History playlist with less than N tracks will be deleted&lt;br/&gt;&lt;br/&gt;Note: the cleanup will be performed during startup and shutdown of Mixxx.</string>
Expand All @@ -258,7 +273,7 @@
</property>
</widget>
</item>
<item row="2" column="2">
<item row="2" column="1" colspan="2">
<widget class="QSpinBox" name="spinbox_history_min_tracks_to_keep">
<property name="minimum">
<number>1</number>
Expand Down Expand Up @@ -297,7 +312,7 @@
<string>Library Row Height:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand All @@ -324,7 +339,7 @@
<string>Library Font:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand All @@ -349,7 +364,7 @@
<string>Search-as-you-type timeout:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -608,6 +623,7 @@
<tabstop>radioButton_dbclick_bottom</tabstop>
<tabstop>radioButton_dbclick_top</tabstop>
<tabstop>radioButton_dbclick_ignore</tabstop>
<tabstop>bpmPrecisionSpinBox</tabstop>
<tabstop>spinbox_history_track_duplicate_distance</tabstop>
<tabstop>spinbox_history_min_tracks_to_keep</tabstop>
<tabstop>checkBox_use_relative_path</tabstop>
Expand Down
Loading