added enhanced color selector: cycle through previous and next stroke and fill colors instead of random

1 files changed, 191 insertions, 66 deletions

diff --git a/extensions/cpsection/aboutme/view.py b/extensions/cpsection/aboutme/view.py
index cabd66a..95314a1 100644
--- a/extensions/cpsection/aboutme/view.py
+++ b/extensions/cpsection/aboutme/view.py
@@ -1,4 +1,5 @@
 # Copyright (C) 2008, OLPC
+# Copyright (C) 2010, Sugar Labs
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,18 +21,104 @@ from gettext import gettext as _
 
 from sugar.graphics.icon import Icon
 from sugar.graphics import style
-from sugar.graphics.xocolor import XoColor
+from sugar.graphics.xocolor import XoColor, colors
 
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
+_STROKE_COLOR = 0
+_FILL_COLOR = 1
+
+
+def _get_next_stroke_color(color):
+    """ Return the next color pair in the list that shares the same fill
+        as color. """
+    current_index = _get_current_index(color)
+    if current_index == -1:
+        return "%s,%s" % (color.stroke, color.fill)
+    next_index = _next_index(current_index)
+    while(colors[next_index][_FILL_COLOR] != \
+              colors[current_index][_FILL_COLOR]):
+        next_index = _next_index(next_index)
+    return "%s,%s" % (colors[next_index][_STROKE_COLOR],
+                      colors[next_index][_FILL_COLOR])
+
+
+def _get_previous_stroke_color(color):
+    """ Return the previous color pair in the list that shares the same fill
+        as color. """
+    current_index = _get_current_index(color)
+    if current_index == -1:
+        return "%s,%s" % (color.stroke, color.fill)
+    previous_index = _previous_index(current_index)
+    while (colors[previous_index][_FILL_COLOR] != \
+               colors[current_index][_FILL_COLOR]):
+        previous_index = _previous_index(previous_index)
+    return "%s,%s" % (colors[previous_index][_STROKE_COLOR],
+                      colors[previous_index][_FILL_COLOR])
+
+
+def _get_next_fill_color(color):
+    """ Return the next color pair in the list that shares the same stroke
+        as color. """
+    current_index = _get_current_index(color)
+    if current_index == -1:
+        return "%s,%s" % (color.stroke, color.fill)
+    next_index = _next_index(current_index)
+    while (colors[next_index][_STROKE_COLOR] != \
+               colors[current_index][_STROKE_COLOR]):
+        next_index = _next_index(next_index)
+    return "%s,%s" % (colors[next_index][_STROKE_COLOR],
+                      colors[next_index][_FILL_COLOR])
+
+
+def _get_previous_fill_color(color):
+    """ Return the previous color pair in the list that shares the same stroke
+        as color. """
+    current_index = _get_current_index(color)
+    if current_index == -1:
+        return "%s,%s" % (color.stroke, color.fill)
+    previous_index = _previous_index(current_index)
+    while (colors[previous_index][_STROKE_COLOR] != \
+               colors[current_index][_STROKE_COLOR]):
+        previous_index = _previous_index(previous_index)
+    return "%s,%s" % (colors[previous_index][_STROKE_COLOR],
+                      colors[previous_index][_FILL_COLOR])
+
+
+def _next_index(current_index):
+    next_index = current_index + 1
+    if next_index == len(colors):
+        next_index = 0
+    return next_index
+
+
+def _previous_index(current_index):
+    previous_index = current_index - 1
+    if previous_index < 0:
+        previous_index = len(colors)-1
+    return previous_index
+
+
+def _get_current_index(color):
+    return colors.index([color.stroke, color.fill])
+
+
+_PREVIOUS_FILL_COLOR = 0
+_NEXT_FILL_COLOR = 1
+_CURRENT_COLOR = 2
+_NEXT_STROKE_COLOR = 3
+_PREVIOUS_STROKE_COLOR = 4
+
+
 class EventIcon(gtk.EventBox):
-    __gtype_name__ = "SugarEventIcon"    
-    def __init__(self, **kwargs):         
+    __gtype_name__ = "SugarEventIcon"
+
+    def __init__(self, **kwargs):
         gtk.EventBox.__init__(self)
 
-        self.icon = Icon(pixel_size = style.XLARGE_ICON_SIZE, **kwargs)
-        
+        self.icon = Icon(pixel_size=style.XLARGE_ICON_SIZE, **kwargs)
+
         self.set_visible_window(False)
         self.set_app_paintable(True)
         self.set_events(gtk.gdk.BUTTON_PRESS_MASK)
@@ -39,28 +126,45 @@ class EventIcon(gtk.EventBox):
         self.add(self.icon)
         self.icon.show()
 
+
 class ColorPicker(EventIcon):
     __gsignals__ = {
         'color-changed': (gobject.SIGNAL_RUN_FIRST,
                           gobject.TYPE_NONE,
-                          ([str]))
-    }
-    def __init__(self, xocolor=None):
+                          ([object]))
+        }
+
+    def __init__(self, picker):
         EventIcon.__init__(self)
