diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-09-25 14:26:09 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2011-09-25 14:26:09 (GMT) |
| commit | c894c62dce3f433d13811f76baac086ba250c5fc (patch) | |
| tree | 261da5d2c620e441e4c4e1fad2d0d75a40cd21a6 | |
| parent | af6333f82b52116993c022e27f491725f37d8ee0 (diff) | |
| parent | 3ba2237c7e4cf4ddd71967efd01dbe71b8cf4ea4 (diff) | |
Merge branch 'master' of git.sugarlabs.org:stopwatch/stopwatch
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | activity.py | 6 | ||||
| -rw-r--r-- | activity/activity.info | 4 |
3 files changed, 9 insertions, 7 deletions
@@ -1,3 +1,9 @@ +11 + +*remove keep button (Gonzalo Odiard) +*fixing an exec error on activity.info +*more pootle templates + 9 *Disable idle suspend on opening journal entry with running timer by James Cameron diff --git a/activity.py b/activity.py index 7a32a6d..88313e2 100644 --- a/activity.py +++ b/activity.py @@ -48,7 +48,7 @@ class StopWatchActivity(Activity): try: from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton from sugar.activity.widgets import ActivityToolbarButton, StopButton, \ - ShareButton, KeepButton, TitleEntry, ActivityButton + ShareButton, TitleEntry, ActivityButton except ImportError: OLD_TOOLBAR = True @@ -70,10 +70,6 @@ class StopWatchActivity(Activity): toolbar_box.toolbar.insert(share_button, -1) share_button.show() - keep_button = KeepButton(self) - toolbar_box.toolbar.insert(keep_button, -1) - keep_button.show() - separator = gtk.SeparatorToolItem() separator.props.draw = False separator.set_expand(True) diff --git a/activity/activity.info b/activity/activity.info index 45f1834..6480745 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,7 +1,7 @@ [Activity] name = StopWatch bundle_id = org.laptop.StopWatchActivity -exec = activity.StopWatchActivity +exec = sugar-activity activity.StopWatchActivity icon = activity-stopwatch -activity_version = 9 +activity_version = 11 show_launcher = yes |