aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--src/ui/CMakeLists.txt7
-rw-r--r--src/ui/images/16x16/qmmp.pngbin0 -> 917 bytes
-rw-r--r--src/ui/images/32x32/qmmp.pngbin0 -> 2343 bytes
-rw-r--r--src/ui/images/48x48/qmmp.pngbin0 -> 3884 bytes
-rw-r--r--src/ui/images/56x56/qmmp.pngbin0 -> 4634 bytes
-rw-r--r--src/ui/images/images.qrc2
-rw-r--r--src/ui/images/qmmp.xpm278
-rw-r--r--src/ui/mainwindow.cpp2
-rw-r--r--src/ui/ui.pro14
14 files changed, 42 insertions, 289 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");
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 8cc1a1aa2..b0214d22d 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -164,5 +164,8 @@ ADD_EXECUTABLE(qmmp ${ui_SRCS} ${ui_MOC_SRCS} ${ui_UIS_H}
${ui_RCC_SRCS})
target_link_libraries(qmmp ${QT_LIBRARIES} -lqmmp -lqmmpui)
install(TARGETS qmmp DESTINATION bin)
-#install(FILES qmmp.desktop DESTINATION share/applications)
-#install(FILES images/qmmp.xpm DESTINATION share/pixmaps)
+install(FILES qmmp.desktop DESTINATION share/applications)
+install(FILES images/16x16/qmmp.png DESTINATION share/icons/hicolor/16x16/apps)
+install(FILES images/32x32/qmmp.png DESTINATION share/icons/hicolor/32x32/apps)
+install(FILES images/48x48/qmmp.png DESTINATION share/icons/hicolor/48x48/apps)
+
diff --git a/src/ui/images/16x16/qmmp.png b/src/ui/images/16x16/qmmp.png
new file mode 100644
index 000000000..d5870acd8
--- /dev/null
+++ b/src/ui/images/16x16/qmmp.png
Binary files differ
diff --git a/src/ui/images/32x32/qmmp.png b/src/ui/images/32x32/qmmp.png
new file mode 100644
index 000000000..930f1e28b
--- /dev/null
+++ b/src/ui/images/32x32/qmmp.png
Binary files differ
diff --git a/src/ui/images/48x48/qmmp.png b/src/ui/images/48x48/qmmp.png
new file mode 100644
index 000000000..51a440978
--- /dev/null
+++ b/src/ui/images/48x48/qmmp.png
Binary files differ
diff --git a/src/ui/images/56x56/qmmp.png b/src/ui/images/56x56/qmmp.png
new file mode 100644
index 000000000..66a9d5114
--- /dev/null
+++ b/src/ui/images/56x56/qmmp.png
Binary files differ
diff --git a/src/ui/images/images.qrc b/src/ui/images/images.qrc
index acc7c26f0..f7bf24ed1 100644
--- a/src/ui/images/images.qrc
+++ b/src/ui/images/images.qrc
@@ -1,7 +1,7 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource>
- <file>qmmp.xpm</file>
+ <file>32x32/qmmp.png</file>
<file>interface.png</file>
<file>playlist.png</file>
<file>advanced.png</file>
diff --git a/src/ui/images/qmmp.xpm b/src/ui/images/qmmp.xpm
deleted file mode 100644
index 85ea94fc1..000000000
--- a/src/ui/images/qmmp.xpm
+++ /dev/null
@@ -1,278 +0,0 @@
-/* XPM */
-static char *trayicon[]={
-"32 32 243 2",
-"#N c None",
-"Qt c None",
-".# c #000000",
-".a c #050d16",
-".U c #060e16",
-".L c #06101b",
-"a9 c #091725",
-"b. c #0a0b11",
-"bU c #0b1826",
-".c c #0c2034",
-"bt c #0d1823",
-"be c #0d2034",
-"bb c #0f0f0f",
-".A c #0f253c",
-"a7 c #11263d",
-".n c #112a45",
-"a6 c #12273d",
-"aL c #122f4c",
-"bV c #131e29",
-"bi c #141b23",
-"bg c #14212e",
-".b c #16385b",
-".i c #16385c",
-"#L c #191b2b",
-"bW c #1a2b3e",
-".d c #1a4169",
-"aY c #1a416b",
-"bm c #1a426b",
-"aB c #1b1d2e",
-"aZ c #1b1d2f",
-".o c #1c1c1c",
-"bl c #1c436b",
-"aH c #1d436b",
-"ah c #1e1f25",
-"at c #1e4b7a",
-"#o c #1f2236",
-"#K c #1f272f",
-"bO c #1f2e3e",
-"aK c #1f4c7b",
-"bk c #202a35",
-"bh c #202e3e",
-"au c #212331",
-"as c #215489",
-"a8 c #21548a",
-".R c #223952",
-"br c #233242",
-"#J c #24303e",
-".3 c #253647",
-".T c #27507b",
-".e c #292929",
-"#O c #292a30",
-"aM c #2967a7",
-".x c #2968a9",
-"bN c #2a598a",
-"aJ c #2c69a9",
-"ar c #2d71b7",
-"ap c #2d71b8",
-".M c #2e2e2e",
-"bs c #2f4d6c",
-"#w c #2f547b",
-"#B c #303030",
-"ag c #303453",
-"bI c #30353a",
-"bc c #30465d",
-"bf c #307ac7",
-"bP c #314253",
-".K c #317bc7",
-"#I c #323e4b",
-"#p c #333333",
-"#8 c #34353d",
-"aq c #3484d6",
-"aA c #3484d7",
-"az c #35404c",
-"#d c #363636",
-"aN c #373b5e",
-"bu c #387ec8",
-".4 c #393939",
-"a4 c #39414a",
-"aI c #3a87d7",
-"af c #3b3b3b",
-"#j c #3b699a",
-".V c #3c3c3c",
-"#A c #3c4046",
-"bn c #3c6a9a",
-".m c #3c95f2",
-".l c #3c95f3",
-".k c #3c96f4",
-".j c #3c96f5",
-".z c #3c97f5",
-".y c #3c97f6",
-"bJ c #3f4954",
-"aX c #3f99f6",
-"bD c #408ad7",
-".J c #419af6",
-"aT c #4284c8",
-"aW c #459cf6",
-"bd c #46688c",
-"#X c #474a60",
-".I c #479df6",
-"## c #48719b",
-"bT c #4887c8",
-"ba c #494949",
-"aU c #4a97e7",
-"bE c #4b81b9",
-".S c #4b89c9",
-"aV c #4b9ff6",
-".1 c #4d4d4d",
-".p c #545454",
-"ay c #555555",
-"#M c #555b91",
-".2 c #57789c",
-"#. c #585d61",
-"a5 c #5897d9",
-"bC c #59a6f7",
-"bM c #5aa6f7",
-".f c #606060",
-"#G c #616161",
-"bv c #62abf7",
-"aC c #636785",
-"#v c #646464",
-"aF c #676767",
-"bj c #6a8aac",
-"bS c #6bb0f8",
-"#a c #6f94bb",
-"bB c #6fb2f8",
-"aO c #707175",
-"bL c #70b2f8",
-"#b c #71879d",
-"bo c #72b4f8",
-"#6 c #747474",
-"aR c #757575",
-"#7 c #777777",
-"bQ c #7798bb",
-"#x c #77b6f8",
-"#W c #787878",
-"#t c #797979",
-"#k c #7ab8f8",
-".0 c #7b7b7b",
-"ai c #7b7f9f",
-"bF c #7bb9f8",
-".h c #7e7e7e",
-"#i c #808080",
-"by c #808f9d",
-"aG c #828282",
-"#F c #838383",
-"bR c #83bdf9",
-".Q c #848484",
-"av c #8487a4",
-"#5 c #858585",
-"bz c #86a8cb",
-"ao c #878787",
-"#9 c #878aa2",
-"ac c #888888",
-"bA c #89c0f9",
-"#2 c #8a8a8a",
-"bp c #8ac1f9",
-".w c #8b8b8b",
-".q c #8c8c8c",
-"#3 c #8d8d8d",
-"#H c #8e8e8e",
-"#n c #90979e",
-"#U c #919191",
-"#Z c #9396ac",
-"aS c #969696",
-"bw c #96c7fa",
-"#4 c #989898",
-"bG c #98c8fa",
-"ad c #9a9a9a",
-"#T c #9b9b9b",
-".g c #9c9c9c",
-"#e c #9d9d9d",
-"#y c #9dcafa",
-"ae c #9f9f9f",
-"#c c #9fbddc",
-"aE c #a0a0a0",
-"bH c #a1bedc",
-".9 c #a2a2a2",
-"a. c #a2a3ad",
-"#l c #a3cefa",
-"aD c #a4a4a4",
-"#Y c #a4a5ad",
-"#u c #a5a5a5",
-"aw c #a7a7a7",
-"al c #a8a8a8",
-"#g c #a9a9a9",
-"bK c #a9d1fb",
-"bq c #aacaeb",
-"#h c #acacac",
-"am c #afafaf",
-"#Q c #afb1bd",
-"#1 c #b0b0b0",
-".Z c #b1b1b1",
-".8 c #b3b3b3",
-"#P c #b3b3b9",
-"ak c #b4b4b4",
-"bx c #b5d7fb",
-"#r c #b9b9b9",
-"aj c #bababa",
-"ax c #bbbbbb",
-"a# c #bebebe",
-"an c #bfbfbf",
-".B c #c0c0c0",
-".r c #c2c2c2",
-"#R c #c2c3cb",
-".6 c #c5c5c5",
-"#z c #c5e0fc",
-"aa c #c7c7c7",
-".Y c #c8c8c8",
-"#0 c #c9c9c9",
-"#C c #cacaca",
-"aP c #cbcbcb",
-"#S c #cccccc",
-"#E c #cecece",
-"b# c #cfcfcf",
-".X c #d0d0d0",
-".7 c #d1d1d1",
-"ab c #d2d2d2",
-"#m c #d2e7fc",
-"#q c #d5d5d5",
-"#f c #d6d6d6",
-"#D c #d6d7db",
-"aQ c #d7d7d7",
-"#s c #d9d9d9",
-".t c #dbdbdb",
-".s c #dcdcdc",
-".5 c #dddddd",
-".F c #dedede",
-".E c #e0e0e0",
-".D c #e1e1e1",
-".C c #e3e3e3",
-".u c #e5e5e5",
-".G c #e6e6e6",
-".P c #e7e7e7",
-"#V c #eaeaea",
-".v c #ebebeb",
-".H c #ececec",
-".O c #ededed",
-"a3 c #eeeeee",
-"a0 c #efefef",
-"a2 c #f0f0f0",
-"a1 c #f1f1f1",
-".W c #f7f7f7",
-".N c #f9f9f9",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQtQt.a.b.#.c.dQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQt.#.#.e.f.g.h.#QtQtQtQt.i.j.k.l.m.nQtQtQtQtQt",
-"QtQtQtQtQtQtQt.#.o.p.q.r.s.t.u.v.w.#QtQtQt.x.y.z.k.k.AQtQtQtQtQt",
-"QtQtQtQtQtQt.#.B.u.C.D.E.F.s.s.G.H.q.#Qt.#.I.J.K.c.#.LQtQtQtQtQt",
-"QtQtQtQtQtQt.M.N.O.u.C.D.E.F.s.s.P.O.Q.#.R.S.T.UQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt.V.W.N.O.u.C.F.X.r.Y.X.Z.0.1.2.3QtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt.4.H.W.N.5.6.7.s.8.9#.###a#b#c.#QtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#d.D.H.W.Y#e#f#g#h#i#j#k#l#m#n#oQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#p#q.D.H.X#r#s#t#u#v#w#x#y#z#AQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#B#C#q#D#E#s.t#F#G#H.w#I#J#K#L#MQt#NQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#O#P#Q#R#S.s.F.r#T#U.w.F#V#WQt#MQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#X#Y#Z#C#0.F#1#2#3#4#5#6.O#7Qt#MQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt#8#9a.a#aaabac.E.8adae.1.Eaf.##oQtagQtQtQtQtQtQtQtQt",
-"QtQtQtQtQt#Nahaiajak.6al#5am#2an.q.paoap.zaqarasat.A.AQtQtQtQtQt",
-"QtQtQtQtQtQtauavan#r.6#i#eawanaxay#4azaAapap.z.j.k.k.l.#QtQtQtQt",
-"QtQtQtQtQtQtaBaC.ra##SaD.0aE#3ayaFaGaHaIaJaK.iaLaLataMQtQtQtQtQt",
-"QtQtQtQtQtQtQtaNaOa#aPaQaR.1.paS.G.waTaUaVaWaX.y.y.zaYQtQtQtQtQt",
-"QtQtQtQtQt#NQtQtaZaF#E#5a0a1a2a3ana4a5.#.#a6a7aKa8.za9QtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtb.#2.Hb#.Qbabb.#bcbdQtQtQtQtQtbebfQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQt.#.#.#.#bgbhbibjbkQtQtQtQtQtblbmQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.#bnbobp#lbq.#Qt.#brbsbtbua9QtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.#bv#kbwbxbyQt.#bzbAbBbCbD.#QtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQt.#bEbFbGbHbIQtbJbKbpbLbMbNQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQt.#bObP.#QtQt.#bQbRbSbTbUQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#bVbW.#QtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 0b66c44d0..5ae50bd5e 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -60,7 +60,7 @@ MainWindow::MainWindow(const QStringList& args,CommandLineOptionManager* option_
m_elapsed = 0;
m_option_manager = option_manager;
- setWindowIcon( QIcon(":/qmmp.xpm") );
+ setWindowIcon(QIcon(":/32x32/qmmp.png"));
m_skin = new Skin(this);
Dock *dock = new Dock(this);
diff --git a/src/ui/ui.pro b/src/ui/ui.pro
index 7163b2846..9b236c539 100644
--- a/src/ui/ui.pro
+++ b/src/ui/ui.pro
@@ -136,7 +136,19 @@ RESOURCES = images/images.qrc \
stuff.qrc
TEMPLATE = app
target.path = /bin
-INSTALLS += target
+
+desktop.files = qmmp.desktop
+desktop.path = /share/applications
+
+icon16.files = images/16x16/qmmp.png
+icon32.files = images/32x32/qmmp.png
+icon48.files = images/48x48/qmmp.png
+
+icon16.path = /share/icons/hicolor/16x16/apps
+icon32.path = /share/icons/hicolor/32x32/apps
+icon48.path = /share/icons/hicolor/48x48/apps
+
+INSTALLS += target icon16 icon32 icon48
RESOURCES += translations/qmmp_locales.qrc
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 17:56:25 +0000