sugar-toolkit: merge esteban and tch patches

5 files changed, 184 insertions, 3 deletions

diff --git a/rpms/sugar-toolkit/accessibility_0001_style-contrast.patch b/rpms/sugar-toolkit/accessibility_0001_style-contrast.patch
new file mode 100644
index 0000000..dc980e3
--- /dev/null
+++ b/rpms/sugar-toolkit/accessibility_0001_style-contrast.patch
@@ -0,0 +1,36 @@
+diff -u -r -N sugar-toolkit-0.88.1.original/src/sugar/graphics/style.py sugar-toolkit-0.88.1/src/sugar/graphics/style.py
+--- sugar-toolkit-0.88.1.original/src/sugar/graphics/style.py	2010-04-14 05:18:00.000000000 -0300
++++ sugar-toolkit-0.88.1/src/sugar/graphics/style.py	2010-07-08 10:39:53.540643395 -0300
+@@ -1,4 +1,5 @@
+ # Copyright (C) 2007, Red Hat, Inc.
++# Copyright (C) 2010, Plan Ceibal <comunidad@plan.ceibal.edu.uy>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+@@ -117,6 +118,7 @@
+ XLARGE_ICON_SIZE = zoom(55 * 2.75)
+ 
+ client = gconf.client_get_default()
++THEME = client.get_string('/desktop/sugar/interface/gtk_theme')
+ FONT_SIZE = client.get_float('/desktop/sugar/font/default_size')
+ FONT_FACE = client.get_string('/desktop/sugar/font/default_face')
+ 
+@@ -137,11 +139,17 @@
+ COLOR_PANEL_GREY = Color('#C0C0C0')
+ COLOR_SELECTION_GREY = Color('#A6A6A6')
+ COLOR_TOOLBAR_GREY = Color('#282828')
+-COLOR_BUTTON_GREY = Color('#808080')
+ COLOR_INACTIVE_FILL = Color('#9D9FA1')
+ COLOR_INACTIVE_STROKE = Color('#757575')
+ COLOR_TEXT_FIELD_GREY = Color('#E5E5E5')
+ COLOR_HIGHLIGHT = Color('#E7E7E7')
++COLOR_BUTTON_GREY = Color('#808080')
++if (THEME == 'sugar-contrast'):
++    COLOR_DESKTOP_ICON = Color('#000033')
++    COLOR_BG_CP = Color('#000033')
++else:
++    COLOR_DESKTOP_ICON = Color('#808080')
++    COLOR_BG_CP = Color('#FFFFFF')
+ 
+ PALETTE_CURSOR_DISTANCE = zoom(10)
+ 
diff --git a/rpms/sugar-toolkit/add-ErrorAlert.patch b/rpms/sugar-toolkit/add-ErrorAlert.patch
new file mode 100644
index 0000000..24a42be
--- /dev/null
+++ b/rpms/sugar-toolkit/add-ErrorAlert.patch
@@ -0,0 +1,75 @@
+From: anishmangal2002 <anishmangal2002@gmail.com>
+To: sugar-devel <sugar-devel@lists.sugarlabs.org>
+Cc: Bernie Innocenti <bernie@codewiz.org> anishmangal2002 <anishmangal2002@gmail.com>
+Subject: [PATCH] Add ErrorAlert inherited from Alert
+Date: Sat,  3 Jul 2010 00:56:37 +0530
+
+Adds the ErrorAlert class which is an alert inherited from
+the base Alert class. This is very similar to the
+ConfirmationAlert class with the difference being that it
+only displays an 'Ok' button in the Alert popup.
+
+Signed-off-by: anishmangal2002 <anishmangal2002@gmail.com>
+---
+ src/sugar/graphics/alert.py |   44 +++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 44 insertions(+), 0 deletions(-)
+
+diff --git a/src/sugar/graphics/alert.py b/src/sugar/graphics/alert.py
+index 4441909..4dfa515 100644
+--- a/src/sugar/graphics/alert.py
++++ b/src/sugar/graphics/alert.py
+@@ -290,6 +290,50 @@ class ConfirmationAlert(Alert):
+         self.add_button(gtk.RESPONSE_OK, _('Ok'), icon)
+         icon.show()
+ 
++class ErrorAlert(Alert):
++    """
++    This is a ready-made one button (Ok) alert.
++
++    An error alert is a nice shortcut from a standard Alert because it
++    comes with the 'OK' button already built-in. When clicked, the
++    'OK' button will emit a response with a response_id of gtk.RESPONSE_OK.
++
++    Examples
++    --------
++
++    .. code-block:: python
++      from sugar.graphics.alert import ErrorAlert
++      ...
++        #### Method: _alert_error, create a Error alert (with ok
++                     button standard)
++        # and add it to the UI.
++        def _alert_error(self):
++            alert = ErrorAlert()
++            alert.props.title=_('Title of Alert Goes Here')
++            alert.props.msg = _('Text message of alert goes here')
++            alert.connect('response', self._alert_response_cb)
++            self.add_alert(alert)
++
++
++        #### Method: _alert_response_cb, called when an alert object throws a
++                     response event.
++        def _alert_response_cb(self, alert, response_id):
++            #remove the alert from the screen, since either a response button
++            #was clicked or there was a timeout
++            self.remove_alert(alert)
++
++            #Do any work that is specific to the response_id.
++            if response_id is gtk.RESPONSE_OK:
++                print 'Ok Button was clicked. Do any work upon ok here ...'
++
++    """
++
++    def __init__(self, **kwargs):
++        Alert.__init__(self, **kwargs)
++
++        icon = Icon(icon_name='dialog-ok')
++        self.add_button(gtk.RESPONSE_OK, _('Ok'), icon)
++        icon.show()
+ 
+ class _TimeoutIcon(hippo.CanvasText, hippo.CanvasItem):
+     """An icon with a round border"""
+-- 
+1.7.0.1
+
+
diff --git a/rpms/sugar-toolkit/bundle-Delete-activities-profile-data-when-uninstall.patch b/rpms/sugar-toolkit/bundle-Delete-activities-profile-data-when-uninstall.patch
new file mode 100644
index 0000000..0b097c6
--- /dev/null
+++ b/rpms/sugar-toolkit/bundle-Delete-activities-profile-data-when-uninstall.patch
@@ -0,0 +1,37 @@
+diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
+index c83257f..f6d52ee 100644
+--- a/src/sugar/bundle/activitybundle.py
++++ b/src/sugar/bundle/activitybundle.py
+@@ -25,6 +25,7 @@ import locale
+ import os
+ import tempfile
+ import logging
++import shutil
+ 
+ from sugar import env
+ from sugar import util
+@@ -388,7 +389,7 @@ class ActivityBundle(Bundle):
+             os.unlink(dst)
+         os.symlink(src, dst)
+ 
+-    def uninstall(self, install_path, force=False):
++    def uninstall(self, install_path, force=False, delete_profile=False):
+         if os.path.islink(install_path):
+             # Don't remove the actual activity dir if it's a symbolic link
+             # because we may be removing user data.
+@@ -417,6 +418,12 @@ class ActivityBundle(Bundle):
+                        os.readlink(path).startswith(install_path):
+                         os.remove(path)
+ 
++        if delete_profile:
++            bundle_profile_path = env.get_profile_path(self._bundle_id)
++            if os.path.exists(bundle_profile_path):
++                os.chmod(bundle_profile_path, 0775)
++                shutil.rmtree(bundle_profile_path, ignore_errors=True)
++
+         self._uninstall(install_path)
+ 
+     def is_user_activity(self):
+-- 
+1.6.0.4
+
diff --git a/rpms/sugar-toolkit/keep_a_copy_translation_missing.patch b/rpms/sugar-toolkit/keep_a_copy_translation_missing.patch
new file mode 100644
index 0000000..8aaf3b9
--- /dev/null
+++ b/rpms/sugar-toolkit/keep_a_copy_translation_missing.patch
@@ -0,0 +1,14 @@
+diff -u -r -N sugar-toolkit-copia-0.88.1/po/es.po sugar-toolkit-0.88.1/po/es.po
+--- sugar-toolkit-copia-0.88.1/po/es.po	2010-04-14 05:18:00.000000000 -0300
++++ sugar-toolkit-0.88.1/po/es.po	2010-07-26 12:25:30.229083427 -0300
+@@ -54,6 +54,10 @@
+ msgid "Keep"
+ msgstr "Guardar"
+ 
++#: ../src/sugar/activity/widgets.py
++msgid "Keep a copy"
++msgstr "Guardar una copia"
++
+ #: ../src/sugar/activity/namingalert.py:283
+ msgid "Untitled"
+ msgstr "Sin título"
diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec
index cfa4b59..a5f9759 100644
--- a/rpms/sugar-toolkit/sugar-toolkit.spec
+++ b/rpms/sugar-toolkit/sugar-toolkit.spec
@@ -3,7 +3,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.88.1
-Release: 4.4dxo%{?dist}
+Release: 4.7dxo%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
@@ -14,7 +14,8 @@ Source1: macros.sugar
 # Bug fixes
 Patch1: fix-two-trivial-shell-log-warnings.patch
 Patch2: sl1876.patch
