From ff86ecddc5b675314d891b70f06db6f9915152e4 Mon Sep 17 00:00:00 2001
From: Alexander Bikadorov <bikaejkb@mailbox.tu-berlin.de>
Date: Mon, 4 Jan 2016 18:56:28 +0100
Subject: [PATCH] Update modified fields boldness when fetching tags

---
 src/ui/edittagdialog.cpp | 22 +++++++++++-----------
 src/ui/edittagdialog.h   |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/ui/edittagdialog.cpp b/src/ui/edittagdialog.cpp
index 731c36472..814ea03fb 100644
--- a/src/ui/edittagdialog.cpp
+++ b/src/ui/edittagdialog.cpp
@@ -365,7 +365,6 @@ bool EditTagDialog::IsValueModified(const QModelIndexList& sel,
 void EditTagDialog::InitFieldValue(const FieldData& field,
                                    const QModelIndexList& sel) {
   const bool varies = DoesValueVary(sel, field.id_);
-  const bool modified = IsValueModified(sel, field.id_);
 
   if (ExtendedEditor* editor = dynamic_cast<ExtendedEditor*>(field.editor_)) {
     editor->clear();
@@ -377,10 +376,7 @@ void EditTagDialog::InitFieldValue(const FieldData& field,
     }
   }
 
-  QFont new_font(font());
-  new_font.setBold(modified);
-  field.label_->setFont(new_font);
-  field.editor_->setFont(new_font);
+  UpdateModifiedField(field, sel);
 }
 
 void EditTagDialog::UpdateFieldValue(const FieldData& field,
@@ -401,9 +397,13 @@ void EditTagDialog::UpdateFieldValue(const FieldData& field,
     data_[i.row()].set_value(field.id_, value);
   }
 
-  // Update the boldness
+  UpdateModifiedField(field, sel);
+}
+
+void EditTagDialog::UpdateModifiedField(const FieldData& field, const QModelIndexList& sel) {
   const bool modified = IsValueModified(sel, field.id_);
 
+  // Update the boldness
   QFont new_font(font());
   new_font.setBold(modified);
   field.label_->setFont(new_font);
@@ -855,12 +855,12 @@ void EditTagDialog::FetchTagSongChosen(const Song& original_song,
   // Is it currently being displayed in the UI?
   if (ui_->song_list->currentRow() == id) {
     // Yes! Additionally update UI
+    const QModelIndexList sel =
+      ui_->song_list->selectionModel()->selectedIndexes();
     ignore_edits_ = true;
-    ui_->title->set_text(new_metadata.title());
-    ui_->artist->set_text(new_metadata.artist());
-    ui_->album->set_text(new_metadata.album());
-    ui_->track->setValue(new_metadata.track());
-    ui_->year->setValue(new_metadata.year());
+    for (const FieldData& field : fields_) {
+      InitFieldValue(field, sel);
+    }
     ignore_edits_ = false;
   }
 }
diff --git a/src/ui/edittagdialog.h b/src/ui/edittagdialog.h
index abf4f88d6..87a136c02 100644
--- a/src/ui/edittagdialog.h
+++ b/src/ui/edittagdialog.h
@@ -127,6 +127,7 @@ signals:
 
   void InitFieldValue(const FieldData& field, const QModelIndexList& sel);
   void UpdateFieldValue(const FieldData& field, const QModelIndexList& sel);
+  void UpdateModifiedField(const FieldData& field, const QModelIndexList& sel);
   void ResetFieldValue(const FieldData& field, const QModelIndexList& sel);
 
   void UpdateSummaryTab(const Song& song);