notification plugin: volume change notification, transparency settings

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@712 90c681e8-e032-0410-971d-27865f9a5e38

12 files changed, 392 insertions, 182 deletions

diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp
index 1340c0d5a..5bdba1595 100644
--- a/src/plugins/General/notifier/notifier.cpp
+++ b/src/plugins/General/notifier/notifier.cpp
@@ -31,15 +31,19 @@ Notifier::Notifier(QObject *parent)
         : General(parent)
 {
     m_popupWidget = 0;
+    m_l = -1;
+    m_r = -1;
     QFile::remove(QDir::homePath()+"/.psi/tune");
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Notifier");
-    m_desktop = settings.value("desktop_notification", TRUE).toBool();
+    m_desktop = settings.value("song_notification", TRUE).toBool();
+    m_showVolume = settings.value("volume_notification", TRUE).toBool();
     m_psi = settings.value("psi_notification", FALSE).toBool();
     settings.endGroup();
     m_core = SoundCore::instance();
     connect (m_core, SIGNAL(metaDataChanged ()), SLOT(showMetaData()));
     connect (m_core, SIGNAL(stateChanged (Qmmp::State)), SLOT(setState(Qmmp::State)));
+    connect (m_core, SIGNAL(volumeChanged(int, int)), SLOT(showVolume(int, int)));
 }
 
 Notifier::~Notifier()
