diff options
author | Simon Poirier <simpoir@Eridani.(none)> | 2009-09-09 17:12:45 (GMT) |
---|---|---|
committer | Simon Poirier <simpoir@Eridani.(none)> | 2009-09-09 17:12:45 (GMT) |
commit | 3ff36304e5a3c2aa6e4152e8c49c64b4833b3687 (patch) | |
tree | 1bce5ecbc351501cc4f553a25307eb001cac6268 | |
parent | 11083eda42704b38e9d84d8bdc5683aa80e0a0f5 (diff) | |
parent | 9e55088de62197f15e5566c94b2213755bd23c26 (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline
-rw-r--r-- | README | 7 | ||||
m--------- | externals/sugar-toolkit | 0 | ||||
-rw-r--r-- | jhbuild/config/modulesets/glucose-tutorius.modules | 64 | ||||
-rw-r--r-- | jhbuild/config/modulesets/sugar-tutorius.modules | 19 | ||||
-rw-r--r-- | jhbuild/sugar.jhbuildrc | 9 | ||||
-rw-r--r-- | toolkitfix/graphics/window.py | 3 |
6 files changed, 100 insertions, 2 deletions
@@ -7,6 +7,13 @@ Requirements: Note however that some sugar files will be patched, so you may wish to use a separate installation. +Integration into jhbuild: + + There are a set of jhbuild configuration files in the jhbuild/ folder. + You can use those to change your jhbuild environment to have it build + the latest version of tutorius. Replace/add the files into the + sugar jhbuild directory tree. + Installation 1. Edit the setup.cfg file to point to your sugar installation prefix. diff --git a/externals/sugar-toolkit b/externals/sugar-toolkit -Subproject 0993283113e826570256b865adb95069902a04e +Subproject 8019a1fdabd4edd85ba2bbe26929a3f57090679 diff --git a/jhbuild/config/modulesets/glucose-tutorius.modules b/jhbuild/config/modulesets/glucose-tutorius.modules new file mode 100644 index 0000000..346581a --- /dev/null +++ b/jhbuild/config/modulesets/glucose-tutorius.modules @@ -0,0 +1,64 @@ +<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*--> +<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> +<moduleset> + <repository type="git" name="git.sugarlabs.org" default="yes" + href="git://git.sugarlabs.org"/> + <autotools id="sugar-base"> + <branch module="sugar-base/mainline.git" checkoutdir="sugar-base"/> + <dependencies> + <dep package="pygobject"/> + </dependencies> + </autotools> + <autotools id="sugar-toolkit"> + <branch module="sugar-toolkit/sugar-toolkit-tutorius.git" checkoutdir="sugar-toolkit"/> + <dependencies> + <dep package="pygobject"/> + <dep package="sugar-datastore"/> + <dep package="hippo-canvas"/> + <dep package="sugar-presence-service"/> + </dependencies> + </autotools> + <distutils id="tutorius"> + <branch module="tutorius/mainline.git" checkoutdir="tutorius"/> + <dependencies> + <dep package="sugar-toolkit"/> + </dependencies> + </distutils> + <autotools id="sugar"> + <branch module="sugar/mainline.git" checkoutdir="sugar"/> + <dependencies> + <dep package="GConf-dbus"/> + <dep package="sugar-base"/> + <dep package="sugar-toolkit"/> + <dep package="sugar-artwork"/> + <dep package="metacity"/> + </dependencies> + </autotools> + <autotools id="sugar-presence-service"> + <branch module="sugar-presence-service/mainline.git" checkoutdir="sugar-presence-service"/> + <dependencies> + <dep package="telepathy-gabble"/> + <dep package="telepathy-salut"/> + <dep package="telepathy-python"/> + </dependencies> + </autotools> + <autotools id="sugar-artwork"> + <branch module="sugar-artwork/mainline.git" checkoutdir="sugar-artwork"/> + <dependencies> + </dependencies> + </autotools> + <autotools id="sugar-datastore"> + <branch module="sugar-datastore/mainline.git" checkoutdir="sugar-datastore"/> + </autotools> + + <metamodule id="meta-glucose"> + <dependencies> + <dep package="sugar"/> + <dep package="pyabiword"/> + <dep package="abiword-plugins"/> + <dep package="squeak"/> + <dep package="gnome-python-desktop"/> + <dep package="hulahop"/> + </dependencies> + </metamodule> +</moduleset> diff --git a/jhbuild/config/modulesets/sugar-tutorius.modules b/jhbuild/config/modulesets/sugar-tutorius.modules new file mode 100644 index 0000000..50cb154 --- /dev/null +++ b/jhbuild/config/modulesets/sugar-tutorius.modules @@ -0,0 +1,19 @@ +<?xml version="1.0"?><!--*- mode: nxml; indent-tabs-mode: nil -*--> +<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?> +<moduleset> + + <include href="tools.modules"/> + <include href="glucose-external.modules"/> + <include href="glucose-tutorius.modules"/> + <include href="fructose.modules"/> + <include href="extra.modules"/> + <include href="extra-activities.modules"/> + <include href="buildbot.modules"/> + <metamodule id="meta-sugar"> + <dependencies> + <dep package="meta-tools"/> + <dep package="meta-glucose"/> + <dep package="meta-fructose"/> + </dependencies> + </metamodule> +</moduleset> diff --git a/jhbuild/sugar.jhbuildrc b/jhbuild/sugar.jhbuildrc new file mode 100644 index 0000000..cbf1ced --- /dev/null +++ b/jhbuild/sugar.jhbuildrc @@ -0,0 +1,9 @@ +use_local_modulesets = True +modulesets_dir = os.path.join(os.path.dirname(__file__), 'config/modulesets') +jhbuildbot_slaves_dir = os.path.join(os.path.dirname(__file__), 'sbuildbot') +jhbuildbot_mastercfg = os.path.join(os.path.dirname(__file__), 'sbuildbot', 'master.cfg') +jhbuildbot_dir = os.path.join(os.path.dirname(__file__), 'sbuildbot') + +moduleset = 'sugar-tutorius' +modules = ['meta-sugar'] + diff --git a/toolkitfix/graphics/window.py b/toolkitfix/graphics/window.py index 1004a78..7936183 100644 --- a/toolkitfix/graphics/window.py +++ b/toolkitfix/graphics/window.py @@ -108,11 +108,10 @@ class Window(gtk.Window): | gtk.gdk.POINTER_MOTION_MASK) self._event_box.connect('motion-notify-event', self.__motion_notify_cb) - self.add(self._vbox) - self._vbox.show() self._overlayer = Overlayer(self._vbox) self.add(self._overlayer) + self._vbox.show() self._overlayer.show() self._is_fullscreen = False |