aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General')
-rw-r--r--src/plugins/General/notifier/CMakeLists.txt4
-rw-r--r--src/plugins/General/notifier/notifier.pro1
-rw-r--r--src/plugins/General/notifier/notifier_icon.pngbin0 -> 2343 bytes
-rw-r--r--src/plugins/General/notifier/notifier_images.qrc6
-rw-r--r--src/plugins/General/notifier/popupwidget.cpp17
5 files changed, 22 insertions, 6 deletions
diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt
index 5bf6cb3b2..6efcbeecb 100644
--- a/src/plugins/General/notifier/CMakeLists.txt
+++ b/src/plugins/General/notifier/CMakeLists.txt
@@ -44,9 +44,9 @@ SET(libnotifier_MOC_HDRS
#SET(libnotifier_RCCS translations/translations.qrc)
-#SET(libnotifier_RCCS images/images.qrc)
+SET(libnotifier_RCCS notifier_images.qrc)
-#QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS})
+QT4_ADD_RESOURCES(libnotifier_RCC_SRCS ${libnotifier_RCCS})
QT4_WRAP_CPP(libnotifier_MOC_SRCS ${libnotifier_MOC_HDRS})
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 099b52aed..0bbbf7e90 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -14,6 +14,7 @@ QMAKE_LIBDIR += ../../../../lib
LIBS += -lqmmpui
#TRANSLATIONS = translations/ffmpeg_plugin_ru.ts
+RESOURCES = notifier_images.qrc
#RESOURCES = translations/translations.qrc
isEmpty(LIB_DIR){
diff --git a/src/plugins/General/notifier/notifier_icon.png b/src/plugins/General/notifier/notifier_icon.png
new file mode 100644
index 000000000..930f1e28b
--- /dev/null
+++ b/src/plugins/General/notifier/notifier_icon.png
Binary files differ
diff --git a/src/plugins/General/notifier/notifier_images.qrc b/src/plugins/General/notifier/notifier_images.qrc
new file mode 100644
index 000000000..5936b241f
--- /dev/null
+++ b/src/plugins/General/notifier/notifier_images.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+ <qresource>
+ <file>notifier_icon.png</file>
+ </qresource>
+</RCC>
diff --git a/src/plugins/General/notifier/popupwidget.cpp b/src/plugins/General/notifier/popupwidget.cpp
index 033de8755..f9c331e50 100644
--- a/src/plugins/General/notifier/popupwidget.cpp
+++ b/src/plugins/General/notifier/popupwidget.cpp
@@ -35,13 +35,20 @@ PopupWidget::PopupWidget(const SongInfo &song, QWidget *parent)
setWindowFlags(Qt::X11BypassWindowManagerHint |
Qt::WindowStaysOnTopHint);
setFrameStyle(QFrame::Box | QFrame::Plain);
- QVBoxLayout *layout = new QVBoxLayout(this);
QString title = song.title();
title.append(" ");
if (!song.isStream())
title.append(QString("(%1:%2)").arg(song.length()/60).arg(song.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(this);
QLabel *label1 = new QLabel("<b>"+title+"</b>", this);
- layout->addWidget(label1);
+ vlayout->addWidget(label1);
QString info = song.artist();
if (!info.isEmpty() && !song.album().isEmpty())
@@ -49,9 +56,11 @@ PopupWidget::PopupWidget(const SongInfo &song, QWidget *parent)
if (!info.isEmpty())
{
QLabel *label2 = new QLabel(info, this);
- layout->addWidget(label2);
+ vlayout->addWidget(label2);
}
- setLayout(layout);
+
+ hlayout->addLayout (vlayout);
+ setLayout(hlayout);
resize(sizeHint());
QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
settings.beginGroup("Notifier");