diff options
15 files changed, 371 insertions, 131 deletions
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 0d3c8f13e..aeaba750f 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -27,6 +27,7 @@ #include <QSettings> #include <QDir> #include <QApplication> +#include <QFont> #include <qmmp/soundcore.h> #include <qmmp/decoder.h> @@ -61,7 +62,14 @@ PopupWidget::PopupWidget(QWidget *parent) int delay = settings.value("message_delay", 2000).toInt(); m_pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt(); setWindowOpacity(settings.value("opacity", 1.0).toDouble()); + QString fontname = settings.value("font").toString(); + m_coverSize = settings.value("cover_size", 48).toInt(); settings.endGroup(); + //font + QFont font; + if(!fontname.isEmpty()) + font.fromString(fontname); + setFont(font); //timer m_timer = new QTimer(this); m_timer->setInterval(delay); @@ -104,7 +112,15 @@ void PopupWidget::showMetaData() QPixmap pix = Decoder::findCover(core->metaData(Qmmp::URL)); if(!pix.isNull()) - m_pixlabel->setPixmap(pix.scaled(32,32)); + { + m_pixlabel->setFixedSize(m_coverSize,m_coverSize); + m_pixlabel->setPixmap(pix.scaled(m_coverSize,m_coverSize)); + } + else + { + m_pixlabel->setPixmap(QPixmap(":/notifier_icon.png")); + m_pixlabel->setFixedSize(32,32); + } qApp->processEvents(); resize(sizeHint()); qApp->processEvents(); diff --git a/src/plugins/General/notifier/popupwidget.h b/src/plugins/General/notifier/popupwidget.h index d059c4661..c7bbafeef 100644 --- a/src/plugins/General/notifier/popupwidget.h +++ b/src/plugins/General/notifier/popupwidget.h @@ -63,6 +63,7 @@ private: QLabel *m_label2; QLabel *m_pixlabel; uint m_pos; + int m_coverSize; }; diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index 6bb582e04..ba39add86 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include <QSettings> +#include <QFontDialog> #include <qmmp/qmmp.h> @@ -49,7 +50,15 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.songCheckBox->setChecked(settings.value("song_notification", TRUE).toBool()); ui.volumeCheckBox->setChecked(settings.value("volume_notification", TRUE).toBool()); ui.transparencySlider->setValue(100 - settings.value("opacity", 1.0).toDouble()*100); + QString fontname = settings.value ("font").toString(); + ui.sizeSpinBox->setValue(settings.value ("cover_size", 48).toInt()); settings.endGroup(); + QFont font; + if(!fontname.isEmpty()) + font.fromString(fontname); + ui.fontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); + ui.fontLabel->setFont(font); + connect (ui.fontButton, SIGNAL (clicked()), SLOT (setFont())); } @@ -72,6 +81,20 @@ void SettingsDialog::accept() 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.sizeSpinBox->value()); settings.endGroup(); QDialog::accept(); } + +void SettingsDialog::setFont() +{ + bool ok; + QFont font = ui.fontLabel->font(); + font = QFontDialog::getFont (&ok, font, this); + if (ok) + { + ui.fontLabel->setText (font.family () + " " + QString::number(font.pointSize ())); + ui.fontLabel->setFont(font); + } +} diff --git a/src/plugins/General/notifier/settingsdialog.h b/src/plugins/General/notifier/settingsdialog.h index 04cbc0516..e6b94c321 100644 --- a/src/plugins/General/notifier/settingsdialog.h +++ b/src/plugins/General/notifier/settingsdialog.h @@ -40,6 +40,9 @@ public: public slots: virtual void accept(); +private slots: + void setFont(); + private: 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 b321bccf1..0b3250f1a 100644 --- a/src/plugins/General/notifier/settingsdialog.ui +++ b/src/plugins/General/notifier/settingsdialog.ui @@ -5,14 +5,23 @@ <rect> <x>0</x> <y>0</y> - <width>244</width> - <height>349</height> + <width>284</width> + <height>403</height> </rect> </property> <property name="windowTitle" > <string>Notifier Plugin Settings</string> </property> <layout class="QGridLayout" name="gridLayout_3" > + <property name="leftMargin" > + <number>6</number> + </property> + <property name="rightMargin" > + <number>6</number> + </property> + <property name="bottomMargin" > + <number>6</number> + </property> <item row="0" column="0" colspan="2" > <widget class="QGroupBox" name="groupBox_2" > <property name="title" > @@ -50,6 +59,33 @@ </widget> </item> <item row="2" column="0" > + <widget class="QLabel" name="label_2" > + <property name="text" > + <string>Font:</string> + </property> + </widget> + </item> + <item row="2" column="1" > + <widget class="QLabel" name="fontLabel" > + <property name="frameShape" > + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow" > + <enum>QFrame::Sunken</enum> + </property> + <property name="text" > + <string/> + </property> + </widget> + </item> + <item row="3" column="0" > + <widget class="QLabel" name="label_5" > + <property name="text" > + <string>Cover size:</string> + </property> + </widget> + </item> + <item row="4" column="0" > <widget class="QLabel" name="label_3" > <property name="text" > <string>Delay, ms:</string> @@ -59,7 +95,7 @@ </property> </widget> </item> - <item row="2" column="1" colspan="2" > + <item row="4" column="1" colspan="2" > <widget class="QSpinBox" name="messageDelaySpinBox" > <property name="minimum" > <number>100</number> @@ -75,14 +111,14 @@ </property> </widget> </item> - <item row="3" column="0" > + <item row="5" column="0" > <widget class="QLabel" name="label_4" > <property name="text" > <string>Transparency</string> </property> </widget> </item> - <item row="3" column="1" > + <item row="5" column="1" > <widget class="QSlider" name="transparencySlider" > <property name="maximum" > <number>90</number> @@ -92,7 +128,7 @@ </property> </widget> </item> - <item row="3" column="2" > + <item row="5" column="2" > <widget class="QLabel" name="trasparencyLabel" > <property name="minimumSize" > <size> @@ -105,7 +141,7 @@ </property> </widget> </item> - <item row="4" column="0" > + <item row="6" column="0" > <spacer name="verticalSpacer_2" > <property name="orientation" > <enum>Qt::Vertical</enum> @@ -118,7 +154,7 @@ </property> </spacer> </item> - <item rowspan="3" row="4" column="1" colspan="2" > + <item rowspan="3" row="6" column="1" colspan="2" > <layout class="QGridLayout" name="gridLayout" > <property name="spacing" > <number>3</number> @@ -242,14 +278,14 @@ </item> </layout> </item> - <item row="5" column="0" > + <item row="7" column="0" > <widget class="QLabel" name="label" > <property name="text" > <string>Position</string> </property> </widget> </item> - <item row="6" column="0" > + <item row="8" column="0" > <spacer name="verticalSpacer" > <property name="orientation" > <enum>Qt::Vertical</enum> @@ -262,6 +298,26 @@ </property> </spacer> </item> + <item row="2" column="2" > + <widget class="QToolButton" name="fontButton" > + <property name="text" > + <string>...</string> + </property> + </widget> + </item> + <item row="3" column="1" colspan="2" > + <widget class="QSpinBox" name="sizeSpinBox" > + <property name="minimum" > + <number>32</number> + </property> + <property name="maximum" > + <number>80</number> + </property> + <property name="value" > + <number>48</number> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts index aace9951a..de301a8d5 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="cs"> +<!DOCTYPE TS><TS version="1.1" language="cs"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Hlasitost:</translation> </message> @@ -40,49 +39,64 @@ <translation>Nastavení notifikačního modulu</translation> </message> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Notifikace v Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Povolit notifikaci v Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Notifikace na pracovní ploše</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Umístění</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Upozornění na změnu skladby</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Upozornění na změnu hlasitosti</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Prodleva v ms:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Průhlednost</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 d84886950..35de3450e 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_de.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_de.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="1.1" language="de"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Lautstärke:</translation> </message> @@ -35,22 +34,22 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Psi-Benachrichtigungen</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Psi-Benachrichtigungen aktivieren</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Desktop-Benachrichtigungen</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Position</translation> </message> @@ -60,29 +59,44 @@ <translation>Einstellungen Benachrichtigungsmodul</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Benachrichtigung bei Titelwechsel</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Benachrichtigung bei Lautstärkeänderung</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Verzögerung, ms:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Transparenz</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 231d3e23f..1d6948ceb 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_it.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_it.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="it"> +<!DOCTYPE TS><TS version="1.1" language="it"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Volume:</translation> </message> @@ -35,22 +34,22 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Notifica Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Abilita notifica Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Notifica sul desktop</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Posizione</translation> </message> @@ -60,29 +59,44 @@ <translation>Impostazioni modulo notifica</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Notifica cambio brano</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Notifica modifica volume</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Ritardo, ms:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Trasparenza</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 4483f86c9..bec2cfe57 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="lt"> +<!DOCTYPE TS><TS version="1.1" language="lt"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Garsumas:</translation> </message> @@ -40,49 +39,64 @@ <translation>Notifier įskiepio nustatymai</translation> </message> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Psi pranešimas</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Įjungti Psi pranešimą</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Pranešimas darbalaukyje</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Padėtis</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Pranešti pasikeitus dainai</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Pranešti pasikeitus garsumui</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Užlaikymas (ms):</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Permatomumas</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 5a6558ed2..a8237d784 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pl.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pl.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="pl"> +<!DOCTYPE TS><TS version="1.1" language="pl"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Głośność:</translation> </message> @@ -40,49 +39,64 @@ <translation>Ustawienia wtyczki Notifier</translation> </message> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Powiadomienia Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Włącz powiadomienia Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Powiadomienie na pulpicie</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Pozycja</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Powiadamianie o zmianie głośności</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Opóźnienie, ms:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Przezroczystość</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Pozycja</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 bb071b4ec..0c7a9994f 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="ru_RU"> +<!DOCTYPE TS><TS version="1.1" language="ru_RU"> +<defaultcodec></defaultcodec> <context> <name>NotifierFactory</name> <message> @@ -27,7 +27,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Громкость:</translation> </message> @@ -40,49 +40,64 @@ <translation>Настройки модуля уведомлений</translation> </message> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Уведомление Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Включить уведомление Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Сообщение на рабочем столе</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Положение</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Уведомление о смене песни</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Уведомление о смене громкости</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Задержка, мс:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Прозрачность</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation>Шрифт:</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation>Размер обложки:</translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 d58d54ee2..64f1acc91 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="tr_TR"> +<!DOCTYPE TS><TS version="1.1" language="tr_TR"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Ses:</translation> </message> @@ -40,49 +39,64 @@ <translation>Bildirim Eklentisi Ayarları</translation> </message> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Psi Bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Psi bildirimi etkinleştir</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Masaüstü Bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Şarkı değişimi bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Ses değişimi bildirimi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Gecikme, ms:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Şeffaflık</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Konum</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 f980bf647..35d2bd006 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="uk"> +<!DOCTYPE TS><TS version="1.1" language="uk"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>Гучність:</translation> </message> @@ -40,49 +39,64 @@ <translation>Налаштування модуля повідомлень</translation> </message> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>Повідомлення Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>Увімкнути повідомлення Psi</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>Повідомлення на робочому столі</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>Позиція</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>Повідомлення зміни треку</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>Повідомлення зміни гучності</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>Затримка, мс:</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>Прозорість</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation></translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 3eea79f36..f535f8b61 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="zh_CN"> +<!DOCTYPE TS><TS version="1.1" language="zh_CN"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>音量：</translation> </message> @@ -35,22 +34,22 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>启用 PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>桌面通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>位置</translation> </message> @@ -60,29 +59,44 @@ <translation>通知插件设置</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>歌曲更改通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>音量更改通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>延迟(ms)：</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>透明度</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</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 696f4a8b1..c9648846e 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="zh_TW"> +<!DOCTYPE TS><TS version="1.1" language="zh_TW"> <context> <name>NotifierFactory</name> <message> @@ -27,7 +26,7 @@ <context> <name>PopupWidget</name> <message> - <location filename="../popupwidget.cpp" line="115"/> + <location filename="../popupwidget.cpp" line="136"/> <source>Volume:</source> <translation>音量：</translation> </message> @@ -35,22 +34,22 @@ <context> <name>SettingsDialog</name> <message> - <location filename="../settingsdialog.ui" line="19"/> + <location filename="../settingsdialog.ui" line="28"/> <source>Psi Notification</source> <translation>PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="25"/> + <location filename="../settingsdialog.ui" line="34"/> <source>Enable Psi notification</source> <translation>啟用 PSI 通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="35"/> + <location filename="../settingsdialog.ui" line="44"/> <source>Desktop Notification</source> <translation>桌面通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="248"/> + <location filename="../settingsdialog.ui" line="284"/> <source>Position</source> <translation>位置</translation> </message> @@ -60,29 +59,44 @@ <translation>通知插件設定</translation> </message> <message> - <location filename="../settingsdialog.ui" line="41"/> + <location filename="../settingsdialog.ui" line="50"/> <source>Song change notification</source> <translation>曲目改變通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="48"/> + <location filename="../settingsdialog.ui" line="57"/> <source>Volume change notification</source> <translation>音量改變通知</translation> </message> <message> - <location filename="../settingsdialog.ui" line="55"/> + <location filename="../settingsdialog.ui" line="91"/> <source>Delay, ms:</source> <translation>延遲(ms)：</translation> </message> <message> - <location filename="../settingsdialog.ui" line="81"/> + <location filename="../settingsdialog.ui" line="117"/> <source>Transparency</source> <translation>透明度</translation> </message> <message> - <location filename="../settingsdialog.ui" line="104"/> + <location filename="../settingsdialog.ui" line="140"/> <source>0</source> <translation>0</translation> </message> + <message> + <location filename="../settingsdialog.ui" line="64"/> + <source>Font:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="84"/> + <source>Cover size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../settingsdialog.ui" line="304"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> </context> </TS> |