Ticket #1592: just-another-view.patch

extensions/cpsection/aboutme/view.py

@@ -25 +25 @@
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
+_DIRECTION_LEFT = 0
+_DIRECTION_TOP = 1
+_DIRECTION_CENTER = 2
+_DIRECTION_BOTTOM = 3
+_DIRECTION_RIGHT = 4
+
 class EventIcon(gtk.EventBox):
     __gtype_name__ = "SugarEventIcon"    
     def __init__(self, **kwargs):         
@@ -43 +49 @@
     __gsignals__ = {
         'color-changed': (gobject.SIGNAL_RUN_FIRST,
                           gobject.TYPE_NONE,
-                          ([str]))
+                          ([object]))
     }
-    def __init__(self, xocolor=None):
+    def __init__(self, direction):
         EventIcon.__init__(self)
-        self.icon.props.xo_color = xocolor
+
         self.icon.props.icon_name = 'computer-xo'
-        self.icon.props.pixel_size = style.XLARGE_ICON_SIZE
+        self._direction = direction
+        self._color = None
+
+        if direction == _DIRECTION_CENTER:
+            self.icon.props.pixel_size = style.XLARGE_ICON_SIZE
+        else:
+            self.icon.props.pixel_size = style.STANDARD_ICON_SIZE
+
         self.connect('button_press_event', self.__pressed_cb)
 
-    def __pressed_cb(self, button, event):
-        self._set_random_colors()
+    def update(self, color):
+        if self._direction == _DIRECTION_CENTER:
+            self._color = color
+        elif self._direction == _DIRECTION_LEFT:
+            self._color = XoColor(color.get_prev_fill_color())
+        elif self._direction == _DIRECTION_RIGHT:
+            self._color = XoColor(color.get_next_fill_color())
+        elif self._direction == _DIRECTION_TOP:
+            self._color = XoColor(color.get_prev_stroke_color())
+        else:
+            self._color = XoColor(color.get_next_stroke_color())
+        self.icon.props.xo_color = self._color
 
-    def _set_random_colors(self):
-        xocolor = XoColor()
-        self.icon.props.xo_color = xocolor
-        self.emit('color-changed', xocolor.to_string())
+    def __pressed_cb(self, button, event):
+        self.emit('color-changed', self._color)
 
 class AboutMe(SectionView):
     def __init__(self, model, alerts):
@@ -69 +90 @@
         self._nick_sid = 0
         self._color_valid = True
         self._nick_valid = True
-        self._color_change_handler = None
-        self._nick_change_handler = None
+        self._handlers = []
 
         self.set_border_width(style.DEFAULT_SPACING * 2)
         self.set_spacing(style.DEFAULT_SPACING)
@@ -84 +104 @@
 
         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._pickers = {
+                _DIRECTION_CENTER: ColorPicker(_DIRECTION_CENTER),
+                _DIRECTION_LEFT: ColorPicker(_DIRECTION_LEFT),
+                _DIRECTION_RIGHT: ColorPicker(_DIRECTION_RIGHT),
+                _DIRECTION_TOP: ColorPicker(_DIRECTION_TOP),
+                _DIRECTION_BOTTOM: ColorPicker(_DIRECTION_BOTTOM)}
+
+        self._setup_color()
+        initial_color = XoColor(self._model.get_color_xo())
+        self._update_pickers(initial_color)
 
         self.setup()
 
@@ -131 +160 @@
         self._group.add_widget(label_color)
         self._color_box.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()
+
+        # TODO implement '+' pattern
+        for direction in sorted(self._pickers.keys()):
+            picker = self._pickers[direction]
+            picker.show()
+            self._color_box.pack_start(picker, expand=False)
 
         label_color_error = gtk.Label()
         self._group.add_widget(label_color_error)
@@ -154 +185 @@
     
     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)
+
+        def connect(widget, signal, cb):
+            self._handlers.append((widget, widget.connect(signal, cb)))
+
+        connect(self._nick_entry, 'changed', self.__nick_changed_cb)
+        for picker in self._pickers.values():
+            connect(picker, '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)
+        for widget, handler in self._handlers:
+            widget.disconnect(handler)
         self._model.undo()
         self._nick_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:
             self.props.is_valid = True
@@ -203 +238 @@
         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 +247 @@
 
         self._validate()
         self._color_alert.show()
+
+        self._update_pickers(color)
+
         return False