summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/library/crate/cratetablemodel.cpp2
-rw-r--r--src/library/dlgtrackinfo.cpp14
-rw-r--r--src/library/dlgtrackinfo.h5
-rw-r--r--src/library/dlgtrackinfo.ui10
-rw-r--r--src/library/librarytablemodel.cpp2
-rw-r--r--src/library/playlisttablemodel.cpp2
-rw-r--r--src/library/trackmodel.h2
-rw-r--r--src/widget/wtracktableview.cpp26
-rw-r--r--src/widget/wtracktableview.h6
9 files changed, 35 insertions, 34 deletions
diff --git a/src/library/crate/cratetablemodel.cpp b/src/library/crate/cratetablemodel.cpp
index fcbd4cb83f..f64850bb2d 100644
--- a/src/library/crate/cratetablemodel.cpp
+++ b/src/library/crate/cratetablemodel.cpp
@@ -107,7 +107,7 @@ TrackModel::CapabilitiesFlags CrateTableModel::getCapabilities() const {
| TRACKMODELCAPS_ADDTOPLAYLIST
| TRACKMODELCAPS_ADDTOCRATE
| TRACKMODELCAPS_ADDTOAUTODJ
- | TRACKMODELCAPS_RELOADMETADATA
+ | TRACKMODELCAPS_IMPORTMETADATA
| TRACKMODELCAPS_LOADTODECK
| TRACKMODELCAPS_LOADTOSAMPLER
| TRACKMODELCAPS_LOADTOPREVIEWDECK
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index e87a39d836..ea9d2ece53 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -48,9 +48,6 @@ void DlgTrackInfo::init() {
connect(btnCancel, SIGNAL(clicked()),
this, SLOT(cancel()));
- connect(btnFetchTag, SIGNAL(clicked()),
- this, SLOT(fetchTag()));
-
connect(bpmDouble, SIGNAL(clicked()),
this, SLOT(slotBpmDouble()));
connect(bpmHalve, SIGNAL(clicked()),
@@ -83,8 +80,11 @@ void DlgTrackInfo::init() {
m_pTapFilter.data(), SLOT(tap()));
connect(m_pTapFilter.data(), SIGNAL(tapped(double, int)),
this, SLOT(slotBpmTap(double, int)));
- connect(btnReloadFromFile, SIGNAL(clicked()),
- this, SLOT(reloadTrackMetadata()));
+
+ connect(btnImportMetadataFromFile, SIGNAL(clicked()),
+ this, SLOT(slotImportMetadataFromFile()));
+ connect(btnImportMetadataFromMusicBrainz, SIGNAL(clicked()),
+ this, SLOT(slotImportMetadataFromMusicBrainz()));
connect(btnOpenFileBrowser, SIGNAL(clicked()),
this, SLOT(slotOpenInFileBrowser()));
@@ -612,7 +612,7 @@ void DlgTrackInfo::slotKeyTextChanged() {
m_keysClone = newKeys;
}
-void DlgTrackInfo::reloadTrackMetadata() {
+void DlgTrackInfo::slotImportMetadataFromFile() {
if (m_pLoadedTrack) {
// Allocate a temporary track object for reading the metadata.
// We cannot reuse m_pLoadedTrack, because it might already been
@@ -634,6 +634,6 @@ void DlgTrackInfo::updateTrackMetadata() {
}
}
-void DlgTrackInfo::fetchTag() {
+void DlgTrackInfo::slotImportMetadataFromMusicBrainz() {
emit(showTagFetcher(m_pLoadedTrack));
}
diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h
index 92513218c0..b31e3e7fcf 100644
--- a/src/library/dlgtrackinfo.h
+++ b/src/library/dlgtrackinfo.h
@@ -38,7 +38,6 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
void apply();
void cancel();
void trackUpdated();
- void fetchTag();
void cueActivate();
void cueDelete();
@@ -56,7 +55,9 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
void slotKeyTextChanged();
- void reloadTrackMetadata();
+ void slotImportMetadataFromFile();
+ void slotImportMetadataFromMusicBrainz();
+
void updateTrackMetadata();
void slotOpenInFileBrowser();
diff --git a/src/library/dlgtrackinfo.ui b/src/library/dlgtrackinfo.ui
index 57f0e9b314..15792a2c20 100644
--- a/src/library/dlgtrackinfo.ui
+++ b/src/library/dlgtrackinfo.ui
@@ -346,16 +346,16 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="btnFetchTag">
+ <widget class="QPushButton" name="btnImportMetadataFromMusicBrainz">
<property name="text">
- <string>Get Metadata from MusicBrainz</string>
+ <string>Import Metadata from MusicBrainz</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="btnReloadFromFile">
+ <widget class="QPushButton" name="btnImportMetadataFromFile">
<property name="text">
- <string>Reload Metadata from File</string>
+ <string>Import Metadata from File</string>
</property>
</widget>
</item>
@@ -1006,7 +1006,7 @@ Often results in higher quality beatgrids, but will not do well on tracks that h
<tabstop>txtYear</tabstop>
<tabstop>txtKey</tabstop>
<tabstop>txtTrackNumber</tabstop>
- <tabstop>btnFetchTag</tabstop>
+ <tabstop>btnImportMetadataFromMusicBrainz</tabstop>
<tabstop>btnReloadFromFile</tabstop>
<tabstop>btnOpenFileBrowser</tabstop>
<tabstop>txtComment</tabstop>
diff --git a/src/library/librarytablemodel.cpp b/src/library/librarytablemodel.cpp
index c6c2f504ea..c50a99867b 100644
--- a/src/library/librarytablemodel.cpp
+++ b/src/library/librarytablemodel.cpp
@@ -101,7 +101,7 @@ TrackModel::CapabilitiesFlags LibraryTableModel::getCapabilities() const {
| TRACKMODELCAPS_ADDTOPLAYLIST
| TRACKMODELCAPS_ADDTOCRATE
| TRACKMODELCAPS_ADDTOAUTODJ
- | TRACKMODELCAPS_RELOADMETADATA
+ | TRACKMODELCAPS_IMPORTMETADATA
| TRACKMODELCAPS_LOADTODECK
| TRACKMODELCAPS_LOADTOSAMPLER
| TRACKMODELCAPS_LOADTOPREVIEWDECK
diff --git a/src/library/playlisttablemodel.cpp b/src/library/playlisttablemodel.cpp
index 14a26da05d..218c79ce6c 100644
--- a/src/library/playlisttablemodel.cpp
+++ b/src/library/playlisttablemodel.cpp
@@ -242,7 +242,7 @@ TrackModel::CapabilitiesFlags PlaylistTableModel::getCapabilities() const {
| TRACKMODELCAPS_REORDER
| TRACKMODELCAPS_ADDTOCRATE
| TRACKMODELCAPS_ADDTOPLAYLIST
- | TRACKMODELCAPS_RELOADMETADATA
+ | TRACKMODELCAPS_IMPORTMETADATA
| TRACKMODELCAPS_LOADTODECK
| TRACKMODELCAPS_LOADTOSAMPLER
| TRACKMODELCAPS_LOADTOPREVIEWDECK
diff --git a/src/library/trackmodel.h b/src/library/trackmodel.h
index 14b93bbb97..14cb625f7a 100644
--- a/src/library/trackmodel.h
+++ b/src/library/trackmodel.h
@@ -35,7 +35,7 @@ class TrackModel {
TRACKMODELCAPS_ADDTOCRATE = 0x00008,
TRACKMODELCAPS_ADDTOAUTODJ = 0x00010,
TRACKMODELCAPS_LOCKED = 0x00020,
- TRACKMODELCAPS_RELOADMETADATA = 0x00040,
+ TRACKMODELCAPS_IMPORTMETADATA = 0x00040,
TRACKMODELCAPS_LOADTODECK = 0x00080,
TRACKMODELCAPS_LOADTOSAMPLER = 0x00100,
TRACKMODELCAPS_LOADTOPREVIEWDECK = 0x00200,
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 0f1115b4c9..cbc2d8c8bd 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -115,8 +115,8 @@ WTrackTableView::~WTrackTableView() {
pHeader->saveHeaderState();
}
- delete m_pReloadMetadataAct;
- delete m_pReloadMetadataFromMusicBrainzAct;
+ delete m_pImportMetadataFromFileAct;
+ delete m_pImportMetadataFromMusicBrainzAct;
delete m_pAddToPreviewDeck;
delete m_pAutoDJBottomAct;
delete m_pAutoDJTopAct;
@@ -400,12 +400,12 @@ void WTrackTableView::createActions() {
connect(m_pAutoDJReplaceAct, SIGNAL(triggered()),
this, SLOT(slotSendToAutoDJReplace()));
- m_pReloadMetadataAct = new QAction(tr("Reload Metadata from File"), this);
- connect(m_pReloadMetadataAct, SIGNAL(triggered()),
- this, SLOT(slotReloadTrackMetadata()));
+ m_pImportMetadataFromFileAct = new QAction(tr("Import Metadata from File"), this);
+ connect(m_pImportMetadataFromFileAct, SIGNAL(triggered()),
+ this, SLOT(slotImportTrackMetadata()));
- m_pReloadMetadataFromMusicBrainzAct = new QAction(tr("Get Metadata from MusicBrainz"),this);
- connect(m_pReloadMetadataFromMusicBrainzAct, SIGNAL(triggered()),
+ m_pImportMetadataFromMusicBrainzAct = new QAction(tr("Import Metadata from MusicBrainz"),this);
+ connect(m_pImportMetadataFromMusicBrainzAct, SIGNAL(triggered()),
this, SLOT(slotShowDlgTagFetcher()));
m_pAddToPreviewDeck = new QAction(tr("Load to Preview Deck"), this);
@@ -941,10 +941,10 @@ void WTrackTableView::contextMenuEvent(QContextMenuEvent* event) {
m_pMenu->addAction(m_pReplayGainResetAction);
m_pMenu->addSeparator();
- if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_RELOADMETADATA)) {
- m_pMenu->addAction(m_pReloadMetadataAct);
- m_pReloadMetadataFromMusicBrainzAct->setEnabled(oneSongSelected);
- m_pMenu->addAction(m_pReloadMetadataFromMusicBrainzAct);
+ if (modelHasCapabilities(TrackModel::TRACKMODELCAPS_IMPORTMETADATA)) {
+ m_pMenu->addAction(m_pImportMetadataFromFileAct);
+ m_pImportMetadataFromMusicBrainzAct->setEnabled(oneSongSelected);
+ m_pMenu->addAction(m_pImportMetadataFromMusicBrainzAct);
}
// Cover art menu only applies if at least one track is selected.
@@ -1373,8 +1373,8 @@ void WTrackTableView::sendToAutoDJ(PlaylistDAO::AutoDJSendLoc loc) {
playlistDao.sendToAutoDJ(trackIds, loc);
}
-void WTrackTableView::slotReloadTrackMetadata() {
- if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_RELOADMETADATA)) {
+void WTrackTableView::slotImportTrackMetadata() {
+ if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_IMPORTMETADATA)) {
return;
}
diff --git a/src/widget/wtracktableview.h b/src/widget/wtracktableview.h
index 71eb7f9d6f..d605864b3b 100644
--- a/src/widget/wtracktableview.h
+++ b/src/widget/wtracktableview.h
@@ -60,7 +60,7 @@ class WTrackTableView : public WLibraryTableView {
void slotPrevTrackInfo();
void slotPrevDlgTagFetcher();
void slotShowTrackInTagFetcher(TrackPointer track);
- void slotReloadTrackMetadata();
+ void slotImportTrackMetadata();
void slotResetPlayed();
void addSelectionToPlaylist(int iPlaylistId);
void addSelectionToCrate(int iCrateId);
@@ -127,8 +127,8 @@ class WTrackTableView : public WLibraryTableView {
QSignalMapper m_playlistMapper, m_crateMapper, m_deckMapper, m_samplerMapper;
// Reload Track Metadata Action:
- QAction *m_pReloadMetadataAct;
- QAction *m_pReloadMetadataFromMusicBrainzAct;
+ QAction *m_pImportMetadataFromFileAct;
+ QAction *m_pImportMetadataFromMusicBrainzAct;
// Load Track to PreviewDeck
QAction* m_pAddToPreviewDeck;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 20:12:35 +0000