diff options
| author | mike <michael.jmontcalm@gmail.com> | 2009-03-19 20:20:40 (GMT) |
|---|---|---|
| committer | mike <michael.jmontcalm@gmail.com> | 2009-03-19 20:20:40 (GMT) |
| commit | de3cb8c0c9ab1bb2215338e1757bb231331e1c6c (patch) | |
| tree | 98d99a66d829e5b94ba7392ee813e13b4e605ca9 /src/sugar/activity/activity.py | |
| parent | 3d41146af5f136d156b5a1f0c65c553612fbd4b2 (diff) | |
| parent | e20cfb534e276fa7762980bbdd6d633a7ce99ccc (diff) | |
Merge branch 'tutorial_toolkit' into mike
Conflicts:
source/activities/Writus.activity/TAbiWordActivity.py
source/external/source/sugar-toolkit/src/sugar/graphics/window.py
source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
source/external/source/sugar-toolkit/src/sugar/tutorius/overlayer.py
source/external/source/sugar-toolkit/src/sugar/tutorius/services.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
Diffstat (limited to 'src/sugar/activity/activity.py')
| -rw-r--r-- | src/sugar/activity/activity.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index c5dca45..21e38f6 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -76,6 +76,7 @@ from sugar.graphics.xocolor import XoColor from sugar.datastore import datastore from sugar.session import XSMPClient from sugar import wm +from sugar.tutorius.services import ObjectStore _ = lambda msg: gettext.dgettext('sugar-toolkit', msg) @@ -181,18 +182,6 @@ class ActivityToolbar(gtk.Toolbar): self._updating_share = False - def __tutorial_changed_cb(self, combo): - if self._current_tutorial: - self._current_tutorial.detach() - - model = self.tutorials.combo.get_model() - it = self.tutorials.combo.get_active_iter() - (key, ) = model.get(it, 0) - t = self._activity.get_tutorials.get(key,None) - if t: - self._current_tutorial = t - self._current_tutorial.attach(self._activity) - def __share_changed_cb(self, combo): if self._updating_share: return @@ -508,6 +497,8 @@ class Activity(Window, gtk.Container): """ Window.__init__(self) + ObjectStore().activity = self + # process titles will only show 15 characters # but they get truncated anyway so if more characters # are supported in the future we will get a better view |