From 01d2683113af70cc47fdef20006776f3678d41e9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 11 Jun 2015 00:25:10 +0200 Subject: [PATCH] show more details, added way to show help info --- misc/htmlinfo.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/misc/htmlinfo.cpp b/misc/htmlinfo.cpp index b1c9abb..45a0fbc 100644 --- a/misc/htmlinfo.cpp +++ b/misc/htmlinfo.cpp @@ -56,11 +56,17 @@ inline QString qstr(const string &stdstr) inline QString mkRow(const QString &label, const QString &text, bool head = true) { + return head ? QStringLiteral("%1%2").arg(label, text) : QStringLiteral("%1%2").arg(label, text); } +inline QString mkRow(const QString &label, const QString &helpText, const QString &text) +{ + return QStringLiteral("%2%3").arg(helpText, label, text); +} + QString mkFontStyle(const QFont &font) { QString style; @@ -153,19 +159,22 @@ void mkTrack(QByteArray &res, const AbstractTrack *track, unsigned int trackNumb { res.append(QStringLiteral("%1 #%2").arg(QCoreApplication::translate("HtmlInfo", "Track"), QString::number(trackNumber))); if(track->id()) { - res.append(mkRow(QCoreApplication::translate("HtmlInfo", "ID"), QString::number(track->id()))); + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "ID"), QCoreApplication::translate("HtmlInfo", "The unique number used to identify the track in the container file."), QString::number(track->id()))); } if(track->trackNumber()) { - res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Number"), QString::number(track->trackNumber()))); + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Number"), QCoreApplication::translate("HtmlInfo", "The index of the track in the container file."), QString::number(track->trackNumber()))); } if(!track->name().empty()) { res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Name"), qstr(track->name()))); } res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Type"), qstr(track->mediaTypeName()))); const char *fmtName = track->formatName(), *fmtAbbr = track->formatAbbreviation(); - res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Format"), qstr(fmtName))); + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Format"), QCoreApplication::translate("HtmlInfo", "The unabbreviated name of the track's format."), qstr(fmtName))); if(strcmp(fmtName, fmtAbbr)) { - res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Abbreviation"), qstr(fmtAbbr))); + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Abbreviation"), QCoreApplication::translate("HtmlInfo", "The abbreviated name of the track's format."), qstr(fmtAbbr))); + } + if(!track->formatId().empty()) { + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Format ID"), QCoreApplication::translate("HtmlInfo", "The raw format identifier directly extracted from the container."), qstr(track->formatId()))); } if(track->version()) { res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Version"), QString::number(track->version()))); @@ -179,6 +188,9 @@ void mkTrack(QByteArray &res, const AbstractTrack *track, unsigned int trackNumb if(track->bitrate()) { res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Avg. bitrate"), qstr(bitrateToString(track->bitrate())))); } + if(track->maxBitrate()) { + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Maximum bitrate"), qstr(bitrateToString(track->maxBitrate())))); + } if(!track->creationTime().isNull()) { res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Creation time"), qstr(track->creationTime().toString(DateTimeOutputFormat::DateAndTime, true)))); } @@ -191,8 +203,12 @@ void mkTrack(QByteArray &res, const AbstractTrack *track, unsigned int trackNumb if(!track->compressorName().empty()) { res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Compressor name"), qstr(track->compressorName()))); } - if(track->samplesPerSecond()) { - res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Samples per second"), QString::number(track->samplesPerSecond()))); + if(track->sampleRate()) { + if(track->extensionSampleRate()) { + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Samplerate"), QStringLiteral("%1 Hz / %2 Hz").arg(track->extensionSampleRate()).arg(track->sampleRate()))); + } else { + res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Samplerate"), QStringLiteral("%1 Hz").arg(track->sampleRate()))); + } } if(track->sampleCount()) { res.append(mkRow(QCoreApplication::translate("HtmlInfo", "Sample count"), QString::number(track->sampleCount())));