From 1ac72677511d781430b2a35de3d0ffc75fdb526d Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 26 Sep 2009 18:58:40 +0000
Subject: some notifier plugin changes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1263 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/notifier/popupwidget.cpp    |  49 ++---
 src/plugins/General/notifier/popupwidget.h      |   1 -
 src/plugins/General/notifier/settingsdialog.cpp |   2 +-
 src/plugins/General/notifier/settingsdialog.ui  | 279 ++++++++++++------------
 src/ui/textscroller.cpp                         |   1 -
 5 files changed, 165 insertions(+), 167 deletions(-)

(limited to 'src')

diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp
index 83c0adb29..b69f21ef6 100644
--- a/src/plugins/General/notifier/popupwidget.cpp
+++ b/src/plugins/General/notifier/popupwidget.cpp
@@ -40,22 +40,15 @@ PopupWidget::PopupWidget(QWidget *parent)
                    Qt::WindowStaysOnTopHint | Qt::Dialog | Qt::FramelessWindowHint);
     setFrameStyle(QFrame::Box | QFrame::Plain);
 
-    QHBoxLayout *hlayout = new QHBoxLayout(this);
+    QHBoxLayout *hlayout = new QHBoxLayout(this); //layout
     m_pixlabel = new QLabel(this);
     m_pixlabel->setPixmap(QPixmap(":/notifier_icon.png"));
     m_pixlabel->setFixedSize(32,32);
     hlayout->addWidget(m_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
+    hlayout->addWidget (m_label1);
+
     //settings
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Notifier");
@@ -63,7 +56,7 @@ PopupWidget::PopupWidget(QWidget *parent)
     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();
+    m_coverSize = settings.value("cover_size", 64).toInt();
     settings.endGroup();
     //font
     QFont font;
@@ -89,37 +82,43 @@ void PopupWidget::showMetaData()
 {
     m_timer->stop();
     SoundCore *core = SoundCore::instance();
-    QString title = core->metaData(Qmmp::TITLE);
-    if (title.isEmpty())
-        title = core->metaData(Qmmp::URL).section('/',-1);
+    QString title = "<b>";
+    if (core->metaData(Qmmp::TITLE).isEmpty())
+        title.append(core->metaData(Qmmp::URL).section('/',-1));
+    else
+        title.append(core->metaData(Qmmp::TITLE));
     if (core->totalTime() > 0)
     {
         title.append(" ");
         title.append(QString("(%1:%2)").arg(core->totalTime()/60000).arg(core->totalTime()%60000/1000, 2, 10, QChar('0')));
     }
-    m_label1->setText("<b>" + title + "</b>");
+    title.append("</b>");
 
-    QString info = core->metaData(Qmmp::ARTIST);
-    if (!info.isEmpty() && !core->metaData(Qmmp::ALBUM).isEmpty())
-        info.append(" - " + core->metaData(Qmmp::ALBUM));
-    if (!info.isEmpty())
+    if(!core->metaData(Qmmp::ARTIST).isEmpty())
     {
-        m_label2->setText(info);
-        m_label2->show();
+        title.append("<br>");
+        title.append(core->metaData(Qmmp::ARTIST));
     }
-    else
-        m_label2->hide();
+
+    if(!core->metaData(Qmmp::ALBUM).isEmpty())
+    {
+        title.append("<br>");
+        title.append(core->metaData(Qmmp::ALBUM));
+    }
+    m_label1->setText(title);
 
     QPixmap pix = Decoder::findCover(core->metaData(Qmmp::URL));
     if(!pix.isNull())
     {
         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());
@@ -135,9 +134,9 @@ void PopupWidget::showVolume(int v)
     m_pixlabel->setPixmap(QPixmap(":/notifier_icon.png"));
     m_pixlabel->setFixedSize(32,32);
     m_timer->stop();
+    m_label1->setAlignment(Qt::AlignVCenter);
     m_label1->setText("<b>" + tr("Volume:") + QString (" %1\%").arg(v)+ + "</b>");
 
-    m_label2->hide();
     qApp->processEvents();
     resize(sizeHint());
     qApp->processEvents();
diff --git a/src/plugins/General/notifier/popupwidget.h b/src/plugins/General/notifier/popupwidget.h
index c7bbafeef..a845ea24c 100644
--- a/src/plugins/General/notifier/popupwidget.h
+++ b/src/plugins/General/notifier/popupwidget.h
@@ -60,7 +60,6 @@ private:
     void updatePosition();
     QTimer *m_timer;
     QLabel *m_label1;
-    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 ba39add86..f3b150313 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", 48).toInt());
+    ui.sizeSpinBox->setValue(settings.value ("cover_size", 64).toInt());
     settings.endGroup();
     QFont font;
     if(!fontname.isEmpty())
diff --git a/src/plugins/General/notifier/settingsdialog.ui b/src/plugins/General/notifier/settingsdialog.ui
index bbbcfd5ea..0695d4351 100644
--- a/src/plugins/General/notifier/settingsdialog.ui
+++ b/src/plugins/General/notifier/settingsdialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SettingsDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,28 +10,28 @@
     <height>403</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Notifier Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3" >
-   <property name="leftMargin" >
+  <layout class="QGridLayout" name="gridLayout_3">
+   <property name="leftMargin">
     <number>6</number>
    </property>
-   <property name="rightMargin" >
+   <property name="rightMargin">
     <number>6</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>6</number>
    </property>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
+   <item row="0" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
       <string>Psi Notification</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QCheckBox" name="psiCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="psiCheckBox">
+        <property name="text">
          <string>Enable Psi notification</string>
         </property>
        </widget>
@@ -38,115 +39,115 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Desktop Notification</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
-      <item row="0" column="0" colspan="2" >
-       <widget class="QCheckBox" name="songCheckBox" >
-        <property name="text" >
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0" colspan="2">
+       <widget class="QCheckBox" name="songCheckBox">
+        <property name="text">
          <string>Song change notification</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3" >
-       <widget class="QCheckBox" name="volumeCheckBox" >
-        <property name="text" >
+      <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_2" >
-        <property name="text" >
+      <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" >
+      <item row="2" column="1">
+       <widget class="QLabel" name="fontLabel">
+        <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
-        <property name="frameShadow" >
+        <property name="frameShadow">
          <enum>QFrame::Sunken</enum>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="label_5" >
-        <property name="text" >
+      <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" >
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
          <string>Delay (ms):</string>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2" >
-       <widget class="QSpinBox" name="messageDelaySpinBox" >
-        <property name="minimum" >
+      <item row="4" column="1" colspan="2">
+       <widget class="QSpinBox" name="messageDelaySpinBox">
+        <property name="minimum">
          <number>100</number>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>10000</number>
         </property>
-        <property name="singleStep" >
+        <property name="singleStep">
          <number>100</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>1000</number>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" >
-       <widget class="QLabel" name="label_4" >
-        <property name="text" >
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
          <string>Transparency</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="1" >
-       <widget class="QSlider" name="transparencySlider" >
-        <property name="maximum" >
+      <item row="5" column="1">
+       <widget class="QSlider" name="transparencySlider">
+        <property name="maximum">
          <number>90</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="5" column="2" >
-       <widget class="QLabel" name="trasparencyLabel" >
-        <property name="minimumSize" >
+      <item row="5" column="2">
+       <widget class="QLabel" name="trasparencyLabel">
+        <property name="minimumSize">
          <size>
           <width>18</width>
           <height>0</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>0</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0" >
-       <spacer name="verticalSpacer_2" >
-        <property name="orientation" >
+      <item row="6" column="0">
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>32</height>
@@ -154,143 +155,143 @@
         </property>
        </spacer>
       </item>
-      <item rowspan="3" row="6" column="1" colspan="2" >
-       <layout class="QGridLayout" name="gridLayout" >
-        <property name="spacing" >
+      <item row="6" column="1" rowspan="3" 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" >
+        <item row="0" column="0">
+         <widget class="QPushButton" name="topLeftButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QPushButton" name="topButton" >
-          <property name="text" >
+        <item row="0" column="1">
+         <widget class="QPushButton" name="topButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="2" >
-         <widget class="QPushButton" name="topRightButton" >
-          <property name="text" >
+        <item row="0" column="2">
+         <widget class="QPushButton" name="topRightButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" >
-         <widget class="QPushButton" name="leftButton" >
-          <property name="text" >
+        <item row="1" column="0">
+         <widget class="QPushButton" name="leftButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="1" >
-         <widget class="QPushButton" name="centerButton" >
-          <property name="text" >
+        <item row="1" column="1">
+         <widget class="QPushButton" name="centerButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="1" column="2" >
-         <widget class="QPushButton" name="rightButton" >
-          <property name="text" >
+        <item row="1" column="2">
+         <widget class="QPushButton" name="rightButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="2" column="0" >
-         <widget class="QPushButton" name="bottomLeftButton" >
-          <property name="text" >
+        <item row="2" column="0">
+         <widget class="QPushButton" name="bottomLeftButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="2" column="1" >
-         <widget class="QPushButton" name="bottomButton" >
-          <property name="text" >
+        <item row="2" column="1">
+         <widget class="QPushButton" name="bottomButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="2" column="2" >
-         <widget class="QPushButton" name="bottomRightButton" >
-          <property name="text" >
+        <item row="2" column="2">
+         <widget class="QPushButton" name="bottomRightButton">
+          <property name="text">
            <string/>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="autoExclusive" >
+          <property name="autoExclusive">
            <bool>true</bool>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item row="7" column="0" >
-       <widget class="QLabel" name="label" >
-        <property name="text" >
+      <item row="7" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
          <string>Position</string>
         </property>
        </widget>
       </item>
-      <item row="8" column="0" >
-       <spacer name="verticalSpacer" >
-        <property name="orientation" >
+      <item row="8" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>20</width>
           <height>30</height>
@@ -298,35 +299,35 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="2" >
-       <widget class="QToolButton" name="fontButton" >
-        <property name="text" >
+      <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" >
+      <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 name="maximum">
+         <number>120</number>
         </property>
-        <property name="value" >
-         <number>48</number>
+        <property name="value">
+         <number>64</number>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item rowspan="2" row="2" column="0" >
+   <item row="2" column="0" rowspan="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>131</width>
        <height>31</height>
@@ -334,15 +335,15 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="1" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+   <item row="3" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -357,11 +358,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>257</x>
      <y>341</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>62</x>
      <y>314</y>
     </hint>
@@ -373,11 +374,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>257</x>
      <y>341</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>95</x>
      <y>299</y>
     </hint>
@@ -389,11 +390,11 @@
    <receiver>trasparencyLabel</receiver>
    <slot>setNum(int)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>183</x>
      <y>187</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>233</x>
      <y>184</y>
     </hint>
diff --git a/src/ui/textscroller.cpp b/src/ui/textscroller.cpp
index 46dbf8fa8..50fa0849b 100644
--- a/src/ui/textscroller.cpp
+++ b/src/ui/textscroller.cpp
@@ -96,7 +96,6 @@ void TextScroller::setText(const QString& text)
         m_scrollText = "*** " + text;
         x = m_autoscroll ? -50 : -150;
         m_bitmap =  m_bitmapConf && (m_text.toLatin1() == m_text.toLocal8Bit());
-        qDebug("==== %s", m_text.toLatin1().constData());
     }
     update();
 }
-- 
cgit v1.2.3-13-gbd6f