From f4b817be7e88f33c0e9f1d0abf2ce5d623a9b067 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 12 Oct 2009 17:58:37 +0000 Subject: notifier plugin: fixed popup widget git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1307 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/notifier/popupwidget.cpp | 4 +- src/plugins/General/notifier/settingsdialog.cpp | 4 +- src/plugins/General/notifier/settingsdialog.ui | 98 +++++++++++++++------- .../notifier/translations/notifier_plugin_cs.ts | 13 +-- .../notifier/translations/notifier_plugin_de.ts | 13 +-- .../notifier/translations/notifier_plugin_it.ts | 13 +-- .../notifier/translations/notifier_plugin_lt.ts | 13 +-- .../notifier/translations/notifier_plugin_pl.ts | 13 +-- .../notifier/translations/notifier_plugin_ru.ts | 15 ++-- .../notifier/translations/notifier_plugin_tr.ts | 13 +-- .../notifier/translations/notifier_plugin_uk_UA.ts | 13 +-- .../notifier/translations/notifier_plugin_zh_CN.ts | 13 +-- .../notifier/translations/notifier_plugin_zh_TW.ts | 13 +-- 13 files changed, 144 insertions(+), 94 deletions(-) (limited to 'src') diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp index 54779728c..f2136aaf9 100644 --- a/src/plugins/General/notifier/popupwidget.cpp +++ b/src/plugins/General/notifier/popupwidget.cpp @@ -90,7 +90,7 @@ void PopupWidget::showMetaData() if (core->totalTime() > 0) { title.append(" "); - title.append(QString("(%1:%2)").arg(core->totalTime()/60000).arg(core->totalTime()%60000/1000, 2, 10, QChar('0'))); + title.append(QString(" || %1:%2").arg(core->totalTime()/60000).arg(core->totalTime()%60000/1000, 2, 10, QChar('0'))); } title.append(""); @@ -112,13 +112,11 @@ void PopupWidget::showMetaData() { m_pixlabel->setFixedSize(m_coverSize,m_coverSize); m_pixlabel->setPixmap(pix.scaled(m_coverSize,m_coverSize)); - m_label1->setAlignment(Qt::AlignTop); } else { m_pixlabel->setPixmap(QPixmap(":/notifier_icon.png")); m_pixlabel->setFixedSize(32,32); - m_label1->setAlignment(Qt::AlignVCenter); } qApp->processEvents(); resize(sizeHint()); diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index f3b150313..9b2a18f30 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -51,7 +51,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) 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", 64).toInt()); + ui.coverSizeSlider->setValue(settings.value ("cover_size", 64).toInt()); settings.endGroup(); QFont font; if(!fontname.isEmpty()) @@ -82,7 +82,7 @@ void SettingsDialog::accept() 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.setValue ("cover_size", ui.coverSizeSlider->value()); settings.endGroup(); QDialog::accept(); } diff --git a/src/plugins/General/notifier/settingsdialog.ui b/src/plugins/General/notifier/settingsdialog.ui index 0695d4351..d2e557a27 100644 --- a/src/plugins/General/notifier/settingsdialog.ui +++ b/src/plugins/General/notifier/settingsdialog.ui @@ -6,7 +6,7 @@ 0 0 - 284 + 298 403 @@ -79,13 +79,6 @@ - - - - Cover size: - - - @@ -112,14 +105,14 @@ - + Transparency - + 90 @@ -129,7 +122,7 @@ - + @@ -142,7 +135,7 @@ - + Qt::Vertical @@ -155,7 +148,7 @@ - + 3 @@ -277,16 +270,29 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + - + Position - + Qt::Vertical @@ -306,16 +312,36 @@ - - + + + + Cover size: + + + + + 32 - 120 + 128 - - 64 + + 1 + + + 16 + + + Qt::Horizontal + + + + + + + 0 @@ -359,8 +385,8 @@ accept() - 257 - 341 + 309 + 396 62 @@ -375,8 +401,8 @@ reject() - 257 - 341 + 309 + 396 95 @@ -391,12 +417,28 @@ setNum(int) - 183 - 187 + 267 + 237 + + + 299 + 237 + + + + + coverSizeSlider + valueChanged(int) + coverSizeLabel + setNum(int) + + + 236 + 207 - 233 - 184 + 292 + 208 diff --git a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts index 3a9f45909..20829e481 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts @@ -60,22 +60,22 @@ Písmo: - + Cover size: Velikost obalu: - + Delay (ms): Prodleva (ms): - + Position Umístění - + ... @@ -90,12 +90,13 @@ Upozornění na změnu hlasitosti - + Transparency Průhlednost - + + 0 0 diff --git a/src/plugins/General/notifier/translations/notifier_plugin_de.ts b/src/plugins/General/notifier/translations/notifier_plugin_de.ts index 62bcf0502..2aaaf13e7 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_de.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_de.ts @@ -50,12 +50,12 @@ Desktop-Benachrichtigungen - + Delay (ms): - + Position Position @@ -75,12 +75,13 @@ Benachrichtigung bei Lautstärkeänderung - + Transparency Transparenz - + + 0 0 @@ -90,12 +91,12 @@ Schriftart: - + Cover size: Cover-Größe: - + ... ... diff --git a/src/plugins/General/notifier/translations/notifier_plugin_it.ts b/src/plugins/General/notifier/translations/notifier_plugin_it.ts index 3f31b064f..249b6a7bd 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_it.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_it.ts @@ -50,12 +50,12 @@ Notifica sul desktop - + Delay (ms): - + Position Posizione @@ -75,12 +75,13 @@ Notifica modifica volume - + Transparency Trasparenza - + + 0 0 @@ -90,12 +91,12 @@ - + 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 ec24c733f..3669517ee 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_lt.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_lt.ts @@ -55,12 +55,12 @@ Pranešimas darbalaukyje - + Delay (ms): - + Position Padėtis @@ -75,12 +75,13 @@ Pranešti pasikeitus garsumui - + Transparency Permatomumas - + + 0 @@ -90,12 +91,12 @@ - + 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 6be70e6a8..5e32d9763 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_pl.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_pl.ts @@ -65,17 +65,18 @@ Powiadamianie o zmianie głośności - + Transparency Przezroczystość - + + 0 0 - + Position Pozycja @@ -85,17 +86,17 @@ Czcionka: - + Cover size: Wielkość okładki: - + Delay (ms): Opóźnienie (ms): - + ... diff --git a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts index 097cd4735..5bb2409f5 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts @@ -55,12 +55,12 @@ Сообщение на рабочем столе - + Delay (ms): - + Задежка (мс): - + Position Положение @@ -75,12 +75,13 @@ Уведомление о смене громкости - + Transparency Прозрачность - + + 0 @@ -90,12 +91,12 @@ Шрифт: - + 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 749b0e9b2..1fd589c13 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_tr.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_tr.ts @@ -65,17 +65,18 @@ Ses değişimi bildirimi - + Transparency Şeffaflık - + + 0 0 - + Position Konum @@ -85,17 +86,17 @@ - + Cover size: - + Delay (ms): - + ... 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 e3a3aba89..3b80b7c93 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_uk_UA.ts @@ -55,12 +55,12 @@ Повідомлення на робочому столі - + Delay (ms): Затримка (мс): - + Position Позиція @@ -75,12 +75,13 @@ Повідомлення зміни гучності - + Transparency Прозорість - + + 0 @@ -90,12 +91,12 @@ Шрифт: - + 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 08cbcbf31..1ca224e39 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_CN.ts @@ -50,12 +50,12 @@ 桌面通知 - + Delay (ms): - + Position 位置 @@ -75,12 +75,13 @@ 音量更改通知 - + Transparency 透明度 - + + 0 0 @@ -90,12 +91,12 @@ - + 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 305db46aa..7d897efd5 100644 --- a/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts +++ b/src/plugins/General/notifier/translations/notifier_plugin_zh_TW.ts @@ -50,12 +50,12 @@ 桌面通知 - + Delay (ms): - + Position 位置 @@ -75,12 +75,13 @@ 音量改變通知 - + Transparency 透明度 - + + 0 0 @@ -90,12 +91,12 @@ - + Cover size: - + ... -- cgit v1.2.3-13-gbd6f