-        self.icon.props.xo_color = xocolor
+
         self.icon.props.icon_name = 'computer-xo'
+        self._picker = picker
+        self._color = None
+
         self.icon.props.pixel_size = style.XLARGE_ICON_SIZE
-        self.connect('button_press_event', self.__pressed_cb)
 
-    def __pressed_cb(self, button, event):
-        self._set_random_colors()
+        self.connect('button_press_event', self.__pressed_cb, picker)
+
+    def update(self, color):
+        if self._picker == _PREVIOUS_FILL_COLOR:
+            self._color = XoColor(_get_previous_fill_color(color))
+        elif self._picker == _PREVIOUS_STROKE_COLOR:
+            self._color = XoColor(_get_previous_stroke_color(color))
+        elif self._picker == _NEXT_FILL_COLOR:
+            self._color = XoColor(_get_next_fill_color(color))
+        elif self._picker == _NEXT_STROKE_COLOR:
+            self._color = XoColor(_get_next_stroke_color(color))
+        else:
+            self._color = color
+        self.icon.props.xo_color = self._color
+
+    def __pressed_cb(self, button, event, picker):
+        if picker != _CURRENT_COLOR:
+            self.emit('color-changed', self._color)
 
-    def _set_random_colors(self):
-        xocolor = XoColor()
-        self.icon.props.xo_color = xocolor
-        self.emit('color-changed', xocolor.to_string())
 
 class AboutMe(SectionView):
+
     def __init__(self, model, alerts):
         SectionView.__init__(self)
 
@@ -69,44 +173,44 @@ class AboutMe(SectionView):
         self._nick_sid = 0
         self._color_valid = True
         self._nick_valid = True
-        self._color_change_handler = None
-        self._nick_change_handler = None
 
         self.set_border_width(style.DEFAULT_SPACING * 2)
         self.set_spacing(style.DEFAULT_SPACING)
         self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
 
+        self._color_label = gtk.HBox(spacing=style.DEFAULT_SPACING)
+        self._color_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
+        self._color_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
+        self._color_alert = None
+
+        self._pickers = {
+                _PREVIOUS_FILL_COLOR: ColorPicker(_PREVIOUS_FILL_COLOR),
+                _NEXT_FILL_COLOR: ColorPicker(_NEXT_FILL_COLOR),
+                _CURRENT_COLOR: ColorPicker(_CURRENT_COLOR),
+                _NEXT_STROKE_COLOR: ColorPicker(_NEXT_STROKE_COLOR),
+                _PREVIOUS_STROKE_COLOR: ColorPicker(_PREVIOUS_STROKE_COLOR)
+                }
+
+        self._setup_color()
+        initial_color = XoColor(self._model.get_color_xo())
+        self._update_pickers(initial_color)
+
         self._nick_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
         self._nick_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
         self._nick_entry = None
         self._nick_alert = None
         self._setup_nick()
-
-        self._color_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self._color_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self._color_picker = None
-        self._color_alert = None
-        self._setup_color()        
-
         self.setup()
 
     def _setup_nick(self):
