Martchus
/
tageditor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve db query widget 

* Trigger auto-insert also when query results are available
* Allow to refresh when new search criteria has been (automatically)
  inserted

So it is at least a little bit more convenient to use.
This commit is contained in:
Martchus 2019-09-03 22:04:43 +02:00
parent 76ba02c3c0
commit 474d66b25c
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gui/dbquerywidget.cpp
View File

@ -95,6 +95,9 @@ DbQueryWidget::DbQueryWidget(TagEditorWidget *tagEditorWidget, QWidget *parent)
m_insertPresentDataAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
m_insertPresentDataAction->setEnabled(m_tagEditorWidget->activeTagEdit());
connect(m_insertPresentDataAction, &QAction::triggered, this, &DbQueryWidget::insertSearchTermsFromActiveTagEdit);
m_refreshAutomaticallyAction = m_menu->addAction(tr("Start new query automatically when inserting search criteria"));
m_refreshAutomaticallyAction->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
m_refreshAutomaticallyAction->setCheckable(true);
auto *const clearSearchCriteria = m_menu->addAction(tr("Clear search criteria"));
clearSearchCriteria->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear")));
connect(clearSearchCriteria, &QAction::triggered, this, &DbQueryWidget::clearSearchCriteria);
@ -122,21 +125,47 @@ void DbQueryWidget::insertSearchTermsFromTagEdit(TagEdit *tagEdit, bool songSpec
return;
}
bool somethingChanged = false;
// be always song-specific when querying makeitpersonal
songSpecific = m_lastSearchAction == m_searchMakeItPersonalAction;
// set album and artist
if (m_lastSearchAction == m_searchMakeItPersonalAction) {
m_ui->titleLineEdit->setText(tagValueToQString(tagEdit->value(KnownField::Title)));
} else {
m_ui->albumLineEdit->setText(tagValueToQString(tagEdit->value(KnownField::Album)));
if (m_lastSearchAction != m_searchMakeItPersonalAction) {
const auto newAlbum = tagValueToQString(tagEdit->value(KnownField::Album));
if (m_ui->albumLineEdit->text() != newAlbum) {
m_ui->albumLineEdit->setText(newAlbum);
somethingChanged = true;
}
}
const auto newArtist = tagValueToQString(tagEdit->value(KnownField::Artist));
if (m_ui->artistLineEdit->text() != newArtist) {
m_ui->artistLineEdit->setText(newArtist);
somethingChanged = true;
}
m_ui->artistLineEdit->setText(tagValueToQString(tagEdit->value(KnownField::Artist)));
if (!songSpecific) {
return;
}
// set title and track number
m_ui->titleLineEdit->setText(tagValueToQString(tagEdit->value(KnownField::Title)));
m_ui->trackSpinBox->setValue(tagEdit->trackNumber());
const auto newTitle = tagValueToQString(tagEdit->value(KnownField::Title));
if (m_ui->titleLineEdit->text() != newTitle) {
m_ui->titleLineEdit->setText(newTitle);
somethingChanged = true;
}
if (m_lastSearchAction != m_searchMakeItPersonalAction) {
const auto newTrackNumber = tagEdit->trackNumber();
if (m_ui->trackSpinBox->value() != newTrackNumber) {
m_ui->trackSpinBox->setValue(newTrackNumber);
somethingChanged = true;
}
}
// refresh automatically if enabled and something has changed
if (somethingChanged && m_refreshAutomaticallyAction->isChecked()) {
m_lastSearchAction->trigger();
}
}
SongDescription DbQueryWidget::currentSongDescription() const
@ -721,6 +750,7 @@ void DbQueryWidget::useQueryResults(QueryResultsModel *queryResults)
connect(queryResults, &QueryResultsModel::resultsAvailable, this, &DbQueryWidget::showResults);
connect(queryResults, &QueryResultsModel::lyricsAvailable, this, &DbQueryWidget::showLyricsFromIndex);
connect(queryResults, &QueryResultsModel::coverAvailable, this, &DbQueryWidget::showCoverFromIndex);
connect(queryResults, &QAbstractItemModel::modelReset, this, &DbQueryWidget::autoInsertMatchingResults);
}
QModelIndex DbQueryWidget::selectedIndex() const

1
gui/dbquerywidget.h
View File

@ -81,6 +81,7 @@ private:
QAction *m_searchLyricsWikiaAction;
QAction *m_searchMakeItPersonalAction;
QAction *m_lastSearchAction;
QAction *m_refreshAutomaticallyAction;
QPoint m_contextMenuPos;
};

2
gui/dbquerywidget.ui
View File

@ -331,7 +331,7 @@
<item>
<widget class="QCheckBox" name="autoInsertCheckBox">
<property name="toolTip">
<string>Whether values for selected &quot;Fields to be used&quot; should be inserted automatically when opening a file. The row to insert the values from is determined from the existing title and/or track number fields of the file and disambiguated by taking the album and artist into account as well. It still makes sense to check that the correct row has been inserted before saving.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Whether values for selected &amp;quot;Fields to be used&amp;quot; should be inserted automatically when opening a file or a query has been completed.&lt;/p&gt;&lt;p&gt;The row to insert the values from is determined from the existing title and/or track number fields of the file and disambiguated by taking the album and artist into account as well. It makes sense to check that the correct row has been inserted before saving.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Insert automatically</string>