use Qt resources for icons.

4 files changed, 19 insertions, 15 deletions

diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index 55ff1a1..ea1befa 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -22,6 +22,7 @@ import os
 
 from ..plugin import Plugin
 from ..       import common
+from ..       import icons
 
 
 class AlbumCoverWidget(QtGui.QLabel):
@@ -60,7 +61,7 @@ class AlbumCoverWidget(QtGui.QLabel):
         if not cover or cover.isNull():
             self.cover        = None
             self.cover_loaded = False
-            self.setPixmap(QtGui.QPixmap('gfx/nephilim.png'))
+            self.setPixmap(QtGui.QPixmap(':icons/nephilim.png'))
             self.plugin.cover_changed.emit(QtGui.QPixmap())
             return
 
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index 3b6224f..5b529d6 100644
--- a/nephilim/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -24,6 +24,7 @@ from   lxml import etree
 
 from ..plugin import Plugin
 from ..       import common
+from ..       import icons
 
 class LyricsWidget(QtGui.QWidget):
     #public
@@ -56,13 +57,13 @@ class LyricsWidget(QtGui.QWidget):
         self.__toolbar = QtGui.QToolBar('Lyrics toolbar', self)
         self.__toolbar.setOrientation(QtCore.Qt.Vertical)
 
-        self.__toolbar.addAction(QtGui.QIcon('gfx/refresh.png'), 'Refresh lyrics', self.plugin.refresh)
-        edit = self.__toolbar.addAction(QtGui.QIcon('gfx/edit.png'), 'Edit lyrics')
+        self.__toolbar.addAction(QtGui.QIcon(':icons/refresh.png'), 'Refresh lyrics', self.plugin.refresh)
+        edit = self.__toolbar.addAction(QtGui.QIcon(':icons/edit.png'), 'Edit lyrics')
         edit.setCheckable(True)
         edit.toggled.connect(self.__toggle_editable)
 
-        self.__toolbar.addAction(QtGui.QIcon('gfx/save.png'), 'Save lyrics', self.__save_lyrics)
-        self.__toolbar.addAction(QtGui.QIcon('gfx/delete.png'), 'Delete stored file', self.plugin.del_lyrics_file)
+        self.__toolbar.addAction(QtGui.QIcon(':icons/save.png'), 'Save lyrics', self.__save_lyrics)
+        self.__toolbar.addAction(QtGui.QIcon(':icons/delete.png'), 'Delete stored file', self.plugin.del_lyrics_file)
 
         self.setLayout(QtGui.QGridLayout())
         self.layout().setSpacing(0)
diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 32a0e59..30142c0 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -20,6 +20,7 @@ from PyQt4.QtCore import QVariant
 
 from ..common import Button
 from ..plugin import Plugin
+from ..       import icons
 
 class wgPlayControl(QtGui.QToolBar):
     """Displays controls for interacting with playing, like play, volume ..."""
@@ -67,13 +68,13 @@ class wgPlayControl(QtGui.QToolBar):
         self.logger = p.logger
         self.setObjectName(p.name)
 
-        self.play_icon   = QtGui.QIcon('gfx/media-playback-start.svg')
-        self.pause_icon  = QtGui.QIcon('gfx/media-playback-pause.svg')
+        self.play_icon   = QtGui.QIcon(':icons/media-playback-start.svg')
+        self.pause_icon  = QtGui.QIcon(':icons/media-playback-pause.svg')
 
         self.play_action = self.addAction(self.play_icon, 'play', self.on_play_click)
-        self.stop_action = self.addAction(QtGui.QIcon('gfx/media-playback-stop.svg'),     'stop', self.on_stop_click)
-        self.prev_action = self.addAction(QtGui.QIcon('gfx/media-skip-backward.svg'), 'previous', self.on_prev_click)
-        self.next_action = self.addAction(QtGui.QIcon('gfx/media-skip-forward.svg'),      'next', self.on_next_click)
+        self.stop_action = self.addAction(QtGui.QIcon(':icons/media-playback-stop.svg'),     'stop', self.on_stop_click)
+        self.prev_action = self.addAction(QtGui.QIcon(':icons/media-skip-backward.svg'), 'previous', self.on_prev_click)
+        self.next_action = self.addAction(QtGui.QIcon(':icons/media-skip-forward.svg'),      'next', self.on_next_click)
         self.addSeparator()
 
         self.vol_slider = self.VolumeSlider(self)
@@ -81,28 +82,28 @@ class wgPlayControl(QtGui.QToolBar):
         self.addWidget(self.vol_slider)
         self.addSeparator()
 
-        self.random = self.addAction(QtGui.QIcon('gfx/media-playlist-shuffle.svgz'), 'random')
+        self.random = self.addAction(QtGui.QIcon(':icons/media-playlist-shuffle.svgz'), 'random')
         self.random.setCheckable(True)
         self.random.toggled.connect(self.p.mpclient.random)
         self.p.mpclient.random_changed.connect(self.random.setChecked)
 
-        self.repeat = self.addAction(QtGui.QIcon('gfx/media-playlist-repeat.svg'), 'repeat')
+        self.repeat = self.addAction(QtGui.QIcon(':icons/media-playlist-repeat.svg'), 'repeat')
         self.repeat.setCheckable(True)
         self.p.mpclient.repeat_changed.connect(self.repeat.setChecked)
         self.repeat.toggled.connect(self.p.mpclient.repeat)
 
-        self.single = self.addAction(QtGui.QIcon('gfx/single.png'), 'single mode')
+        self.single = self.addAction(QtGui.QIcon(':icons/single.png'), 'single mode')
         self.single.setCheckable(True)
         self.p.mpclient.single_changed.connect(self.single.setChecked)
         self.single.toggled.connect(self.p.mpclient.single)
 
-        self.consume = self.addAction(QtGui.QIcon('gfx/consume.png'), 'consume mode')
+        self.consume = self.addAction(QtGui.QIcon(':icons/consume.png'), 'consume mode')
         self.consume.setCheckable(True)
         self.p.mpclient.consume_changed.connect(self.consume.setChecked)
         self.consume.toggled.connect(self.p.mpclient.consume)
 
         self.outputs_menu = QtGui.QMenu('Audio outputs')
-        outputs           = self.addAction(QtGui.QIcon('gfx/outputs.png'), 'Audio outputs')
+        outputs           = self.addAction(QtGui.QIcon(':icons/outputs.png'), 'Audio outputs')
         outputs.triggered.connect(lambda : self.outputs_menu.popup(QtGui.QCursor.pos()))
         self.p.mpclient.connect_changed.connect(self.__update_outputs)
 
diff --git a/nephilim/plugins/Systray.py b/nephilim/plugins/Systray.py
index c909b4b..084ec9d 100644
--- a/nephilim/plugins/Systray.py
+++ b/nephilim/plugins/Systray.py
@@ -21,6 +21,7 @@ from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
 from ..common import sec2min, APPNAME, appIcon, expand_tags
+from ..       import icons
 
 class Systray(Plugin):
     # public, const