From 727577dc875a62dcd93fe95542cbae8fdd363ddc Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 15 Aug 2009 09:45:58 +0000 Subject: notifier plugin: added font and cover size settings git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1141 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/notifier/popupwidget.cpp | 18 ++++- src/plugins/General/notifier/popupwidget.h | 1 + src/plugins/General/notifier/settingsdialog.cpp | 23 +++++++ src/plugins/General/notifier/settingsdialog.h | 3 + src/plugins/General/notifier/settingsdialog.ui | 76 +++++++++++++++++++--- .../notifier/translations/notifier_plugin_cs.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_de.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_it.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_lt.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_pl.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_ru.ts | 39 +++++++---- .../notifier/translations/notifier_plugin_tr.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_uk_UA.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_zh_CN.ts | 38 +++++++---- .../notifier/translations/notifier_plugin_zh_TW.ts | 38 +++++++---- 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 #include #include +#include #include #include @@ -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 +#include #include @@ -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 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 @@ 0 0 - 244 - 349 + 284 + 403 Notifier Plugin Settings + + 6 + + + 6 + + + 6 + @@ -50,6 +59,33 @@ + + + Font: + + + + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + + + + + + Cover size: + + + + Delay, ms: @@ -59,7 +95,7 @@ - + 100 @@ -75,14 +111,14 @@ - + Transparency - + 90 @@ -92,7 +128,7 @@ - + @@ -105,7 +141,7 @@ - + Qt::Vertical @@ -118,7 +154,7 @@ - + 3 @@ -242,14 +278,14 @@ - + Position - + Qt::Vertical @@ -262,6 +298,26 @@ + + + + ... + + + + + + + 32 + + + 80 + + + 48 + + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Hlasitost: @@ -40,49 +39,64 @@ Nastavení notifikačního modulu - + Psi Notification Notifikace v Psi - + Enable Psi notification Povolit notifikaci v Psi - + Desktop Notification Notifikace na pracovní ploše - + Position Umístění - + Song change notification Upozornění na změnu skladby - + Volume change notification Upozornění na změnu hlasitosti - + Delay, ms: Prodleva v ms: - + Transparency Průhlednost - + 0 0 + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Lautstärke: @@ -35,22 +34,22 @@ SettingsDialog - + Psi Notification Psi-Benachrichtigungen - + Enable Psi notification Psi-Benachrichtigungen aktivieren - + Desktop Notification Desktop-Benachrichtigungen - + Position Position @@ -60,29 +59,44 @@ Einstellungen Benachrichtigungsmodul - + Song change notification Benachrichtigung bei Titelwechsel - + Volume change notification Benachrichtigung bei Lautstärkeänderung - + Delay, ms: Verzögerung, ms: - + Transparency Transparenz - + 0 0 + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Volume: @@ -35,22 +34,22 @@ SettingsDialog - + Psi Notification Notifica Psi - + Enable Psi notification Abilita notifica Psi - + Desktop Notification Notifica sul desktop - + Position Posizione @@ -60,29 +59,44 @@ Impostazioni modulo notifica - + Song change notification Notifica cambio brano - + Volume change notification Notifica modifica volume - + Delay, ms: Ritardo, ms: - + Transparency Trasparenza - + 0 0 + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Garsumas: @@ -40,49 +39,64 @@ Notifier įskiepio nustatymai - + Psi Notification Psi pranešimas - + Enable Psi notification Įjungti Psi pranešimą - + Desktop Notification Pranešimas darbalaukyje - + Position Padėtis - + Song change notification Pranešti pasikeitus dainai - + Volume change notification Pranešti pasikeitus garsumui - + Delay, ms: Užlaikymas (ms): - + Transparency Permatomumas - + 0 + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Głośność: @@ -40,49 +39,64 @@ Ustawienia wtyczki Notifier - + Psi Notification Powiadomienia Psi - + Enable Psi notification Włącz powiadomienia Psi - + Desktop Notification Powiadomienie na pulpicie - + Song change notification Pozycja - + Volume change notification Powiadamianie o zmianie głośności - + Delay, ms: Opóźnienie, ms: - + Transparency Przezroczystość - + 0 0 - + Position Pozycja + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + + NotifierFactory @@ -27,7 +27,7 @@ PopupWidget - + Volume: Громкость: @@ -40,49 +40,64 @@ Настройки модуля уведомлений - + Psi Notification Уведомление Psi - + Enable Psi notification Включить уведомление Psi - + Desktop Notification Сообщение на рабочем столе - + Position Положение - + Song change notification Уведомление о смене песни - + Volume change notification Уведомление о смене громкости - + Delay, ms: Задержка, мс: - + Transparency Прозрачность - + 0 + + + Font: + Шрифт: + + + + Cover size: + Размер обложки: + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Ses: @@ -40,49 +39,64 @@ Bildirim Eklentisi Ayarları - + Psi Notification Psi Bildirimi - + Enable Psi notification Psi bildirimi etkinleştir - + Desktop Notification Masaüstü Bildirimi - + Song change notification Şarkı değişimi bildirimi - + Volume change notification Ses değişimi bildirimi - + Delay, ms: Gecikme, ms: - + Transparency Şeffaflık - + 0 0 - + Position Konum + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: Гучність: @@ -40,49 +39,64 @@ Налаштування модуля повідомлень - + Psi Notification Повідомлення Psi - + Enable Psi notification Увімкнути повідомлення Psi - + Desktop Notification Повідомлення на робочому столі - + Position Позиція - + Song change notification Повідомлення зміни треку - + Volume change notification Повідомлення зміни гучності - + Delay, ms: Затримка, мс: - + Transparency Прозорість - + 0 + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: 音量: @@ -35,22 +34,22 @@ SettingsDialog - + Psi Notification PSI 通知 - + Enable Psi notification 启用 PSI 通知 - + Desktop Notification 桌面通知 - + Position 位置 @@ -60,29 +59,44 @@ 通知插件设置 - + Song change notification 歌曲更改通知 - + Volume change notification 音量更改通知 - + Delay, ms: 延迟(ms): - + Transparency 透明度 - + 0 0 + + + Font: + + + + + Cover size: + + + + + ... + + 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 @@ - - + NotifierFactory @@ -27,7 +26,7 @@ PopupWidget - + Volume: 音量: @@ -35,22 +34,22 @@ SettingsDialog - + Psi Notification PSI 通知 - + Enable Psi notification 啟用 PSI 通知 - + Desktop Notification 桌面通知 - + Position 位置 @@ -60,29 +59,44 @@ 通知插件設定 - + Song change notification 曲目改變通知 - + Volume change notification 音量改變通知 - + Delay, ms: 延遲(ms): - + Transparency 透明度 - + 0 0 + + + Font: + + + + + Cover size: + + + + + ... + + -- cgit v1.2.3-13-gbd6f