Skip to content

GitLab

Commit bc108520 authored by Urs Fleisch's avatar Urs Fleisch
Browse files

field width n (0 <= n <= 9) of number with leading zeros can be specified with "%{track.n}

parent 5f1fb224
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 9 deletions
kid3/ChangeLog
View file @ bc108520
Wed Feb 18 21:40:17 CET 2009 Urs Fleisch <ufleisch@users.sourceforge.net>
Sat Mar 14 12:43:56 CET 2009 Urs Fleisch <ufleisch@users.sourceforge.net>
* Release 1.2
......@@ -6,6 +6,7 @@ Wed Feb 18 21:40:17 CET 2009 Urs Fleisch <ufleisch@users.sourceforge.net>
+ Import of album cover art from various sources.
+ Mark changed tag fields and filenames.
+ Option to store ID3v2 genre as text instead of numeric string.
+ Track number format with configurable amount of leading zeros.
* Improved:
+ Directory deb to generate Debian packages for KDE 4 and Qt 4 or
......
kid3/deb/changelog
View file @ bc108520
......@@ -2,7 +2,7 @@ kid3 (1.2-0) unstable; urgency=low
* New upstream release.
-- Urs Fleisch <ufleisch@users.sourceforge.net> Wed, 18 Feb 2009 21:44:30 +0100
-- Urs Fleisch <ufleisch@users.sourceforge.net> Sat, 14 Mar 2009 12:43:47 +0100
kid3 (1.1-1) unstable; urgency=low
......
kid3/doc/de/index.docbook
View file @ bc108520
......@@ -25,7 +25,7 @@
</copyright>
<legalnotice id="fdl-notice">&FDLNotice;</legalnotice>
<date>2009-02-18</date>
<date>2009-03-14</date>
<releaseinfo>1.2</releaseinfo>
<abstract>
......@@ -267,6 +267,7 @@ Werte aus den Tags im Dateinamen einzusetzen:
<listitem><para>%c %{comment} Kommentar (Comment)</para></listitem>
<listitem><para>%y %{year} Jahr (Year)</para></listitem>
<listitem><para>%t %{track} Nummer (Track, z.B. 01)</para></listitem>
<listitem><para>%t %{track.n} Nummer mit Feldlänge n (z.B. 001 für %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Nummer (Track, z.B. 1)</para></listitem>
<listitem><para>%g %{genre} Stil (Genre)</para></listitem>
</itemizedlist>
......@@ -790,6 +791,7 @@ zusätzliche.
<listitem><para>%c %{comment} Kommentar (Comment)</para></listitem>
<listitem><para>%y %{year} Jahr (Year)</para></listitem>
<listitem><para>%t %{track} Nummer (Track)</para></listitem>
<listitem><para>%t %{track.n} Nummer mit Feldlänge n (z.B. 001 für %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Nummer (Track), ohne führende Null</para></listitem>
<listitem><para>%g %{genre} Stil (Genre)</para></listitem>
<listitem><para>%f %{file} Dateiname (File name)</para></listitem>
......@@ -970,6 +972,7 @@ Werte aus den Tags im Verzeichnisnamen einzusetzen:
<listitem><para>%c %{comment} Kommentar (Comment)</para></listitem>
<listitem><para>%y %{year} Jahr (Year)</para></listitem>
<listitem><para>%t %{track} Nummer (Track))</para></listitem>
<listitem><para>%t %{track.n} Nummer mit Feldlänge n (z.B. 001 für %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Nummer (Track), ohne führende Null</para></listitem>
<listitem><para>%g %{genre} Stil (Genre)</para></listitem>
</itemizedlist>
......@@ -1024,6 +1027,7 @@ und Exportieren verwendet werden.
<listitem><para>%c %{comment} Kommentar (Comment)</para></listitem>
<listitem><para>%y %{year} Jahr (Year)</para></listitem>
<listitem><para>%t %{track} Nummer (Track))</para></listitem>
<listitem><para>%t %{track.n} Nummer mit Feldlänge n (z.B. 001 für %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Nummer (Track), ohne führende Null</para></listitem>
<listitem><para>%g %{genre} Stil (Genre)</para></listitem>
......@@ -1391,6 +1395,7 @@ folgenden Codes übergeben werden:
<listitem><para>%c %{comment} Kommentar (Comment)</para></listitem>
<listitem><para>%y %{year} Jahr (Year)</para></listitem>
<listitem><para>%t %{track} Nummer (Track)</para></listitem>
<listitem><para>%t %{track.n} Nummer mit Feldlänge n (z.B. 001 für %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Nummer (Track), ohne führende Null</para></listitem>
<listitem><para>%g %{genre} Stil (Genre)</para></listitem>
<listitem><para>%b %{browser} Kommando zum Starten des Web Browsers</para></listitem>
......
kid3/doc/en/index.docbook
View file @ bc108520
......@@ -25,7 +25,7 @@
</copyright>
<legalnotice id="fdl-notice">&FDLNotice;</legalnotice>
<date>2009-02-18</date>
<date>2009-03-14</date>
<releaseinfo>1.2</releaseinfo>
<abstract>
......@@ -250,6 +250,7 @@ into the filename:
<listitem><para>%c %{comment} Comment</para></listitem>
<listitem><para>%y %{year} Year</para></listitem>
<listitem><para>%t %{track} Track (e.g. 01)</para></listitem>
<listitem><para>%t %{track.n} Track with field width n (e.g. 001 for %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Track (without leading zeroes, e.g. 1)</para></listitem>
<listitem><para>%g %{genre} Genre</para></listitem>
</itemizedlist>
......@@ -735,6 +736,7 @@ format, and the same codes are used plus some additional codes.
<listitem><para>%c %{comment} Comment</para></listitem>
<listitem><para>%y %{year} Year</para></listitem>
<listitem><para>%t %{track} Track (e.g. 01)</para></listitem>
<listitem><para>%t %{track.n} Track with field width n (e.g. 001 for %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Track (without leading zeroes, e.g. 1)</para></listitem>
<listitem><para>%g %{genre} Genre</para></listitem>
<listitem><para>%f %{file} File name</para></listitem>
......@@ -904,6 +906,7 @@ special codes are used to insert tag values into the directory name:
<listitem><para>%c %{comment} Comment</para></listitem>
<listitem><para>%y %{year} Year</para></listitem>
<listitem><para>%t %{track} Track (e.g. 01)</para></listitem>
<listitem><para>%t %{track.n} Track with field width n (e.g. 001 for %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Track (without leading zeroes, e.g. 1)</para></listitem>
<listitem><para>%g %{genre} Genre</para></listitem>
</itemizedlist>
......@@ -954,6 +957,7 @@ name format, import and export.
<listitem><para>%c %{comment} Comment</para></listitem>
<listitem><para>%y %{year} Year</para></listitem>
<listitem><para>%t %{track} Track (e.g. 01)</para></listitem>
<listitem><para>%t %{track.n} Track with field width n (e.g. 001 for %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Track (without leading zeroes, e.g. 1)</para></listitem>
<listitem><para>%g %{genre} Genre</para></listitem>
<listitem><para>%f %{file} File name</para></listitem>
......@@ -1295,6 +1299,7 @@ codes:
<listitem><para>%c %{comment} Comment</para></listitem>
<listitem><para>%y %{year} Year</para></listitem>
<listitem><para>%t %{track} Track (e.g. 01)</para></listitem>
<listitem><para>%t %{track.n} Track with field width n (e.g. 001 for %{track.3})</para></listitem>
<listitem><para>%T %{tracknumber} Track (without leading zeroes, e.g. 1)</para></listitem>
<listitem><para>%g %{genre} Genre</para></listitem>
<listitem><para>%b %{browser} Command to start the web browser</para></listitem>
......
kid3/kid3.lsm
View file @ bc108520
Begin4
Title: Kid3 -- Efficient Audio Tagger
Version: 1.2
Entered-date: 2009-02-18
Entered-date: 2009-03-14
Description: ID3 tagger to edit ID3v1.1, ID3v2.3, ID3v2.4, Ogg/Vorbis, FLAC
and MPC tags, multiple files, generate tags from file names
and vice versa, import and export album data in various formats.
......
kid3/kid3/frame.cpp
View file @ bc108520
......@@ -570,10 +570,20 @@ QString FrameFormatReplacer::getReplacement(const QString& code) const
}
if (!name.isNull()) {
if (name.QCM_toLower() == "year") {
QString lcName(name.QCM_toLower());
int fieldWidth = 2;
if (lcName == "year") {
name = "date";
} else if (name.QCM_toLower() == "tracknumber") {
} else if (lcName == "tracknumber") {
name = "track number";
} else if (lcName.startsWith("track.") && lcName.length() == 7 &&
lcName[6] >= '0' && lcName[6] <= '9') {
#if QT_VERSION >= 0x040000
fieldWidth = lcName[6].toLatin1() - '0';
#else
fieldWidth = lcName[6].latin1() - '0';
#endif
lcName = name = "track";
}
FrameCollection::iterator it = m_frames.findByName(name);
......@@ -585,11 +595,11 @@ QString FrameFormatReplacer::getReplacement(const QString& code) const
}
}
if (name.QCM_toLower() == "track") {
if (lcName == "track") {
bool ok;
int nr = Frame::numberWithoutTotal(result, &ok);
if (ok) {
result.sprintf("%02d", nr);
result.sprintf("%0*d", fieldWidth, nr);
}
}
}
......@@ -634,6 +644,10 @@ QString FrameFormatReplacer::getToolTip(bool onlyRows)
str += QCM_translate(I18N_NOOP("Track"));
str += " &quot;01&quot;</td></tr>\n";
str += "<tr><td>%t</td><td>%{track.3}</td><td>";
str += QCM_translate(I18N_NOOP("Track"));
str += " &quot;001&quot;</td></tr>\n";
str += "<tr><td>%T</td><td>%{tracknumber}</td><td>";
str += QCM_translate(I18N_NOOP("Track"));
str += " &quot;1&quot;</td></tr>\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment