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

Assume by default that tag data types can be treated as string 

This makes introducing new tag data types easier as they can usually be
treated as string.
This commit is contained in:
Martchus 2022-08-13 15:42:52 +02:00
parent 82537e5bff
commit b76ccbfc1c
2 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
gui/tagfieldedit.cpp
View File

@ -120,11 +120,25 @@ TagValue TagFieldEdit::value(TagTextEncoding encoding, bool includeDescription)
{
TagValue value;
switch (m_dataType) {
case TagDataType::Text:
case TagDataType::TimeSpan:
case TagDataType::DateTime:
case TagDataType::Popularity:
case TagDataType::DateTimeExpression:
case TagDataType::Integer:
if (m_spinBoxes.first && m_spinBoxes.first->value()) {
value.assignInteger(m_spinBoxes.first->value());
}
break;
case TagDataType::PositionInSet:
if (m_spinBoxes.first && m_spinBoxes.second) {
value.assignPosition(PositionInSet(m_spinBoxes.first->value(), m_spinBoxes.second->value()));
}
break;
case TagDataType::StandardGenreIndex:
if (m_comboBox) {
value.assignText(Utility::qstringToString(m_comboBox->currentText(), encoding), encoding);
}
break;
case TagDataType::Binary:
case TagDataType::Picture:
break;
default:
switch (m_field) {
case KnownField::Genre:
if (m_comboBox) {
@ -142,22 +156,7 @@ TagValue TagFieldEdit::value(TagTextEncoding encoding, bool includeDescription)
}
}
break;
case TagDataType::Integer:
if (m_spinBoxes.first && m_spinBoxes.first->value()) {
value.assignInteger(m_spinBoxes.first->value());
}
break;
case TagDataType::PositionInSet:
if (m_spinBoxes.first && m_spinBoxes.second) {
value.assignPosition(PositionInSet(m_spinBoxes.first->value(), m_spinBoxes.second->value()));
}
break;
case TagDataType::StandardGenreIndex:
if (m_comboBox) {
value.assignText(Utility::qstringToString(m_comboBox->currentText(), encoding), encoding);
}
break;
default:;
;
}
// setup description line edit
if (m_descriptionLineEdit && m_descriptionLineEdit->isEnabled() && includeDescription) {
@ -284,22 +283,6 @@ void TagFieldEdit::setupUi()
m_widgets.clear();
// setup widgets
switch (m_dataType) {
case TagDataType::Text:
case TagDataType::TimeSpan:
case TagDataType::DateTime:
case TagDataType::Popularity:
case TagDataType::DateTimeExpression:
switch (m_field) {
case KnownField::Genre:
setupGenreComboBox();
break;
case KnownField::Lyrics:
setupPlainTextEdit();
break;
default:
setupLineEdit();
}
break;
case TagDataType::Picture:
setupPictureSelection();
break;
@ -316,7 +299,17 @@ void TagFieldEdit::setupUi()
setupFileSelection();
break;
default:
setupTypeNotSupportedLabel();
switch (m_field) {
case KnownField::Genre:
setupGenreComboBox();
break;
case KnownField::Lyrics:
setupPlainTextEdit();
break;
default:
setupLineEdit();
}
break;
}
if (m_dataType != TagDataType::Picture && hasDescription()) { // setup description line edit
setupDescriptionLineEdit();

14
misc/utility.cpp
View File

@ -57,16 +57,14 @@ QString tagValueToQString(const TagValue &value)
return dataToQString(value.dataPointer(), value.dataSize(), value.dataEncoding());
case TagDataType::Integer:
return QString::number(value.toInteger());
case TagDataType::StandardGenreIndex:
case TagDataType::TimeSpan:
case TagDataType::DateTime:
case TagDataType::PositionInSet:
case TagDataType::Popularity:
case TagDataType::DateTimeExpression:
return QString::fromStdString(value.toString());
case TagDataType::UnsignedInteger:
return QString::number(value.toUnsignedInteger());
case TagDataType::Binary:
case TagDataType::Picture:
return QString();
default:;
}
return QString();
return QString::fromStdString(value.toString());
}
QString dataToQString(const char *data, size_t dataSize, TagTextEncoding encoding)