Timer Applet

Merge lp://staging/~knny-myer/timer-applet/interval-timer into lp://staging/timer-applet

  1. interval-timer
  2. Merge into timer-applet
Proposed by Kenny Meyer
Status: Merged
Merged at revision: 342
Proposed branch: lp://staging/~knny-myer/timer-applet/interval-timer
Merge into: lp://staging/timer-applet
Diff against target: 2351 lines (+895/-326) (has conflicts)
16 files modified
timer-applet/THANKS (+1/-0)
timer-applet/data/TimerApplet.xml (+1/-0)
timer-applet/data/timer-applet.glade (+164/-11)
timer-applet/po/bn.po (+140/-69)
timer-applet/po/es.po (+107/-69)
timer-applet/po/messages.pot (+96/-69)
timer-applet/src/timerapplet/controllers/GlobalController.py (+18/-6)
timer-applet/src/timerapplet/controllers/TimerApplet.py (+135/-69)
timer-applet/src/timerapplet/core/PresetsStore.py (+41/-13)
timer-applet/src/timerapplet/core/Timer.py (+25/-2)
timer-applet/src/timerapplet/ui/AddEditPresetDialog.py (+12/-2)
timer-applet/src/timerapplet/ui/Makefile.am (+1/-0)
timer-applet/src/timerapplet/ui/StartNextTimerDialog.py (+66/-0)
timer-applet/src/timerapplet/ui/StartTimerDialog.py (+49/-14)
timer-applet/src/timerapplet/ui/__init__.py (+1/-0)
timer-applet/src/timerapplet/utils.py (+38/-2)
Text conflict in timer-applet/po/es.po
To merge this branch: bzr merge lp://staging/~knny-myer/timer-applet/interval-timer
Reviewer Review Type Date Requested Status
Kenny Meyer Approve
Review via email: mp+35571@code.staging.launchpad.net

Description of the change

Added feature for defining a next timer in the presets menu.

To post a comment you must log in.
Revision history for this message
Kenny Meyer (knny-myer) wrote :

Merged to development branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: