Merge lp:~jaapz-b/pomidor/notify into lp:~dkotrada/pomidor/0.1

[Jaap Broekhuizen]

[Jaap Broekhuizen (jaapz-b)]

Though the status says "merged" it is, in fact, not merged... Why?

[dkotrada (dkotrada)]

Because I don't know how to do it. I done it manually at
http://bazaar.launchpad.net/~dkotrada/pomidor/0.1/revision/23

and self.loop() I removed at later revisions because I read your comments
later.

I never worked together on one code with another person in launchpad

2013/4/15 Jaap Broekhuizen <email address hidden>

> Though the status says "merged" it is, in fact, not merged... Why?
> --
> https://code.launchpad.net/~jaapz-b/pomidor/notify/+merge/158781
> You are requested to review the proposed merge of
> lp:~jaapz-b/pomidor/notify into lp:pomidor.
>

[dkotrada (dkotrada)]

Here is the self.loop() removed
http://bazaar.launchpad.net/~dkotrada/pomidor/0.1/revision/25

2013/4/15 Jaap Broekhuizen <email address hidden>

> Though the status says "merged" it is, in fact, not merged... Why?
> --
> https://code.launchpad.net/~jaapz-b/pomidor/notify/+merge/158781
> You are requested to review the proposed merge of
> lp:~jaapz-b/pomidor/notify into lp:pomidor.
>

[dkotrada (dkotrada)]

Here is the self.loop() removed
http://bazaar.launchpad.net/~dkotrada/pomidor/0.1/revision/25

2013/4/14 Jaap Broekhuizen <email address hidden>

> Jaap Broekhuizen has proposed merging lp:~jaapz-b/pomidor/notify into
> lp:pomidor.
>
> Requested reviews:
> dkotrada (dkotrada)
> Related bugs:
> Bug #1168869 in pomidor: "Use Notify from gir instead of notify-send"
> https://bugs.launchpad.net/pomidor/+bug/1168869
>
> For more details, see:
> https://code.launchpad.net/~jaapz-b/pomidor/notify/+merge/158781
> --
> https://code.launchpad.net/~jaapz-b/pomidor/notify/+merge/158781
> You are requested to review the proposed merge of
> lp:~jaapz-b/pomidor/notify into lp:pomidor.
>
> === modified file 'pomidor/PomidorWindow.py'
> --- pomidor/PomidorWindow.py 2013-04-11 15:36:08 +0000
> +++ pomidor/PomidorWindow.py 2013-04-14 12:32:25 +0000
> @@ -7,7 +7,7 @@
> from gettext import gettext as _
> gettext.textdomain('pomidor')
>
> -from gi.repository import Gtk, GObject, Unity # pylint: disable=E0611
> +from gi.repository import GObject, Unity, Notify # pylint: disable=E0611
> import logging
> logger = logging.getLogger('pomidor')
>
> @@ -16,7 +16,6 @@
> #from pomidor.PreferencesPomidorDialog import PreferencesPomidorDialog
>
> from pomidor import pycanberra
> -import subprocess
>
> zeit_mark = "<span font_desc='59.0'>%02i:%02i</span>"
>
> @@ -100,15 +99,25 @@
> self.minimizeonclicked = 1 # alow minimizing when timer
> is activated
>
> return True
> - self.loop.run()
>
>
> class Salert():
> + """ Show a notification using libnotify, and play a soun using
> pycanberra. """
> +
> + image = "file:///usr/share/pomidor/media/pomidor.svg"
> +
> + def __init__(self):
> + """ Make sure Notify is initted """
> + if not Notify.is_initted():
> + Notify.init("Pomidor")
>
> def play(self):
> - # Message
> - subprocess.Popen("notify-send -i
> /usr/share/pomidor/media/pomidor.svg 'Pomidor Time Manager' 'Time is up!'",
> shell=True)
> - # Sound
> + # Show notification
> + n = Notify.Notification.new(_("Pomidor Time Manager"), _("Time is
> up!"), self.image)
> + if not n.show():
> + raise Exception(_("Could not show notification..."))
> +
> + # Play a sound
> canberra = pycanberra.Canberra()
> canberra.easy_play_sync("service-login")
> - canberra.destroy()
> \ No newline at end of file
> + canberra.destroy()
>
>
>

=== modified file 'pomidor/PomidorWindow.py'
--- pomidor/PomidorWindow.py	2013-04-11 15:36:08 +0000
+++ pomidor/PomidorWindow.py	2013-04-14 12:37:26 +0000
@@ -7,7 +7,7 @@
 from gettext import gettext as _
 gettext.textdomain('pomidor')
 
-from gi.repository import Gtk, GObject, Unity # pylint: disable=E0611
+from gi.repository import GObject, Unity, Notify # pylint: disable=E0611
 import logging
 logger = logging.getLogger('pomidor')
 
@@ -16,7 +16,6 @@
 #from pomidor.PreferencesPomidorDialog import PreferencesPomidorDialog
 
 from pomidor import pycanberra
-import subprocess
 
 zeit_mark = "<span font_desc='59.0'>%02i:%02i</span>"
 
@@ -100,15 +99,25 @@
                 self.minimizeonclicked = 1 # alow minimizing when timer is activated
 
         return True
-        self.loop.run()
 
 
 class Salert():
+    """ Show a notification using libnotify, and play a soun using pycanberra. """
+
+    image = "file:///usr/share/pomidor/media/pomidor.svg"
+
+    def __init__(self):
+        """ Make sure Notify is initted  """
+        if not Notify.is_initted():
+            Notify.init("Pomidor")
 
     def play(self):
-        # Message
-        subprocess.Popen("notify-send -i /usr/share/pomidor/media/pomidor.svg 'Pomidor Time Manager' 'Time is up!'", shell=True)
-        # Sound
+        # Show notification
+        n = Notify.Notification.new(_("Pomidor Time Manager"), _("Time is up!"), self.image)
+        if not n.show():
+            raise Exception(_("Could not show notification..."))
+
+        # Play a sound
         canberra = pycanberra.Canberra()
         canberra.easy_play_sync("service-login")
-        canberra.destroy()
\ No newline at end of file
+        canberra.destroy()