@@ -47,7 +51,7 @@ Notifier::~Notifier()
 
 void Notifier::setState(Qmmp::State state)
 {
-   switch ((uint) state)
+    switch ((uint) state)
     {
     case Qmmp::Playing:
     {
@@ -67,11 +71,14 @@ void Notifier::setState(Qmmp::State state)
 
 void Notifier::showMetaData()
 {
-    if (m_popupWidget)
-        delete m_popupWidget;
-    if(m_desktop)
-        m_popupWidget = new PopupWidget();
-    if(!m_psi)
+    if (m_desktop)
+    {
+        if (!m_popupWidget)
+            m_popupWidget = new PopupWidget();
+        m_popupWidget->showMetaData();
+    }
+
+    if (!m_psi)
         return;
     QFile file(QDir::homePath()+"/.psi/tune");   //psi file
     file.open(QIODevice::WriteOnly | QIODevice::Text);
@@ -82,3 +89,18 @@ void Notifier::showMetaData()
     file.write(QString("%1").arg(m_core->length()).toUtf8()+"\n");
     file.close();
 }
+
+void Notifier::showVolume(int l, int r)
+{
+    if (((m_l != l) || (m_r != r)) && m_showVolume)
+    {
+        if (m_l >= 0)
+        {
+            if (!m_popupWidget)
+                m_popupWidget = new PopupWidget();
+            m_popupWidget->showVolume(qMax(l,r));
+        }
+        m_l = l;
+        m_r = r;
+    }
+}
diff --git a/src/plugins/General/notifier/notifier.h b/src/plugins/General/notifier/notifier.h
index a6702a26a..d9cbb7faf 100644
--- a/src/plugins/General/notifier/notifier.h
+++ b/src/plugins/General/notifier/notifier.h
@@ -42,12 +42,14 @@ public:
 
 private slots:
     void showMetaData();
+    void showVolume(int, int);
     void setState(Qmmp::State state);
 
 private:
     QPointer<PopupWidget> m_popupWidget;
-    bool m_desktop;
+    bool m_desktop, m_showVolume;
     bool m_psi;
+    int m_l, m_r;
     SoundCore *m_core;
 
 };
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp
index 98c4e3462..9e7c3cc53 100644
--- a/src/plugins/General/notifier/popupwidget.cpp
+++ b/src/plugins/General/notifier/popupwidget.cpp
@@ -26,6 +26,7 @@
 #include <QPalette>
 #include <QSettings>
 #include <QDir>
+#include <QApplication>
 #include <qmmp/soundcore.h>
 
 #include "popupwidget.h"
@@ -36,6 +37,48 @@ PopupWidget::PopupWidget(QWidget *parent)
     setWindowFlags(Qt::X11BypassWindowManagerHint |
                    Qt::WindowStaysOnTopHint | Qt::Window);
     setFrameStyle(QFrame::Box | QFrame::Plain);
+
+    QHBoxLayout *hlayout = new QHBoxLayout(this);
+    QLabel *pixlabel = new QLabel(this);
+    pixlabel->setPixmap(QPixmap(":/notifier_icon.png"));
+    pixlabel->setFixedSize(32,32);
+    hlayout->addWidget(pixlabel);
+    //layout
+    QVBoxLayout *vlayout = new QVBoxLayout();
+    hlayout->addLayout (vlayout);
+    setLayout(hlayout);
+    //first line
+    m_label1 = new QLabel(this);
+    vlayout->addWidget(m_label1);
+    //second line
+    m_label2 = new QLabel(this);
+    vlayout->addWidget(m_label2);
+    //resize(sizeHint()); //update size hint
+    //settings
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    settings.beginGroup("Notifier");
+    int delay = settings.value("message_delay", 2000).toInt();
+    m_pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt();
+    setWindowOpacity(settings.value("opacity", 1.0).toDouble());
+    settings.endGroup();
+    //timer
+    m_timer = new QTimer(this);
+    m_timer->setInterval(delay);
+    m_timer->setSingleShot (TRUE);
+    connect(m_timer, SIGNAL(timeout ()), SLOT(deleteLater()));
+}
+
+PopupWidget::~PopupWidget()
+{}
+
+void PopupWidget::mousePressEvent (QMouseEvent *)
+{
+    deleteLater();
+}
+
+void PopupWidget::showMetaData()
+{
+    m_timer->stop();
     SoundCore *core = SoundCore::instance();
     QString title = core->metaData(Qmmp::TITLE);
     if (title.isEmpty())
@@ -45,56 +88,54 @@ PopupWidget::PopupWidget(QWidget *parent)
         title.append(" ");
         title.append(QString("(%1:%2)").arg(core->length()/60).arg(core->length()%60, 2, 10, QChar('0')));
     }
-
-    QHBoxLayout *hlayout = new QHBoxLayout(this);
-    QLabel *pixlabel = new QLabel(this);
-    pixlabel->setPixmap(QPixmap(":/notifier_icon.png"));
-    pixlabel->setFixedSize(32,32);
-    hlayout->addWidget(pixlabel);
-
-    QVBoxLayout *vlayout = new QVBoxLayout();
-    QLabel *label1 = new QLabel("<b>"+title+"</b>", this);
-    vlayout->addWidget(label1);
+    m_label1->setText("<b>" + title + "</b>");
 
     QString info = core->metaData(Qmmp::ARTIST);
     if (!info.isEmpty() && !core->metaData(Qmmp::ALBUM).isEmpty())
         info.append(" - " + core->metaData(Qmmp::ALBUM));
     if (!info.isEmpty())
     {
-        QLabel *label2 = new QLabel(info, this);
-        vlayout->addWidget(label2);
+        m_label2->setText(info);
+        m_label2->show();
     }
+    else
+        m_label2->hide();
+    qApp->processEvents();
+    resize(sizeHint());
+    qApp->processEvents();
+    updatePosition();
+    qApp->processEvents();
+    show();
+    m_timer->start();
+}
 
