Notify: customizable messages.

1 files changed, 17 insertions, 8 deletions

diff --git a/plugins/Notify.py b/plugins/Notify.py
index 7b31384..90da0be 100644
--- a/plugins/Notify.py
+++ b/plugins/Notify.py
@@ -6,8 +6,8 @@ from misc import *
 from clPlugin import Plugin
 import plugins
 
-NOTIFY_SONGFORMAT_DEFAULT='$if($artist,$artist)$if($album, - [$album #$track])\n$title ($timems)';
-NOTIFY_TIMER_DEFAULT=3
+NOTIFY_SONGFORMAT_DEFAULT = '$track - $artist - $title ($album) [$time]';
+NOTIFY_TIMER_DEFAULT = 3
 
 NOTIFY_PRIORITY_SONG = 1
 NOTIFY_PRIORITY_VOLUME = 2
@@ -103,6 +103,14 @@ class pluginNotify(Plugin):
         self.addMontyListener('onStateChange', self.onStateChange)
         self.addMontyListener('onVolumeChange', self.onVolumeChange)
 
+        #init settings
+        self.settings.beginGroup(self.name)
+        if not self.settings.contains('songformat'):
+            self.settings.setValue('songformat', QVariant(NOTIFY_SONGFORMAT_DEFAULT))
+        if not self.settings.contains('timer'):
+            self.settings.setValue('timer', QVariant(NOTIFY_TIMER_DEFAULT))
+        self.settings.endGroup()
+
     def _load(self):
         self.o = winNotify(self, self.winMain)
     def _unload(self):
@@ -114,8 +122,10 @@ class pluginNotify(Plugin):
         song = self.monty.getCurrentSong()
         if not song:
             return
-        self.o.show(str(song.getTrack()) + ' - ' + song.getArtist() + ' - ' + song.getTitle() +  ' (' + song.getAlbum() + ') '
-                    + '[' + sec2min(song.getTag('time')) + ']', self.settings.value(self.name + '/timer', QVariant(NOTIFY_TIMER_DEFAULT)).toInt()[0], NOTIFY_PRIORITY_SONG)
+        self.settings.beginGroup(self.name)
+        self.o.show(song.expand_tags(self.settings.value('songformat').toString()), self.settings.value('timer').toInt()[0],
+                    NOTIFY_PRIORITY_SONG)
+        self.settings.endGroup()
 
     def onReady(self, params):
         self.o.show('montypc loaded!', self.settings.value(self.name + '/timer', QVariant(NOTIFY_TIMER_DEFAULT)).toInt()[0])
@@ -137,10 +147,9 @@ class pluginNotify(Plugin):
             Plugin.SettingsWidget.__init__(self, plugin)
             self.settings.beginGroup(self.plugin.getName())
 
-            self.format = QtGui.QTextEdit()
-            self.format.insertPlainText(self.settings.value('songformat', QVariant(NOTIFY_SONGFORMAT_DEFAULT)).toString())
+            self.format = QtGui.QLineEdit(self.settings.value('songformat').toString())
 
-            self.timer = QtGui.QLineEdit(self.settings.value('timer', QVariant(NOTIFY_TIMER_DEFAULT)).toString())
+            self.timer = QtGui.QLineEdit(self.settings.value('timer').toString())
             self.timer.setValidator(QtGui.QIntValidator(self.timer))
 
             self.setLayout(QtGui.QVBoxLayout())
@@ -150,7 +159,7 @@ class pluginNotify(Plugin):
 
         def save_settings(self):
             self.settings.beginGroup(self.plugin.getName())
-            self.settings.setValue('songformat', QVariant(self.format.toPlainText()))
+            self.settings.setValue('songformat', QVariant(self.format.text()))
             self.settings.setValue('timer', QVariant(self.timer.text().toInt()[0]))
             self.settings.endGroup()
             self.plugin.onSongChange(None)