aboutsummaryrefslogtreecommitdiff
path: root/src/qmmpui
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmmpui')
-rw-r--r--src/qmmpui/abstractplaylistitem.cpp10
-rw-r--r--src/qmmpui/abstractplaylistitem.h10
-rw-r--r--src/qmmpui/playlistitem.cpp5
-rw-r--r--src/qmmpui/playlistmodel.cpp16
-rw-r--r--src/qmmpui/playlistmodel.h3
-rw-r--r--src/qmmpui/translations/libqmmpui_cs.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_de.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_it.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_lt.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_pl.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_pt_BR.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_ru.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_tr.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_uk_UA.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_zh_CN.ts10
-rw-r--r--src/qmmpui/translations/libqmmpui_zh_TW.ts10
16 files changed, 148 insertions, 6 deletions
diff --git a/src/qmmpui/abstractplaylistitem.cpp b/src/qmmpui/abstractplaylistitem.cpp
index 164d7c500..4c8a0f561 100644
--- a/src/qmmpui/abstractplaylistitem.cpp
+++ b/src/qmmpui/abstractplaylistitem.cpp
@@ -54,6 +54,11 @@ const QString AbstractPlaylistItem::genre () const
return m_metaData.value(Qmmp::GENRE);
}
+const QString AbstractPlaylistItem::composer() const
+{
+ return m_metaData.value(Qmmp::COMPOSER);
+}
+
const QString AbstractPlaylistItem::track () const
{
return m_metaData.value(Qmmp::TRACK);
@@ -64,6 +69,11 @@ const QString AbstractPlaylistItem::year () const
return m_metaData.value(Qmmp::YEAR);
}
+const QString AbstractPlaylistItem::discNumber () const
+{
+ return m_metaData.value(Qmmp::DISCNUMBER);
+}
+
const QString AbstractPlaylistItem::url () const
{
return m_metaData.value(Qmmp::URL);
diff --git a/src/qmmpui/abstractplaylistitem.h b/src/qmmpui/abstractplaylistitem.h
index 2294ff73a..149291ace 100644
--- a/src/qmmpui/abstractplaylistitem.h
+++ b/src/qmmpui/abstractplaylistitem.h
@@ -55,10 +55,14 @@ public:
*/
const QString comment () const;
/*!
- * Returns gnere.
+ * Returns genre.
*/
const QString genre () const;
/*!
+ * Returns composer.
+ */
+ const QString composer() const;
+ /*!
* Returns track number.
*/
const QString track () const;
@@ -67,6 +71,10 @@ public:
*/
const QString year () const;
/*!
+ * Returns disc number.
+ */
+ const QString discNumber () const;
+ /*!
* Returns stream url or local file path.
*/
const QString url () const;
diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp
index 7912c502b..bacd3f803 100644
--- a/src/qmmpui/playlistitem.cpp
+++ b/src/qmmpui/playlistitem.cpp
@@ -114,8 +114,11 @@ void PlayListItem::readMetadata()
m_title = printTag(m_title, "%p", artist());
m_title = printTag(m_title, "%a", album());
m_title = printTag(m_title, "%t", title());
- m_title = printTag(m_title, "%n", QString("%1").arg(track()));
+ m_title = printTag(m_title, "%n", track());
+ m_title = printTag(m_title, "%c", comment());
+ m_title = printTag(m_title, "%C", composer());
m_title = printTag(m_title, "%g", genre());
+ m_title = printTag(m_title, "%D", discNumber());
m_title = printTag(m_title, "%f", url().section('/',-1));
m_title = printTag(m_title, "%F", url());
m_title = printTag(m_title, "%y", QString("%1").arg(year ()));
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index e0fc19ea3..539ed12e7 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -366,13 +366,17 @@ void PlayListModel::showDetails()
str.append(tr("Artist:") + " %3\n");
str.append(tr("Album:") + " %4\n");
str.append(tr("Genre:") + " %5\n");
- str.append(tr("Comment:") + " %6");
+ str.append(tr("Comment:") + " %6\n");
+ str.append(tr("Composer:") + " %7\n");
+ str.append(tr("Disc number:") + " %8");
str = str.arg(item->url())
.arg(item->title().isEmpty() ? item->text() : item->title())
.arg(item->artist())
.arg(item->album())
.arg(item->genre())
- .arg(item->comment());
+ .arg(item->comment())
+ .arg(item->composer())
+ .arg(item->discNumber());
QMessageBox::information(0, m_items.at(i)->url(), str);
return;
}
@@ -430,10 +434,14 @@ void PlayListModel::readSettings()
infoList.last()->setMetaData(Qmmp::COMMENT, value);
else if (param == "genre")
infoList.last()->setMetaData(Qmmp::GENRE, value);
+ else if (param == "composer")
+ infoList.last()->setMetaData(Qmmp::COMPOSER, value);
else if (param == "year")
infoList.last()->setMetaData(Qmmp::YEAR, value);
else if (param == "track")
infoList.last()->setMetaData(Qmmp::TRACK, value);
+ else if (param == "disc")
+ infoList.last()->setMetaData(Qmmp::DISCNUMBER, value);
else if (param == "length")
infoList.last()->setLength(value.toInt());
}
@@ -459,9 +467,11 @@ void PlayListModel::writeSettings()
file.write(QString("album=%1").arg(m->album()).toUtf8() +"\n");
file.write(QString("comment=%1").arg(m->comment()).toUtf8() +"\n");
file.write(QString("genre=%1").arg(m->genre()).toUtf8() +"\n");
+ file.write(QString("composer=%1").arg(m->composer()).toUtf8() +"\n");
file.write(QString("year=%1").arg(m->year()).toUtf8() +"\n");
file.write(QString("track=%1").arg(m->track()).toUtf8() +"\n");
- file.write(QString("length=%1").arg(m->length()).toUtf8() +"\n");
+ file.write(QString("disc=%1").arg(m->discNumber()).toUtf8() +"\n");
+ file.write(QString("length=%1").arg(m->length()).toUtf8() +"\n");
}
file.close();
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 6b838f9c1..0df987e55 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -418,7 +418,8 @@ public slots:
/*!
* Sets short title format
* @param format title format. (Expressions: "%p" - artist, "%a" - album, "%t" - title, "%n" - track,
- * "%g" - genre, "%f" - file name, "%F" - full path, "%y" - year)
+ * "%g" - genre, "%c" - comment, "%C" - composer, "%D" - disc number "%f" - file name, "
+ * %F" - full path, "%y" - year)
*/
void setFormat(const QString &format);
/*!
diff --git a/src/qmmpui/translations/libqmmpui_cs.ts b/src/qmmpui/translations/libqmmpui_cs.ts
index 38157ed0c..156be2117 100644
--- a/src/qmmpui/translations/libqmmpui_cs.ts
+++ b/src/qmmpui/translations/libqmmpui_cs.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Poznámka:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_de.ts b/src/qmmpui/translations/libqmmpui_de.ts
index 7b9496879..034a5d98f 100644
--- a/src/qmmpui/translations/libqmmpui_de.ts
+++ b/src/qmmpui/translations/libqmmpui_de.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Kommentar:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_it.ts b/src/qmmpui/translations/libqmmpui_it.ts
index 083e66552..96e14ea2d 100644
--- a/src/qmmpui/translations/libqmmpui_it.ts
+++ b/src/qmmpui/translations/libqmmpui_it.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Commento:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_lt.ts b/src/qmmpui/translations/libqmmpui_lt.ts
index 5e248b3d2..97c4d5be3 100644
--- a/src/qmmpui/translations/libqmmpui_lt.ts
+++ b/src/qmmpui/translations/libqmmpui_lt.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Komantaras:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_pl.ts b/src/qmmpui/translations/libqmmpui_pl.ts
index 8fcbd9fed..da18f1588 100644
--- a/src/qmmpui/translations/libqmmpui_pl.ts
+++ b/src/qmmpui/translations/libqmmpui_pl.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Komentarz:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_pt_BR.ts b/src/qmmpui/translations/libqmmpui_pt_BR.ts
index ecdd051dd..df6805917 100644
--- a/src/qmmpui/translations/libqmmpui_pt_BR.ts
+++ b/src/qmmpui/translations/libqmmpui_pt_BR.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_ru.ts b/src/qmmpui/translations/libqmmpui_ru.ts
index 9f64635e5..b401dcb92 100644
--- a/src/qmmpui/translations/libqmmpui_ru.ts
+++ b/src/qmmpui/translations/libqmmpui_ru.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Комментарий:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_tr.ts b/src/qmmpui/translations/libqmmpui_tr.ts
index 01a092250..ff98b2461 100644
--- a/src/qmmpui/translations/libqmmpui_tr.ts
+++ b/src/qmmpui/translations/libqmmpui_tr.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Yorum:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_uk_UA.ts b/src/qmmpui/translations/libqmmpui_uk_UA.ts
index 5b101ddfd..d544bec63 100644
--- a/src/qmmpui/translations/libqmmpui_uk_UA.ts
+++ b/src/qmmpui/translations/libqmmpui_uk_UA.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>Коментар:</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_zh_CN.ts b/src/qmmpui/translations/libqmmpui_zh_CN.ts
index 14ec10c35..925b1e51a 100644
--- a/src/qmmpui/translations/libqmmpui_zh_CN.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_CN.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>备注：</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
diff --git a/src/qmmpui/translations/libqmmpui_zh_TW.ts b/src/qmmpui/translations/libqmmpui_zh_TW.ts
index 9a2a85dd8..950477659 100644
--- a/src/qmmpui/translations/libqmmpui_zh_TW.ts
+++ b/src/qmmpui/translations/libqmmpui_zh_TW.ts
@@ -33,6 +33,16 @@
<source>Comment:</source>
<translation>備註：</translation>
</message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="370"/>
+ <source>Composer:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../playlistmodel.cpp" line="371"/>
+ <source>Disc number:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>QtFileDialogFactory</name>
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-25 12:28:39 +0000