-    hlayout->addLayout (vlayout);
-    setLayout(hlayout);
+void PopupWidget::showVolume(int v)
+{
+    m_timer->stop();
+    m_label1->setText("<b>" + tr("Volume:") + QString (" %1\%").arg(v)+ + "</b>");
+
+    m_label2->hide();
+    qApp->processEvents();
     resize(sizeHint());
-    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
-    settings.beginGroup("Notifier");
-    int delay = settings.value("message_delay", 2000).toInt();
-    uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt();
-    settings.endGroup();
+    qApp->processEvents();
+    updatePosition();
+    qApp->processEvents();
+    show();
+    m_timer->start();
+}
+
+void PopupWidget::updatePosition()
+{
     //calculate widget position
     int x = 5, y = 5;
     QSize desktopSize = QApplication::desktop()->size();
-    if (pos == LEFT || pos == RIGHT || pos == CENTER)
+    if (m_pos == LEFT || m_pos == RIGHT || m_pos == CENTER)
         y = desktopSize.height()/2 - height()/2;
-    else if (pos == BOTTOMLEFT || pos == BOTTOM || pos == BOTTOMRIGHT)
+    else if (m_pos == BOTTOMLEFT || m_pos == BOTTOM || m_pos == BOTTOMRIGHT)
         y = desktopSize.height() - height() - 5;
-    if (pos == TOP || pos == BOTTOM || pos == CENTER)
+    if (m_pos == TOP || m_pos == BOTTOM || m_pos == CENTER)
         x = desktopSize.width()/2 - width()/2;
-    else if (pos == TOPRIGHT || pos == RIGHT || pos == BOTTOMRIGHT)
+    else if (m_pos == TOPRIGHT || m_pos == RIGHT || m_pos == BOTTOMRIGHT)
         x = desktopSize.width() - width() - 5;
-
     move (x,y);
-    QTimer::singleShot(delay, this, SLOT(deleteLater()));
-    show();
-}
-
-PopupWidget::~PopupWidget()
-{}
-
-void PopupWidget::mousePressEvent (QMouseEvent *)
-{
-    deleteLater();
 }
-
diff --git a/src/plugins/General/notifier/popupwidget.h b/src/plugins/General/notifier/popupwidget.h
index cfda202a5..989b37bd7 100644
--- a/src/plugins/General/notifier/popupwidget.h
+++ b/src/plugins/General/notifier/popupwidget.h
@@ -23,6 +23,9 @@
 #include <QWidget>
 #include <QFrame>
 
+class QTimer;
+class QLabel;
+
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
 */
@@ -47,7 +50,18 @@ public:
         CENTER
     };
 
-virtual void mousePressEvent (QMouseEvent *);
+    void showMetaData();
+    void showVolume(int);
+
+protected:
+    virtual void mousePressEvent (QMouseEvent *);
+
+private:
+    void updatePosition();
+    QTimer *m_timer;
+    QLabel *m_label1;
+    QLabel *m_label2;
+    uint m_pos;
 
 };
 
diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp
index d7f2e2660..6bb582e04 100644
--- a/src/plugins/General/notifier/settingsdialog.cpp
+++ b/src/plugins/General/notifier/settingsdialog.cpp
@@ -46,7 +46,9 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     uint pos = settings.value("message_pos", PopupWidget::BOTTOMLEFT).toUInt();
     m_buttons.value(pos)->setChecked(TRUE);
     ui.psiCheckBox->setChecked(settings.value("psi_notification", FALSE).toBool());
-    ui.desktopCheckBox->setChecked(settings.value("desktop_notification", TRUE).toBool());
+    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);
     settings.endGroup();
 }
 
@@ -67,7 +69,9 @@ void SettingsDialog::accept()
     }
     settings.setValue("message_pos", pos);
     settings.setValue("psi_notification", ui.psiCheckBox->isChecked());
-    settings.setValue("desktop_notification", ui.desktopCheckBox->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.endGroup();
     QDialog::accept();
 }
diff --git a/src/plugins/General/notifier/settingsdialog.ui b/src/plugins/General/notifier/settingsdialog.ui
index b64a389e1..b321bccf1 100644
--- a/src/plugins/General/notifier/settingsdialog.ui
+++ b/src/plugins/General/notifier/settingsdialog.ui
@@ -5,20 +5,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>278</width>
-    <height>330</height>
+    <width>244</width>
+    <height>349</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Notifier Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" name="gridLayout_3" >
    <item row="0" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
       <string>Psi Notification</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout" >
       <item>
        <widget class="QCheckBox" name="psiCheckBox" >
         <property name="text" >
@@ -34,25 +34,32 @@
      <property name="title" >
       <string>Desktop Notification</string>
      </property>
-     <layout class="QGridLayout" >
+     <layout class="QGridLayout" name="gridLayout_2" >
       <item row="0" column="0" colspan="2" >
-       <widget class="QCheckBox" name="desktopCheckBox" >
+       <widget class="QCheckBox" name="songCheckBox" >
         <property name="text" >
-         <string>Enable desktop notification</string>
+         <string>Song change notification</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
+      <item row="1" column="0" colspan="3" >
+       <widget class="QCheckBox" name="volumeCheckBox" >
+        <property name="text" >
+         <string>Volume change notification</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
-         <string>Message delay, ms:</string>
+         <string>Delay, ms:</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
+      <item row="2" column="1" colspan="2" >
        <widget class="QSpinBox" name="messageDelaySpinBox" >
         <property name="minimum" >
          <number>100</number>
@@ -68,15 +75,54 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="label" >
+      <item row="3" column="0" >
+       <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>Position</string>
+         <string>Transparency</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <layout class="QGridLayout" >
+      <item row="3" column="1" >
+       <widget class="QSlider" name="transparencySlider" >
+        <property name="maximum" >
+         <number>90</number>
+        </property>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2" >
+       <widget class="QLabel" name="trasparencyLabel" >
+        <property name="minimumSize" >
+         <size>
+          <width>18</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text" >
+         <string>0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" >
+       <spacer name="verticalSpacer_2" >
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>20</width>
+          <height>32</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item rowspan="3" row="4" column="1" colspan="2" >
+       <layout class="QGridLayout" name="gridLayout" >
+        <property name="spacing" >
+         <number>3</number>
+        </property>
         <item row="0" column="0" >
          <widget class="QPushButton" name="topLeftButton" >
           <property name="text" >
@@ -196,15 +242,22 @@
         </item>
        </layout>
       </item>
-      <item row="3" column="1" >
-       <spacer>
+      <item row="5" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Position</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0" >
+       <spacer name="verticalSpacer" >
         <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0" >
          <size>
-          <width>40</width>
-          <height>20</height>
+          <width>20</width>
+          <height>30</height>
          </size>
         </property>
        </spacer>
@@ -212,7 +265,7 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" >
+   <item rowspan="2" row="2" column="0" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
@@ -225,7 +278,7 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="1" >
+   <item row="3" column="1" >
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
@@ -249,8 +302,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>183</x>
-     <y>303</y>
+     <x>257</x>
+     <y>341</y>
     </hint>
     <hint type="destinationlabel" >
      <x>62</x>
@@ -265,8 +318,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>249</x>
-     <y>298</y>
+     <x>257</x>
+     <y>341</y>
     </hint>
     <hint type="destinationlabel" >
      <x>95</x>
