Use consistent string replacment scheme

Make the CD ripper dialog use the same naming scheme for replacement
strings as the organise dialog.
This commit is contained in:
Mattias Andersson 2015-02-20 21:09:04 +01:00
parent b077fe97cf
commit aad6401cec
2 changed files with 9 additions and 7 deletions

View File

@ -286,12 +286,14 @@ QString RipCDDialog::GetOutputFileName(const QString& basename) const {
QString RipCDDialog::ParseFileFormatString(const QString& file_format,
int track_no) const {
QString to_return = file_format;
to_return.replace(QString("%artist%"), ui_->artistLineEdit->text());
to_return.replace(QString("%album%"), ui_->albumLineEdit->text());
to_return.replace(QString("%genre%"), ui_->genreLineEdit->text());
to_return.replace(QString("%year%"), ui_->yearLineEdit->text());
to_return.replace(QString("%tracknum%"), QString::number(track_no));
to_return.replace(QString("%track%"),
to_return.replace(QString("%artist"), ui_->artistLineEdit->text());
to_return.replace(QString("%album"), ui_->albumLineEdit->text());
to_return.replace(QString("%disc"), ui_->discLineEdit->text());
to_return.replace(QString("%genre"), ui_->genreLineEdit->text());
to_return.replace(QString("%year"), ui_->yearLineEdit->text());
to_return.replace(QString("%title"),
track_names_.value(track_no - 1)->text());
to_return.replace(QString("%track"), QString::number(track_no));
return to_return;
}

View File

@ -204,7 +204,7 @@
<item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="format_filename">
<property name="text">
<string notr="true">%tracknum% - %artist% - %track%</string>
<string notr="true">%track - %artist - %title</string>
</property>
</widget>
</item>