-        label_entry = gtk.Label(_('Name:'))
-        label_entry.modify_fg(gtk.STATE_NORMAL, 
-                              style.COLOR_SELECTION_GREY.get_gdk_color())
-        self._group.add_widget(label_entry)
-        label_entry.set_alignment(1, 0.5)
-        self._nick_box.pack_start(label_entry, expand=False)
-        label_entry.show()
-
-        self._nick_entry = gtk.Entry()                
-        self._nick_entry.modify_bg(gtk.STATE_INSENSITIVE, 
+        self._nick_entry = gtk.Entry()
+        self._nick_entry.modify_bg(gtk.STATE_INSENSITIVE,
                                    style.COLOR_WHITE.get_gdk_color())
-        self._nick_entry.modify_base(gtk.STATE_INSENSITIVE, 
+        self._nick_entry.modify_base(gtk.STATE_INSENSITIVE,
                                      style.COLOR_WHITE.get_gdk_color())
         self._nick_entry.set_width_chars(25)
         self._nick_box.pack_start(self._nick_entry, expand=False)
-        self._nick_entry.show()        
+        self._nick_entry.show()
 
         label_entry_error = gtk.Label()
         self._group.add_widget(label_entry_error)
@@ -119,22 +223,36 @@ class AboutMe(SectionView):
             self._nick_alert.props.msg = self.restart_msg
             self._nick_alert.show()
 
-        self.pack_start(self._nick_box, False)
+        self._center_in_panel = gtk.Alignment(0.5)
+        self._center_in_panel.add(self._nick_box)
+        self.pack_start(self._center_in_panel, False)
         self.pack_start(self._nick_alert_box, False)
         self._nick_box.show()
         self._nick_alert_box.show()
-    
-    def _setup_color(self):                
+        self._center_in_panel.show()
+
+    def _setup_color(self):
         label_color = gtk.Label(_('Click to change your color:'))
-        label_color.modify_fg(gtk.STATE_NORMAL, 
+        label_color.modify_fg(gtk.STATE_NORMAL,
                               style.COLOR_SELECTION_GREY.get_gdk_color())
         self._group.add_widget(label_color)
-        self._color_box.pack_start(label_color, expand=False)
+        self._color_label.pack_start(label_color, expand=False)
         label_color.show()
-        
-        self._color_picker = ColorPicker()
-        self._color_box.pack_start(self._color_picker, expand=False)
-        self._color_picker.show()
+
+        for picker_index in sorted(self._pickers.keys()):
+            if picker_index == _CURRENT_COLOR:
+                left_separator = gtk.SeparatorToolItem()
+                left_separator.show()
+                self._color_box.pack_start(left_separator, expand=False)
+
+            picker = self._pickers[picker_index]
+            picker.show()
+            self._color_box.pack_start(picker, expand=False)
+
+            if picker_index == _CURRENT_COLOR:
+                right_separator = gtk.SeparatorToolItem()
+                right_separator.show()
+                self._color_box.pack_start(right_separator, expand=False)
 
         label_color_error = gtk.Label()
         self._group.add_widget(label_color_error)
@@ -147,30 +265,34 @@ class AboutMe(SectionView):
             self._color_alert.props.msg = self.restart_msg
             self._color_alert.show()
 
-        self.pack_start(self._color_box, False)
-        self.pack_start(self._color_alert_box, False)        
+        self._center_in_panel = gtk.Alignment(0.5)
+        self._center_in_panel.add(self._color_box)
+        self.pack_start(self._color_label, False)
+        self.pack_start(self._center_in_panel, False)
+        self.pack_start(self._color_alert_box, False)
+        self._color_label.show()
         self._color_box.show()
         self._color_alert_box.show()
-    
+        self._center_in_panel.show()
+
     def setup(self):
         self._nick_entry.set_text(self._model.get_nick())
-        color = XoColor(self._model.get_color_xo())
-        self._color_picker.icon.props.xo_color = color
-
         self._color_valid = True
         self._nick_valid = True
         self.needs_restart = False
-        self._nick_change_handler = self._nick_entry.connect( \
-                'changed', self.__nick_changed_cb)
-        self._color_change_handler = self._color_picker.connect( \
-                'color-changed', self.__color_changed_cb)
+
+        self._nick_entry.connect('changed', self.__nick_changed_cb)
+        for picker in self._pickers.values():
+            picker.connect('color-changed', self.__color_changed_cb)
 
     def undo(self):
-        self._color_picker.disconnect(self._color_change_handler)
-        self._nick_entry.disconnect(self._nick_change_handler)
         self._model.undo()
         self._nick_alert.hide()
-        self._color_alert.hide()        
+        self._color_alert.hide()
+
+    def _update_pickers(self, color):
+        for picker in self._pickers.values():
+            picker.update(color)
 
     def _validate(self):
         if self._nick_valid and self._color_valid:
@@ -178,13 +300,13 @@ class AboutMe(SectionView):
         else:
             self.props.is_valid = False
 
-    def __nick_changed_cb(self, widget, data=None):        
+    def __nick_changed_cb(self, widget, data=None):
         if self._nick_sid:
             gobject.source_remove(self._nick_sid)
-        self._nick_sid = gobject.timeout_add(self._APPLY_TIMEOUT, 
+        self._nick_sid = gobject.timeout_add(self._APPLY_TIMEOUT,
                                              self.__nick_timeout_cb, widget)
 
-    def __nick_timeout_cb(self, widget):        
+    def __nick_timeout_cb(self, widget):
         self._nick_sid = 0
 
         if widget.get_text() == self._model.get_nick():
@@ -193,18 +315,18 @@ class AboutMe(SectionView):
             self._model.set_nick(widget.get_text())
         except ValueError, detail:
             self._nick_alert.props.msg = detail
-            self._nick_valid = False            
+            self._nick_valid = False
         else:
             self._nick_alert.props.msg = self.restart_msg
-            self._nick_valid = True 
+            self._nick_valid = True
             self.needs_restart = True
             self.restart_alerts.append('nick')
         self._validate()
         self._nick_alert.show()
         return False
 
-    def __color_changed_cb(self, colorpicker, xocolor):        
-        self._model.set_color_xo(xocolor)
+    def __color_changed_cb(self, colorpicker, color):
+        self._model.set_color_xo(color.to_string())
         self.needs_restart = True
         self._color_alert.props.msg = self.restart_msg
         self._color_valid = True
@@ -212,4 +334,7 @@ class AboutMe(SectionView):
 
         self._validate()
         self._color_alert.show()
+
+        self._update_pickers(color)
+
         return False