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

Proposed by Jaap Broekhuizen
Status: Merged
Approved by: dkotrada
Approved revision: 57
Merge reported by: dkotrada
Merged at revision: not available
Proposed branch: lp:~jaapz-b/pomidor/quicklist
Merge into: lp:~dkotrada/pomidor/0.1
Diff against target: 63 lines (+38/-1)
1 file modified
pomidor/PomidorWindow.py (+38/-1)
To merge this branch: bzr merge lp:~jaapz-b/pomidor/quicklist
Reviewer Review Type Date Requested Status
dkotrada Approve
Review via email: mp+160399@code.launchpad.net

Description of the change

Added quicklist items (using dynamic quicklists)

To post a comment you must log in.
Revision history for this message
dkotrada (dkotrada) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'pomidor/PomidorWindow.py'
--- pomidor/PomidorWindow.py 2013-04-18 18:55:15 +0000
+++ pomidor/PomidorWindow.py 2013-04-23 15:07:26 +0000
@@ -15,7 +15,7 @@
15from gettext import gettext as _15from gettext import gettext as _
16gettext.textdomain('pomidor')16gettext.textdomain('pomidor')
1717
18from gi.repository import Gtk, GLib, Gdk, GObject, Unity, Notify # pylint: disable=E061118from gi.repository import Gtk, GLib, Gdk, GObject, Unity, Notify, Dbusmenu # pylint: disable=E0611
19import logging19import logging
20logger = logging.getLogger('pomidor')20logger = logging.getLogger('pomidor')
2121
@@ -40,6 +40,7 @@
40 self.SettingsDialog = SettingsDialog40 self.SettingsDialog = SettingsDialog
4141
42 # Code for other initialization actions should be added here.42 # Code for other initialization actions should be added here.
43 self.initialize_quicklist()
4344
44 self.timeout_id = None45 self.timeout_id = None
45 self.time = 046 self.time = 0
@@ -75,6 +76,42 @@
75 GLib.file_set_contents(filename, s)76 GLib.file_set_contents(filename, s)
7677
7778
79 def initialize_quicklist(self):
80 """ Initialize a nice dynamic quicklist. """
81 launcher = Unity.LauncherEntry.get_for_desktop_id("pomidor.desktop")
82 quicklist = Dbusmenu.Menuitem.new()
83
84 pitem = Dbusmenu.Menuitem.new()
85 pitem.property_set(Dbusmenu.MENUITEM_PROP_LABEL, _("Start Pomodoro"))
86 pitem.connect("item-activated", self.on_pitem_clicked, None)
87
88 sitem = Dbusmenu.Menuitem.new()
89 sitem.property_set(Dbusmenu.MENUITEM_PROP_LABEL, _("Short Break"))
90 sitem.connect("item-activated", self.on_sitem_clicked, None)
91
92 litem = Dbusmenu.Menuitem.new()
93 litem.property_set(Dbusmenu.MENUITEM_PROP_LABEL, _("Long Break"))
94 litem.connect("item-activated", self.on_litem_clicked, None)
95
96 quicklist.child_append(pitem)
97 quicklist.child_append(sitem)
98 quicklist.child_append(litem)
99
100 launcher.set_property("quicklist", quicklist)
101
102 def on_pitem_clicked(self, widget, event, data = None):
103 """ Run pomidor via quicklist """
104 self.on_pbutton_clicked(widget)
105
106 def on_sitem_clicked(self, widget, event, data = None):
107 """ Run shortbreak via quicklist """
108 self.on_sbutton_clicked(widget)
109
110 def on_litem_clicked(self, widget, event, data = None):
111 """ Run longbreak via quicklist """
112 self.on_lbutton_clicked(widget)
113
114
78 def on_pbutton_clicked(self, widget):115 def on_pbutton_clicked(self, widget):
79 ''' Run Pomodoro '''116 ''' Run Pomodoro '''
80 if self.timeout_id:117 if self.timeout_id:

Subscribers

People subscribed via source and target branches

to all changes: