From cdea9ddc39f32e7fcca3d56c16ef0e16f03f462a Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Mon, 14 Mar 2011 15:37:06 +0000 Subject: Bump sugar version and include py specific fixes - Mouse globalkey for touchpad corner case - Paraguay protected activity list - Cursor acceleration enhancement --- diff --git a/rpms/sugar/Cursor-Acceleration-default-value.patch b/rpms/sugar/Cursor-Acceleration-default-value.patch new file mode 100644 index 0000000..6f93f8d --- /dev/null +++ b/rpms/sugar/Cursor-Acceleration-default-value.patch @@ -0,0 +1,48 @@ +From patchwork Mon Feb 21 22:15:40 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: Cursor Acceleration default value +Date: Tue, 22 Feb 2011 03:15:40 -0000 +From: Martin Abente +X-Patchwork-Id: 684 +Message-Id: <1298326540-3280-1-git-send-email-martin.abente.lahaye@gmail.com> +To: dextrose@lists.sugarlabs.org, + anish@sugarlabs.org + +This is patch is not for upstream. + +Testers from Paraguay complain about the +cursor being slower in last dextrose builds. + +This patch set the default value to 4.0. + +Signed-off-by: Martin Abente + +--- +data/sugar.schemas.in | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) + +diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in +index 841bc7f..51bd57a 100644 +--- a/data/sugar.schemas.in ++++ b/data/sugar.schemas.in +@@ -319,6 +319,18 @@ + + + ++ /schemas/desktop/sugar/peripherals/mouse/motion_acceleration ++ /desktop/sugar/peripherals/mouse/motion_acceleration ++ sugar ++ float ++ 4.0 ++ ++ Cursor Acceleration ++ Cursor Acceleration to be used ++ ++ ++ ++ + /schemas/desktop/sugar/font/default_face + /desktop/sugar/font/default_face + sugar diff --git a/rpms/sugar/Paraguay-Protected-list.patch b/rpms/sugar/Paraguay-Protected-list.patch new file mode 100644 index 0000000..8ad9b70 --- /dev/null +++ b/rpms/sugar/Paraguay-Protected-list.patch @@ -0,0 +1,74 @@ +From patchwork Wed Mar 2 00:20:06 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: Paraguay Protected list +Date: Wed, 02 Mar 2011 05:20:06 -0000 +From: Martin Abente +X-Patchwork-Id: 695 +Message-Id: <1299025206-2259-1-git-send-email-martin.abente.lahaye@gmail.com> +To: dextrose@lists.sugarlabs.org, + anish@sugarlabs.org + +Not for upstream. + +This patch add the paraguayan protected +activities list. + +--- +data/activities.protected | 44 ++++++++++++++++++++++++++++++++++---------- + 1 files changed, 34 insertions(+), 10 deletions(-) + +diff --git a/data/activities.protected b/data/activities.protected +index e3907ba..d73de22 100644 +--- a/data/activities.protected ++++ b/data/activities.protected +@@ -1,14 +1,38 @@ +-# Protected activities list +- +-org.laptop.WebActivity +-org.laptop.Calculate ++com.jotaro.ImplodeActivity ++edu.mit.media.ScratchActivity ++org.eq.FotoToon ++org.laptop.AbiWordActivity ++org.laptop.Arithmetic + org.laptop.Chat +-org.vpri.EtoysActivity +-org.laptop.ImageViewerActivity +-org.laptop.sugar.Jukebox + org.laptop.Log +-org.laptop.Pippy +-org.laptop.sugar.ReadActivity ++org.laptop.ImageViewerActivity ++org.laptop.MeasureActivity ++org.laptop.Memorize ++org.laptop.RecordActivity ++org.laptop.StopWatchActivity ++org.laptop.TamTamMini + org.laptop.Terminal + org.laptop.TurtleArtActivity +-org.laptop.AbiWordActivity ++org.laptop.Words ++org.laptop.community.Colors ++org.laptop.community.TypingTurtle ++org.laptop.physics ++org.laptop.sugar.GetBooksActivity ++org.laptop.sugar.ReadActivity ++org.sugarlabs.AbacusActivity ++org.vpri.EtoysActivity ++vu.lux.olpc.Speak ++vu.lux.olpc.Maze ++org.laptop.community.tetrismat ++org.worldwideworkshop.olpc.FlipSticks ++com.laptop.Ruler ++org.laptop.community.TurtleMachine ++org.laptop.community.Spirolaterals ++org.worldwideworkshop.PollBuilder ++org.gnome.Labyrinth ++org.sugarlabs.VisualMatchActivity ++org.laptop.sugar.Jukebox ++org.laptop.Oficina ++org.laptop.WebActivity ++org.tuxpaint ++com.garycmartin.Moon diff --git a/rpms/sugar/Sugar-Fix-globalkey-touchpad-corner-case.patch b/rpms/sugar/Sugar-Fix-globalkey-touchpad-corner-case.patch new file mode 100644 index 0000000..6d86f13 --- /dev/null +++ b/rpms/sugar/Sugar-Fix-globalkey-touchpad-corner-case.patch @@ -0,0 +1,50 @@ +From patchwork Wed Feb 16 21:15:12 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [Sugar] Fix globalkey touchpad corner case +Date: Thu, 17 Feb 2011 02:15:12 -0000 +From: Martin Abente +X-Patchwork-Id: 674 +Message-Id: <1297890912-18522-1-git-send-email-martin.abente.lahaye@gmail.com> +To: dextrose@lists.sugarlabs.org, + anish@sugarlabs.org + +This patch is not intended for upstream. Is just a minimal +hack to fix a corner case, where the palette must be created +before the tray icon or global can toggle the touchpad mode. + +A serious fix could consist on moving the mode-switching +code from extensions/deviceicon/touchpad.py to a touchpad +module at src/jarabe/model. + +This model should provide a public mode_toggle method and +also emit proper signals when it occurs. This way different +pieces of sugar code will be able to interact with the touchpad +properly without repeating code all over. + +--- +extensions/deviceicon/touchpad.py | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/extensions/deviceicon/touchpad.py b/extensions/deviceicon/touchpad.py +index 357bdd6..366bf74 100644 +--- a/extensions/deviceicon/touchpad.py ++++ b/extensions/deviceicon/touchpad.py +@@ -52,13 +52,14 @@ class DeviceView(TrayIcon): + color = XoColor(client.get_string('/desktop/sugar/user/color')) + TrayIcon.__init__(self, icon_name=icon_name, xo_color=color) + ++ self._palette = ResourcePalette(_('My touchpad'), self.icon) ++ self._palette.set_group_id('frame') ++ + self.set_palette_invoker(FrameWidgetInvoker(self)) + self.connect('button-release-event', self.__button_release_event_cb) + + def create_palette(self): + """ On create, set the current mode. """ +- self._palette = ResourcePalette(_('My touchpad'), self.icon) +- self._palette.set_group_id('frame') + return self._palette + + def __button_release_event_cb(self, widget, event): diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec index 0445a2b..c773c77 100644 --- a/rpms/sugar/sugar.spec +++ b/rpms/sugar/sugar.spec @@ -3,7 +3,7 @@ Summary: Constructionist learning platform Name: sugar Version: 0.88.1 -Release: 5.57dxo%{?dist} +Release: 5.58dxo%{?dist} URL: http://sugarlabs.org/ Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 @@ -189,6 +189,12 @@ patch3301: sugar-Do-not-fail-in-NM-less-environment.patch #Cursor theme fix patch3401: sugar-check-for-empty-cursor_theme.patch +#Py specific fixes (cursor speed, Paraguay-protected list, +#globalkey for touchpad corner case) +patch3501: Cursor-Acceleration-default-value.patch +patch3502: Paraguay-Protected-list.patch +patch3503: Sugar-Fix-globalkey-touchpad-corner-case.patch + License: GPLv2+ Group: User Interface/Desktops Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -404,6 +410,10 @@ multiple instances of sugar. %patch3401 -p1 +%patch3501 -p1 +%patch3502 -p1 +%patch3503 -p1 + %build autoreconf %configure @@ -480,6 +490,10 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg %changelog +* Mon Mar 14 2011 Anish Mangal 0.88.1-5.58 +- Py specific fixes (mouse acceleration, protected activity list) +- Py specific fixes (globalkey for touchpad icon corner case) + * Mon Mar 14 2011 Anish Mangal 0.88.1-5.57 - Update feedback to point to py servers -- cgit v0.9.1