diff options
Diffstat (limited to 'src')
32 files changed, 1486 insertions, 325 deletions
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 6ce89da44..e7b34b99e 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -30,6 +30,7 @@ #include <QFont> #include <qmmp/soundcore.h> #include <qmmp/metadatamanager.h> +#include <qmmpui/metadataformatter.h> #include "popupwidget.h" @@ -57,6 +58,7 @@ PopupWidget::PopupWidget(QWidget *parent) setWindowOpacity(settings.value("opacity", 1.0).toDouble()); QString fontname = settings.value("font").toString(); m_coverSize = settings.value("cover_size", 64).toInt(); + m_template = settings.value("template","").toString(); settings.endGroup(); //font QFont font; @@ -81,30 +83,19 @@ void PopupWidget::mousePressEvent (QMouseEvent *) void PopupWidget::showMetaData() { m_timer->stop(); + QString title = m_template; + SoundCore *core = SoundCore::instance(); - QString title = "<b>"; - if (core->metaData(Qmmp::TITLE).isEmpty()) - title.append(core->metaData(Qmmp::URL).section('/',-1)); - else - title.append(core->metaData(Qmmp::TITLE)); - title.append("</b>"); if (core->totalTime() > 0) { - title.append(" "); int l = core->totalTime()/1000; - title.append(QString("(%1:%2)").arg(l/60).arg(l%60, 2, 10, QChar('0'))); - } - if(!core->metaData(Qmmp::ARTIST).isEmpty()) - { - title.append("<br>"); - title.append(core->metaData(Qmmp::ARTIST)); + title.replace("%l",QString("%1:%2").arg(l/60).arg(l%60, 2, 10, QChar('0'))); } + else + title.replace("%l",""); + MetaDataFormatter f(title); + title = f.parse(core->metaData()); - if(!core->metaData(Qmmp::ALBUM).isEmpty()) - { - title.append("<br>"); - title.append(core->metaData(Qmmp::ALBUM)); - } m_label1->setText(title); QPixmap pix = MetaDataManager::instance()->getCover(core->metaData(Qmmp::URL)); diff --git a/src/plugins/General/notifier/popupwidget.h b/src/plugins/General/notifier/popupwidget.h index a845ea24c..7efcad04f 100644 --- a/src/plugins/General/notifier/popupwidget.h +++ b/src/plugins/General/notifier/popupwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2009 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -61,6 +61,7 @@ private: QTimer *m_timer; QLabel *m_label1; QLabel *m_pixlabel; + QString m_template; uint m_pos; int m_coverSize; diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index 9b2a18f30..3822e64aa 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -20,12 +20,13 @@ #include <QSettings> #include <QFontDialog> - +#include <QMenu> #include <qmmp/qmmp.h> - #include "popupwidget.h" #include "settingsdialog.h" +#define DEFAULT_TEMPLATE "<b>%if(%t,%t,%f)</b> \\(%l\\)\n%if(%p,<br>%p,)\n%if(%a,<br>%a,)" + SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { @@ -52,6 +53,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.transparencySlider->setValue(100 - settings.value("opacity", 1.0).toDouble()*100); QString fontname = settings.value ("font").toString(); ui.coverSizeSlider->setValue(settings.value ("cover_size", 64).toInt()); + ui.textEdit->setPlainText(settings.value ("template", DEFAULT_TEMPLATE).toString()); settings.endGroup(); QFont font; if(!fontname.isEmpty()) @@ -59,6 +61,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.fontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); ui.fontLabel->setFont(font); connect (ui.fontButton, SIGNAL (clicked()), SLOT (setFont())); + createMenu(); } @@ -80,9 +83,10 @@ void SettingsDialog::accept() settings.setValue("psi_notification", ui.psiCheckBox->isChecked()); settings.setValue("song_notification", ui.songCheckBox->isChecked()); settings.setValue("volume_notification", ui.volumeCheckBox->isChecked()); - settings.setValue ("opacity", 1.0 - (double)ui.transparencySlider->value()/100); - settings.setValue ("font", ui.fontLabel->font().toString()); - settings.setValue ("cover_size", ui.coverSizeSlider->value()); + settings.setValue("opacity", 1.0 - (double)ui.transparencySlider->value()/100); + settings.setValue("font", ui.fontLabel->font().toString()); + settings.setValue("cover_size", ui.coverSizeSlider->value()); + settings.setValue("template", ui.textEdit->toPlainText()); settings.endGroup(); QDialog::accept(); } @@ -98,3 +102,34 @@ void SettingsDialog::setFont() ui.fontLabel->setFont(font); } } + +void SettingsDialog::createMenu() +{ + QMenu *menu = new QMenu(this); + menu->addAction(tr("Artist"))->setData("%p"); + menu->addAction(tr("Album"))->setData("%a"); + menu->addAction(tr("Title"))->setData("%t"); + menu->addAction(tr("Track number"))->setData("%n"); + menu->addAction(tr("Two-digit track number"))->setData("%NN"); + menu->addAction(tr("Genre"))->setData("%g"); + menu->addAction(tr("Comment"))->setData("%c"); + menu->addAction(tr("Composer"))->setData("%C"); + menu->addAction(tr("Duration"))->setData("%l"); + menu->addAction(tr("Disc number"))->setData("%D"); + menu->addAction(tr("File name"))->setData("%f"); + menu->addAction(tr("File path"))->setData("%F"); + menu->addAction(tr("Year"))->setData("%y"); + menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)"); + ui.insertButton->setMenu(menu); + connect(menu, SIGNAL(triggered (QAction *)), SLOT(insertExpression(QAction *))); +} + +void SettingsDialog::insertExpression(QAction *a) +{ + ui.textEdit->insertPlainText(a->data().toString()); +} + +void SettingsDialog::on_resetButton_clicked() +{ + ui.textEdit->setPlainText(DEFAULT_TEMPLATE); +} diff --git a/src/plugins/General/notifier/settingsdialog.h b/src/plugins/General/notifier/settingsdialog.h index e6b94c321..245ca6f99 100644 --- a/src/plugins/General/notifier/settingsdialog.h +++ b/src/plugins/General/notifier/settingsdialog.h @@ -21,10 +21,10 @@ #define SETTINGSDIALOG_H #include <QDialog> - - #include "ui_settingsdialog.h" +class Action; + /** @author Ilya Kotov <forkotov02@hotmail.ru> */ @@ -42,8 +42,11 @@ public slots: private slots: void setFont(); + void insertExpression(QAction *); + void on_resetButton_clicked(); private: + void createMenu(); Ui::SettingsDialog ui; QMap<uint, QPushButton*> m_buttons; diff --git a/src/plugins/General/notifier/settingsdialog.ui b/src/plugins/General/notifier/settingsdialog.ui index d2e557a27..b38a112d0 100644 --- a/src/plugins/General/notifier/settingsdialog.ui +++ b/src/plugins/General/notifier/settingsdialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>298</width> - <height>403</height> + <width>529</width> + <height>325</height> </rect> </property> <property name="windowTitle"> @@ -23,24 +23,14 @@ <property name="bottomMargin"> <number>6</number> </property> - <item row="0" column="0" colspan="2"> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>Psi Notification</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QCheckBox" name="psiCheckBox"> - <property name="text"> - <string>Enable Psi notification</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="1" column="0" colspan="2"> + <item row="0" column="0" rowspan="2"> <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="title"> <string>Desktop Notification</string> </property> @@ -348,32 +338,104 @@ </layout> </widget> </item> - <item row="2" column="0" rowspan="2"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>131</width> - <height>31</height> - </size> + <item row="0" column="1"> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Notification Template</string> </property> - </spacer> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0" colspan="3"> + <widget class="QPlainTextEdit" name="textEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="1" column="0"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>138</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="resetButton"> + <property name="text"> + <string>Reset</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="insertButton"> + <property name="text"> + <string>Insert</string> + </property> + </widget> + </item> + </layout> + </widget> </item> - <item row="3" column="1"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <item row="1" column="1"> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Psi Notification</string> </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="psiCheckBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Enable Psi notification</string> + </property> + </widget> + </item> + </layout> </widget> </item> + <item row="2" column="0" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>131</width> + <height>31</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> <resources/> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts index d298d28ee..f938174f9 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Hlasitost:</translation> </message> @@ -40,65 +40,150 @@ <translation>Nastavení notifikačního modulu</translation> </message> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Notifikace v Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Povolit notifikaci v Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Notifikace na pracovní ploše</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation>Písmo:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation>Velikost obalu:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation>Prodleva (ms):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Umístění</translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Upozornění na změnu skladby</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Upozornění na změnu hlasitosti</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Průhlednost</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_de.ts b/src/plugins/General/notifier/translations/notifier_plugin_de.ts index 2eb38c8ce..7e55f1ed2 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_de.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_de.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Lautstärke:</translation> </message> @@ -35,27 +35,27 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Psi-Benachrichtigungen</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Psi-Benachrichtigungen aktivieren</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Desktop-Benachrichtigungen</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation>Anzeigedauer (ms):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Position</translation> </message> @@ -65,40 +65,125 @@ <translation>Einstellungen Benachrichtigungsmodul</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Benachrichtigung bei Titelwechsel</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Benachrichtigung bei Lautstärkeänderung</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Transparenz</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation>Schriftart:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation>Cover-Größe:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation>...</translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_it.ts b/src/plugins/General/notifier/translations/notifier_plugin_it.ts index 584ba5e33..98a789ae9 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_it.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_it.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Volume:</translation> </message> @@ -35,27 +35,27 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Notifica Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Abilita notifica Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Notifica sul desktop</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Posizione</translation> </message> @@ -65,40 +65,125 @@ <translation>Impostazioni modulo notifica</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Notifica cambio brano</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Notifica modifica volume</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Trasparenza</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts index 059e4758b..fd9644f9b 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Garsumas:</translation> </message> @@ -40,65 +40,150 @@ <translation>Notifier įskiepio nustatymai</translation> </message> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Psi pranešimas</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Įjungti Psi pranešimą</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Pranešimas darbalaukyje</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Padėtis</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Pranešti pasikeitus dainai</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Pranešti pasikeitus garsumui</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Permatomumas</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_pl.ts b/src/plugins/General/notifier/translations/notifier_plugin_pl.ts index 6a3d7354b..1a379b2da 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pl.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pl.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Głośność:</translation> </message> @@ -40,65 +40,150 @@ <translation>Ustawienia wtyczki Notifier</translation> </message> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Powiadomienia Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Włącz powiadomienia Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Powiadomienie na pulpicie</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Pozycja</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Powiadamianie o zmianie głośności</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Przezroczystość</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Pozycja</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation>Czcionka:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation>Wielkość okładki:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation>Opóźnienie (ms):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts index 3956be1be..4f86dcba6 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Громкость:</translation> </message> @@ -40,65 +40,150 @@ <translation>Настройки модуля уведомлений</translation> </message> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Уведомление Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Включить уведомление Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Сообщение на рабочем столе</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation>Задежка (мс):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Положение</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Уведомление о смене песни</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Уведомление о смене громкости</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Прозрачность</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation></translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation>Шрифт:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation>Размер обложки:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts index c6f3f6655..9e41e4317 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Ses:</translation> </message> @@ -40,65 +40,150 @@ <translation>Bildirim Eklentisi Ayarları</translation> </message> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Psi Bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Psi bildirimi etkinleştir</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Masaüstü Bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Şarkı değişimi bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Ses değişimi bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Şeffaflık</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Konum</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation>Шрифт:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation>Размер обложки:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation>Задержка (мс):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts index 2155188b6..6c40a12a9 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>Гучність:</translation> </message> @@ -40,65 +40,150 @@ <translation>Налаштування модуля повідомлень</translation> </message> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>Повідомлення Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>Увімкнути повідомлення Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>Повідомлення на робочому столі</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation>Затримка (мс):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>Позиція</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>Повідомлення зміни треку</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>Повідомлення зміни гучності</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>Прозорість</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation></translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation>Шрифт:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation>Розмір обкладинки:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation>...</translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts index 7a89f8691..2db3cd6ab 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>音量：</translation> </message> @@ -35,27 +35,27 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>启用 PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>桌面通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>位置</translation> </message> @@ -65,40 +65,125 @@ <translation>通知插件设置</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>歌曲更改通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>音量更改通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>透明度</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts index 60ed5b227..0ffda28b4 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="136"/> + <location filename="../popupwidget.cpp" line="127"/> <source>Volume:</source> <translation>音量：</translation> </message> @@ -35,27 +35,27 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="29"/> + <location filename="../settingsdialog.ui" line="390"/> <source>Psi Notification</source> <translation>PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="402"/> <source>Enable Psi notification</source> <translation>啟用 PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="45"/> + <location filename="../settingsdialog.ui" line="35"/> <source>Desktop Notification</source> <translation>桌面通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="85"/> + <location filename="../settingsdialog.ui" line="75"/> <source>Delay (ms):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="291"/> + <location filename="../settingsdialog.ui" line="281"/> <source>Position</source> <translation>位置</translation> </message> @@ -65,40 +65,125 @@ <translation>通知插件設定</translation> </message> <message> - <location filename="../settingsdialog.ui" line="51"/> + <location filename="../settingsdialog.ui" line="41"/> <source>Song change notification</source> <translation>曲目改變通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="58"/> + <location filename="../settingsdialog.ui" line="48"/> <source>Volume change notification</source> <translation>音量改變通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="111"/> + <location filename="../settingsdialog.ui" line="101"/> <source>Transparency</source> <translation>透明度</translation> </message> <message> - <location filename="../settingsdialog.ui" line="134"/> - <location filename="../settingsdialog.ui" line="344"/> + <location filename="../settingsdialog.ui" line="124"/> + <location filename="../settingsdialog.ui" line="334"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="65"/> + <location filename="../settingsdialog.ui" line="344"/> + <source>Notification Template</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="373"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="380"/> + <source>Insert</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="55"/> <source>Font:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="318"/> + <location filename="../settingsdialog.ui" line="308"/> <source>Cover size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../settingsdialog.ui" line="311"/> + <location filename="../settingsdialog.ui" line="301"/> <source>...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../settingsdialog.cpp" line="109"/> + <source>Artist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="110"/> + <source>Album</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="111"/> + <source>Title</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="112"/> + <source>Track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="113"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="114"/> + <source>Genre</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="115"/> + <source>Comment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="116"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="117"/> + <source>Duration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="118"/> + <source>Disc number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="119"/> + <source>File name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="120"/> + <source>File path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="121"/> + <source>Year</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.cpp" line="122"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> </context> </TS> diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index 84b640b7a..595cf4f0c 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -39,6 +39,7 @@ SET(libqmmpui_SRCS detailsdialog.cpp tageditor.cpp playlistmanager.cpp + metadataformatter.cpp ) SET(libqmmpui_MOC_HDRS @@ -62,6 +63,7 @@ SET(libqmmpui_MOC_HDRS detailsdialog.h tageditor.h playlistmanager.h + metadataformatter.h ) SET(libqmmpui_DEVEL_HDRS @@ -81,6 +83,7 @@ SET(libqmmpui_DEVEL_HDRS detailsdialog.h tageditor.h playlistmanager.h + metadataformatter.h ) diff --git a/src/qmmpui/metadataformatter.cpp b/src/qmmpui/metadataformatter.cpp new file mode 100644 index 000000000..9a055f4e9 --- /dev/null +++ b/src/qmmpui/metadataformatter.cpp @@ -0,0 +1,98 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + + +/* +Syntax: +%p - artist +%a - album +%t - title +%n - track, +%NN - 2-digit track +%g - genre +%c - comment +%C - composer +%D - disc number +%f - file name +%F - full path +%y - year +%if(A,B,C) +%if(A&B&C,D,E) +*/ + +#include <QStringList> +#include <QUrl> +#include "metadataformatter.h" + +MetaDataFormatter::MetaDataFormatter(const QString &format) +{ + m_format = format; +} + +QString MetaDataFormatter::parse(const QMap<Qmmp::MetaData, QString> metaData) +{ + QString title = m_format; + title.replace("\\(", "%28"); + title.replace("\\)", "%29"); + title.replace(")", "%)"); + title.replace("&", "%&"); + title.replace("%p", metaData[Qmmp::ARTIST]); + title.replace("%a", metaData[Qmmp::ALBUM]); + title.replace("%t", metaData[Qmmp::TITLE]); + title.replace("%n", metaData[Qmmp::TRACK]); + title.replace("%NN", QString("%1").arg(metaData[Qmmp::TRACK],2,'0')); + title.replace("%g", metaData[Qmmp::GENRE]); + title.replace("%c", metaData[Qmmp::COMMENT]); + title.replace("%C", metaData[Qmmp::COMPOSER]); + title.replace("%D", metaData[Qmmp::DISCNUMBER]); + title.replace("%f", metaData[Qmmp::URL].section('/',-1)); + title.replace("%F", metaData[Qmmp::URL]); + title.replace("%y", metaData[Qmmp::YEAR]); + + if(title.contains("%if")) + title = processIfKeyWord(title); + title.replace("%28", "("); + title.replace("%29", ")"); + return title; +} + +QString MetaDataFormatter::processIfKeyWord(QString title) +{ + int pos = title.indexOf("%if("); + int size = title.indexOf("%)",pos) - pos; + + QStringList args = title.mid (pos + 4, size - 4).split(","); + if(args.count() < 3) + { + qWarning("TitleFormatter: invalid title format"); + return title; + } + //process condition + bool cond = TRUE; + foreach(QString arg, args.at(0).split("%&")) + { + cond &= !arg.isEmpty(); + } + QString r_str = cond ? args.at(1) : args.at(2); + title.replace (pos, size + 2, r_str); + if(title.contains("%if")) + return processIfKeyWord(title); + return title; +} diff --git a/src/qmmpui/metadataformatter.h b/src/qmmpui/metadataformatter.h new file mode 100644 index 000000000..c826cb499 --- /dev/null +++ b/src/qmmpui/metadataformatter.h @@ -0,0 +1,43 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef METADATAFORMATTER_H +#define METADATAFORMATTER_H + +#include <QString> +#include <QMap> +#include <qmmp/qmmp.h> + +/*! + * @author Ilya Kotov <forkotov02@hotmail.ru> + */ +class MetaDataFormatter +{ +public: + MetaDataFormatter(const QString &format); + QString parse(const QMap<Qmmp::MetaData, QString> metaData); + +private: + QString m_format; + QString processIfKeyWord(QString title); + +}; + +#endif // METADATAFORMATTER_H diff --git a/src/qmmpui/playlistitem.cpp b/src/qmmpui/playlistitem.cpp index 60422aee1..3bb57963a 100644 --- a/src/qmmpui/playlistitem.cpp +++ b/src/qmmpui/playlistitem.cpp @@ -21,6 +21,7 @@ #include <QDir> #include <qmmp/metadatamanager.h> +#include "metadataformatter.h" #include "playlistsettings.h" #include "playlistitem.h" @@ -117,18 +118,8 @@ void PlayListItem::setText(const QString &title) void PlayListItem::readMetadata() { - m_title = PlaylistSettings::instance()->format(); - 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", 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", year ()); + MetaDataFormatter f(PlaylistSettings::instance()->format()); + m_title = f.parse(metaData()); //TODO rewrite this if (m_title.isEmpty()) { @@ -143,30 +134,3 @@ void PlayListItem::readMetadata() if (PlaylistSettings::instance()->convertTwenty()) m_title.replace("%20", " "); } - -QString PlayListItem::printTag(QString str, QString regExp, QString tagStr) -{ - QString format = PlaylistSettings::instance()->format(); - if (!tagStr.isEmpty()) - str.replace(regExp, tagStr); - else - { - //remove unused separators - int regExpPos = str.indexOf(regExp); - if (regExpPos < 0) - return str; - int nextPos = str.indexOf("%", regExpPos + 1); - if (nextPos < 0) - { - //last separator - regExpPos = format.lastIndexOf(regExp); - nextPos = format.lastIndexOf("%", regExpPos - 1); - QString lastSep = format.right (format.size() - nextPos - 2); - str.remove(lastSep); - str.remove(regExp); - } - else - str.remove ( regExpPos, nextPos - regExpPos); - } - return str; -} diff --git a/src/qmmpui/playlistitem.h b/src/qmmpui/playlistitem.h index 86d89d50d..c1bec3e38 100644 --- a/src/qmmpui/playlistitem.h +++ b/src/qmmpui/playlistitem.h @@ -104,7 +104,6 @@ public: private: void readMetadata(); - QString printTag(QString str, QString regExp, QString tagStr); QString m_title; FileInfo *m_info; bool m_selected; diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp index 0b41c80f5..eeae7cb3b 100644 --- a/src/ui/configdialog.cpp +++ b/src/ui/configdialog.cpp @@ -582,13 +582,15 @@ void ConfigDialog::createMenus() menu->addAction(tr("Album"))->setData("%a"); menu->addAction(tr("Title"))->setData("%t"); menu->addAction(tr("Track number"))->setData("%n"); - menu->addAction(tr("Disc number"))->setData("%D"); + menu->addAction(tr("Two-digit track number"))->setData("%NN"); menu->addAction(tr("Genre"))->setData("%g"); + menu->addAction(tr("Comment"))->setData("%c"); menu->addAction(tr("Composer"))->setData("%C"); + menu->addAction(tr("Disc number"))->setData("%D"); menu->addAction(tr("File name"))->setData("%f"); menu->addAction(tr("File path"))->setData("%F"); menu->addAction(tr("Year"))->setData("%y"); - menu->addAction(tr("Comment"))->setData("%c"); + menu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)"); ui.titleButton->setMenu(menu); ui.titleButton->setPopupMode(QToolButton::InstantPopup); diff --git a/src/ui/translations/qmmp_cs.ts b/src/ui/translations/qmmp_cs.ts index b6382bfaa..c0fe62a91 100644 --- a/src/ui/translations/qmmp_cs.ts +++ b/src/ui/translations/qmmp_cs.ts @@ -221,21 +221,31 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation>Číslo disku</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation>Skladatel</translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation>Název souboru</translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation>Cesta k souboru</translation> </message> @@ -245,12 +255,12 @@ <translation>Žánr</translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Rok</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Komentář</translation> </message> @@ -515,12 +525,12 @@ <translation>Převést %20 na mezery</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Vybrat soubory s tématy</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Soubory s tématy</translation> </message> diff --git a/src/ui/translations/qmmp_de.ts b/src/ui/translations/qmmp_de.ts index be1713b81..1ebcf77e1 100644 --- a/src/ui/translations/qmmp_de.ts +++ b/src/ui/translations/qmmp_de.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation>CD-Nummer</translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>Genre</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation>Komponist</translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation>Dateiname</translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation>Dateipfad</translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Jahr</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Kommentar</translation> </message> @@ -515,12 +525,12 @@ <translation>%20 in Leerzeichen umwandeln</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Design-Dateien auswählen</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Design-Dateien</translation> </message> diff --git a/src/ui/translations/qmmp_it.ts b/src/ui/translations/qmmp_it.ts index 3d3c143f1..096627d24 100644 --- a/src/ui/translations/qmmp_it.ts +++ b/src/ui/translations/qmmp_it.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>Genere</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Anno</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Commento</translation> </message> @@ -515,12 +525,12 @@ <translation>Converti il carattere « %20 » in spazi</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Seleziona aspetto</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Aspetto</translation> </message> diff --git a/src/ui/translations/qmmp_lt.ts b/src/ui/translations/qmmp_lt.ts index 24d57bdf5..fc9c649da 100644 --- a/src/ui/translations/qmmp_lt.ts +++ b/src/ui/translations/qmmp_lt.ts @@ -221,21 +221,31 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> - <source>Composer</source> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> <translation type="unfinished"></translation> </message> <message> <location filename="../configdialog.cpp" line="588"/> + <source>Composer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation type="unfinished"></translation> </message> @@ -245,12 +255,12 @@ <translation>Žanras</translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Metai</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Komentaras</translation> </message> @@ -515,12 +525,12 @@ <translation type="unfinished">Konvertuoti %20 į tarpus</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Pasirinkti temų bylas</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Temų bylos</translation> </message> diff --git a/src/ui/translations/qmmp_pl_PL.ts b/src/ui/translations/qmmp_pl_PL.ts index 4f08a57a3..9ff9b6c33 100644 --- a/src/ui/translations/qmmp_pl_PL.ts +++ b/src/ui/translations/qmmp_pl_PL.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation>Numer albumu</translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>Gatunek</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation>Kompozytor</translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation>Nazwa pliku</translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation>Lokalizacja</translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Rok</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Komentarz</translation> </message> @@ -515,12 +525,12 @@ <translation>Konwertuj sekwencje %20 na spacje</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Wybierz skórę</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Pliki skór</translation> </message> diff --git a/src/ui/translations/qmmp_pt_BR.ts b/src/ui/translations/qmmp_pt_BR.ts index 82796c0ac..2a5404bcc 100644 --- a/src/ui/translations/qmmp_pt_BR.ts +++ b/src/ui/translations/qmmp_pt_BR.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation type="unfinished">Gênero</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation type="unfinished">Ano</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation type="unfinished">Comentário</translation> </message> @@ -515,12 +525,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation type="unfinished"></translation> </message> diff --git a/src/ui/translations/qmmp_ru.ts b/src/ui/translations/qmmp_ru.ts index 9c41298b2..e0f5a4844 100644 --- a/src/ui/translations/qmmp_ru.ts +++ b/src/ui/translations/qmmp_ru.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation>Номер диска</translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>Жанр</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation>Композитор</translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation>Имя файла</translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation>Путь к файлу</translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Год</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Комментарий</translation> </message> @@ -515,12 +525,12 @@ <translation>Преобразовывать %20 в пробел</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Выберите файлы обложек</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Файлы обложек</translation> </message> diff --git a/src/ui/translations/qmmp_tr.ts b/src/ui/translations/qmmp_tr.ts index b1bb9cfb4..945e96f82 100644 --- a/src/ui/translations/qmmp_tr.ts +++ b/src/ui/translations/qmmp_tr.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>Tarz</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Yıl</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Yorum</translation> </message> @@ -515,12 +525,12 @@ <translation>%20 yi boşluğa çevir</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Kabuk Dosyası Seç</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Kabuk dosyaları</translation> </message> diff --git a/src/ui/translations/qmmp_uk_UA.ts b/src/ui/translations/qmmp_uk_UA.ts index 85463afb6..33ce0b2a9 100644 --- a/src/ui/translations/qmmp_uk_UA.ts +++ b/src/ui/translations/qmmp_uk_UA.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation>Номер диску</translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>Жанр</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation>Композитор</translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation>Ім'я файлу</translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation>Шлях файлу</translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>Рік</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>Коментар</translation> </message> @@ -515,12 +525,12 @@ <translation>Конвертувати %20 в пробіл</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>Вибрати файли скінів</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>Файли скінів</translation> </message> diff --git a/src/ui/translations/qmmp_zh_CN.ts b/src/ui/translations/qmmp_zh_CN.ts index d3d966487..03b612fe9 100644 --- a/src/ui/translations/qmmp_zh_CN.ts +++ b/src/ui/translations/qmmp_zh_CN.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>流派</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>年代</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>备注</translation> </message> @@ -515,12 +525,12 @@ <translation>转换 %20 为空格</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>选择皮肤文件</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>皮肤文件</translation> </message> diff --git a/src/ui/translations/qmmp_zh_TW.ts b/src/ui/translations/qmmp_zh_TW.ts index 97c1414db..46d974fd2 100644 --- a/src/ui/translations/qmmp_zh_TW.ts +++ b/src/ui/translations/qmmp_zh_TW.ts @@ -221,36 +221,46 @@ </message> <message> <location filename="../configdialog.cpp" line="585"/> + <source>Two-digit track number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../configdialog.cpp" line="589"/> <source>Disc number</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../configdialog.cpp" line="593"/> + <source>Condition</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../configdialog.cpp" line="586"/> <source>Genre</source> <translation>流派</translation> </message> <message> - <location filename="../configdialog.cpp" line="587"/> + <location filename="../configdialog.cpp" line="588"/> <source>Composer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="588"/> + <location filename="../configdialog.cpp" line="590"/> <source>File name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="589"/> + <location filename="../configdialog.cpp" line="591"/> <source>File path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../configdialog.cpp" line="590"/> + <location filename="../configdialog.cpp" line="592"/> <source>Year</source> <translation>年代</translation> </message> <message> - <location filename="../configdialog.cpp" line="591"/> + <location filename="../configdialog.cpp" line="587"/> <source>Comment</source> <translation>備註</translation> </message> @@ -515,12 +525,12 @@ <translation>轉換 %20 為空格</translation> </message> <message> - <location filename="../configdialog.cpp" line="726"/> + <location filename="../configdialog.cpp" line="728"/> <source>Select Skin Files</source> <translation>選取皮膚檔案</translation> </message> <message> - <location filename="../configdialog.cpp" line="727"/> + <location filename="../configdialog.cpp" line="729"/> <source>Skin files</source> <translation>皮膚檔案</translation> </message> |