@@ -274,5 +327,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>transparencySlider</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>trasparencyLabel</receiver>
+   <slot>setNum(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>183</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>233</x>
+     <y>184</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts
index 3e485ac54..56b78381a 100644
--- a/src/plugins/General/notifier/translations/notifier_plugin_cs.ts
+++ b/src/plugins/General/notifier/translations/notifier_plugin_cs.ts
@@ -24,6 +24,14 @@
     </message>
 </context>
 <context>
+    <name>PopupWidget</name>
+    <message>
+        <location filename="../popupwidget.cpp" line="115"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsDialog</name>
     <message>
         <location filename="../settingsdialog.ui" line="13"/>
@@ -46,29 +54,34 @@
         <translation>Notifikace na pracovní ploše</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="248"/>
+        <source>Position</source>
+        <translation>Umístění</translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="41"/>
-        <source>Enable desktop notification</source>
-        <translation>Povolit notifikaci na pracovní ploše</translation>
+        <source>Song change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../settingsdialog.ui" line="48"/>
-        <source>Message delay, ms:</source>
-        <translation>Prodleva zprávy, ms:</translation>
+        <source>Volume change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="74"/>
-        <source>Position</source>
-        <translation>Umístění</translation>
+        <location filename="../settingsdialog.ui" line="55"/>
+        <source>Delay, ms:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="248"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../settingsdialog.ui" line="81"/>
+        <source>Transparency</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="255"/>
-        <source>Cancel</source>
-        <translation>Zrušit</translation>
+        <location filename="../settingsdialog.ui" line="104"/>
+        <source>0</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 f0a844b5b..579d51174 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="1.1" language="de">
-<defaultcodec></defaultcodec>
 <context>
     <name>NotifierFactory</name>
     <message>
@@ -25,12 +24,15 @@
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>PopupWidget</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
-        <source>Status Icon Plugin Settings</source>
-        <translation type="obsolete">Status Icon Plugin Einstellungen</translation>
+        <location filename="../popupwidget.cpp" line="115"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <location filename="../settingsdialog.ui" line="19"/>
         <source>Psi Notification</source>
@@ -47,34 +49,39 @@
         <translation>Desktop-Benachrichtigungen</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="41"/>
-        <source>Enable desktop notification</source>
-        <translation>Einschalten</translation>
+        <location filename="../settingsdialog.ui" line="248"/>
+        <source>Position</source>
+        <translation>Position</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="48"/>
-        <source>Message delay, ms:</source>
-        <translation>Verzögerung, ms:</translation>
+        <location filename="../settingsdialog.ui" line="13"/>
+        <source>Notifier Plugin Settings</source>
+        <translation>Einstellungen des Benachrichtigungs-Plugins</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="74"/>
-        <source>Position</source>
-        <translation>Position</translation>
+        <location filename="../settingsdialog.ui" line="41"/>
+        <source>Song change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="248"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../settingsdialog.ui" line="48"/>
+        <source>Volume change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="255"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <location filename="../settingsdialog.ui" line="55"/>
+        <source>Delay, ms:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
-        <source>Notifier Plugin Settings</source>
-        <translation>Einstellungen des Benachrichtigungs-Plugins</translation>
+        <location filename="../settingsdialog.ui" line="81"/>
+        <source>Transparency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="104"/>
+        <source>0</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 e07e74a52..fe4ec5027 100644
--- a/src/plugins/General/notifier/translations/notifier_plugin_ru.ts
+++ b/src/plugins/General/notifier/translations/notifier_plugin_ru.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="ru">
-<defaultcodec></defaultcodec>
 <context>
     <name>NotifierFactory</name>
     <message>
@@ -25,6 +24,14 @@
     </message>
 </context>
 <context>
+    <name>PopupWidget</name>
+    <message>
+        <location filename="../popupwidget.cpp" line="115"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsDialog</name>
     <message>
         <location filename="../settingsdialog.ui" line="13"/>
@@ -47,29 +54,34 @@
         <translation>Сообщение на рабочем столе</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="248"/>
+        <source>Position</source>
+        <translation>Позциция</translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="41"/>
-        <source>Enable desktop notification</source>
-        <translation>Показывать сообщение на рабочем столе</translation>
+        <source>Song change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../settingsdialog.ui" line="48"/>
-        <source>Message delay, ms:</source>
-        <translation>Задержка сообщения, мс:</translation>
+        <source>Volume change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="74"/>
-        <source>Position</source>
-        <translation>Позциция</translation>
+        <location filename="../settingsdialog.ui" line="55"/>
+        <source>Delay, ms:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="248"/>
-        <source>OK</source>
-        <translation>OK</translation>
+        <location filename="../settingsdialog.ui" line="81"/>
+        <source>Transparency</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="255"/>
-        <source>Cancel</source>
-        <translation>Отмена</translation>
+        <location filename="../settingsdialog.ui" line="104"/>
+        <source>0</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 e39437e8b..08550ca14 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="1.1" language="uk">
-<defaultcodec></defaultcodec>
 <context>
     <name>NotifierFactory</name>
     <message>
@@ -25,6 +24,14 @@
     </message>
 </context>
 <context>
+    <name>PopupWidget</name>
+    <message>
+        <location filename="../popupwidget.cpp" line="115"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsDialog</name>
     <message>
         <location filename="../settingsdialog.ui" line="13"/>
@@ -47,29 +54,34 @@
         <translation>Повідомлення на робочому столі</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="248"/>
+        <source>Position</source>
+        <translation>Позиція</translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="41"/>
-        <source>Enable desktop notification</source>
-        <translation>Відображати повідомлення на робочому столі</translation>
+        <source>Song change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../settingsdialog.ui" line="48"/>
-        <source>Message delay, ms:</source>
-        <translation>Затримка повідомлення, мс:</translation>
+        <source>Volume change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="74"/>
-        <source>Position</source>
-        <translation>Позиція</translation>
+        <location filename="../settingsdialog.ui" line="55"/>
+        <source>Delay, ms:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="248"/>
-        <source>OK</source>
-        <translation>Застосувати</translation>
+        <location filename="../settingsdialog.ui" line="81"/>
+        <source>Transparency</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="255"/>
-        <source>Cancel</source>
-        <translation>Відміна</translation>
+        <location filename="../settingsdialog.ui" line="104"/>
+        <source>0</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 630855f4b..c75aecaf3 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="1.1" language="zh_CN">
-<defaultcodec></defaultcodec>
 <context>
     <name>NotifierFactory</name>
     <message>
@@ -25,12 +24,15 @@
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>PopupWidget</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
-        <source>Status Icon Plugin Settings</source>
-        <translation type="obsolete">状态图标插件设置</translation>
+        <location filename="../popupwidget.cpp" line="115"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <location filename="../settingsdialog.ui" line="19"/>
         <source>Psi Notification</source>
@@ -47,34 +49,39 @@
         <translation>桌面通知</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="41"/>
-        <source>Enable desktop notification</source>
-        <translation>启用桌面通知</translation>
+        <location filename="../settingsdialog.ui" line="248"/>
+        <source>Position</source>
+        <translation>位置</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="48"/>
-        <source>Message delay, ms:</source>
-        <translation>消息延时(ms)：</translation>
+        <location filename="../settingsdialog.ui" line="13"/>
+        <source>Notifier Plugin Settings</source>
+        <translation>通知插件设置</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="74"/>
-        <source>Position</source>
-        <translation>位置</translation>
+        <location filename="../settingsdialog.ui" line="41"/>
+        <source>Song change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="248"/>
-        <source>OK</source>
-        <translation>确定</translation>
+        <location filename="../settingsdialog.ui" line="48"/>
+        <source>Volume change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="255"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
+        <location filename="../settingsdialog.ui" line="55"/>
+        <source>Delay, ms:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
-        <source>Notifier Plugin Settings</source>
-        <translation>通知插件设置</translation>
+        <location filename="../settingsdialog.ui" line="81"/>
+        <source>Transparency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="104"/>
+        <source>0</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 d89f8b425..ac72b47b7 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="1.1" language="zh_TW">
-<defaultcodec></defaultcodec>
 <context>
     <name>NotifierFactory</name>
     <message>
@@ -25,12 +24,15 @@
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>PopupWidget</name>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
-        <source>Status Icon Plugin Settings</source>
-        <translation type="obsolete">狀態圖像插件設定</translation>
+        <location filename="../popupwidget.cpp" line="115"/>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <location filename="../settingsdialog.ui" line="19"/>
         <source>Psi Notification</source>
@@ -47,34 +49,39 @@
         <translation>桌面通知</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="41"/>
-        <source>Enable desktop notification</source>
-        <translation>啟用桌面通知</translation>
+        <location filename="../settingsdialog.ui" line="248"/>
+        <source>Position</source>
+        <translation>位置</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="48"/>
-        <source>Message delay, ms:</source>
-        <translation>訊息延時(ms)：</translation>
+        <location filename="../settingsdialog.ui" line="13"/>
+        <source>Notifier Plugin Settings</source>
+        <translation>通知插件設定</translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="74"/>
-        <source>Position</source>
-        <translation>位置</translation>
+        <location filename="../settingsdialog.ui" line="41"/>
+        <source>Song change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="248"/>
-        <source>OK</source>
-        <translation>確定</translation>
+        <location filename="../settingsdialog.ui" line="48"/>
+        <source>Volume change notification</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="255"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
+        <location filename="../settingsdialog.ui" line="55"/>
+        <source>Delay, ms:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../settingsdialog.ui" line="13"/>
-        <source>Notifier Plugin Settings</source>
-        <translation>通知插件設定</translation>
+        <location filename="../settingsdialog.ui" line="81"/>
+        <source>Transparency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="104"/>
+        <source>0</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>