-Patch3: sl1948-Race-condition-with-name-widget-in-the-activ.patch
+#bernie: to be fixed
+#Patch3: sl1948-Race-condition-with-name-widget-in-the-activ.patch
 Patch4: sl1842-notify-red-alert.patch
 Patch5: use-set_toolbar_box-in-example-code.patch
 Patch6: set-default-accelerators-for-Copy-and-Paste-buttons.patch
@@ -24,6 +25,16 @@ Patch7: sl1861-remove-unneeded-debug-logs.patch
 Patch101: remove-incomplete-MANIFEST-support.patch
 Patch102: kill-the-delayed-menus-for-good.patch
 Patch103: change-keep-string-to-keep-a-copy.patch
+Patch104: add-ErrorAlert.patch
+
+# tch experimental patches
+Patch201: bundle-Delete-activities-profile-data-when-uninstall.patch
+
+# daniel experimental patches
+Patch301: keep_a_copy_translation_missing.patch
+
+# esteban experimental patches
+Patch401: accessibility_0001_style-contrast.patch
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -62,7 +73,8 @@ to interact with system services like presence and the datastore.
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#bernie: to be fixed later
+#%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -70,6 +82,13 @@ to interact with system services like presence and the datastore.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
+
+%patch201 -p1
+
+%patch301 -p1
+
+%patch401 -p1
 
 %build
 %configure