Use "import"/"export" for track metadata synchronization

7 files changed, 19 insertions, 18 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,