Ticket #2006: 0001-code-cleanup-as-per-Sascha-s-feedback.patch

extensions/cpsection/touchpad/model.py

@@ -18 +18 @@
 from os import system, path, remove
 import gconf
 
-_CAPACITIVE = 0
-_RESISTIVE = 1
 _flag_path = '/home/olpc/.olpc-pentablet-mode'
 _node_path = '/sys/devices/platform/i8042/serio1/ptmode'
 
@@ -31 +29 @@
     _file_handle.close()
 
     if _text[0] == '1':
-        return _RESISTIVE
+        return 'resistive'
     else:
-        return _CAPACITIVE
+        return 'capacitive'
 
 def set_touchpad(touchpad):
     """Set the touchpad mode."""
-    if touchpad == _CAPACITIVE:
+    if touchpad == 'capacitive':
         if path.exists(_flag_path):
             remove(_flag_path)
         system("echo 0 > %s" % (_node_path))
     else:
-        system("touch %s" % (_flag_path))
+        _file_handle = open(_flag_path, "w")
+        _file_handle.close()
         system("echo 1 > %s" % (_node_path))
     return
 
-def print_touchpad():
-    """Print the future touchpad mode."""
-    if get_touchpad == _CAPACITIVE:
-        print _('Touchpad set to finger mode.')
-    else:
-        print _('Touchpad set to stylus mode.')
-
 def get_color_xo():
     """Get xo color"""
     client = gconf.client_get_default()

extensions/cpsection/touchpad/view.py

@@ -24 +24 @@
 from sugar.graphics.xocolor import XoColor
 
 from jarabe.controlpanel.sectionview import SectionView
-from jarabe.controlpanel.inlinealert import InlineAlert
-
-_CAPACITIVE = 0
-_RESISTIVE = 1
 
 class TouchpadEventIcon(gtk.EventBox):
-    """A subclass of the Sugar Event Icon"""
+    """Clickable icon used for capacitive and resistive buttons"""  
     __gtype_name__ = "SugarEventIcon"
 
     def __init__(self, **kwargs):
@@ -46 +42 @@
         self.add(self.icon)
         self.icon.show()
 
-class TouchpadPicker(TouchpadEventIcon):
-    """A class for the touchpad selection buttons"""
+class _TouchpadPicker(TouchpadEventIcon):
+    """The touchpad selection buttons"""
     __gsignals__ = {
         'touchpad-changed': (gobject.SIGNAL_RUN_FIRST,
                           gobject.TYPE_NONE,
@@ -58 +54 @@
         """Create icons for the touchpad mode buttons."""    
         TouchpadEventIcon.__init__(self)
 
-        if touchpad_mode == _CAPACITIVE:
+        if touchpad_mode == 'capacitive':
             self.icon.props.icon_name = 'capacitive'
         else:
             self.icon.props.icon_name = 'resistive'
@@ -70 +66 @@
 
     def update(self, touchpad, xo_color):
         """Update the button states."""
-        if self._touchpad_mode == _CAPACITIVE:
+        if self._touchpad_mode == 'capacitive':
             self.icon.props.icon_name = 'capacitive'
-            if touchpad == _CAPACITIVE:
+            if touchpad == 'capacitive':
                 self.icon.props.xo_color = xo_color
             else:
                 self.icon.props.xo_color = XoColor('#666666,#FFFFFF')
-        elif self._touchpad_mode == _RESISTIVE:
+        elif self._touchpad_mode == 'resistive':
             self.icon.props.icon_name = 'resistive'
-            if touchpad == _RESISTIVE:
+            if touchpad == 'resistive':
                 self.icon.props.xo_color = xo_color
             else:
                 self.icon.props.xo_color = XoColor('#666666,#FFFFFF')
@@ -88 +84 @@
         self.emit('touchpad-changed', touchpad_mode)
 
 class Touchpad(SectionView):
-    """A class for the touchpad selection panel"""
+    """The touchpad selection panel"""
 
     def __init__(self, model, alerts):
-        """ Create the touchpad panel."""
+        """ Create the touchpad selection panel."""
         SectionView.__init__(self)
 
         self._model = model
@@ -102 +98 @@
         self.set_spacing(style.DEFAULT_SPACING)
         self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
 
-        self._touchpad_label = gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self._touchpad_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self._touchpad_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
-        self._touchpad_alert = None
+        self._label_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
+        self._box = gtk.HBox(spacing=style.DEFAULT_SPACING)
 
         self._pickers = {
-                _CAPACITIVE: TouchpadPicker(_CAPACITIVE),
-                _RESISTIVE: TouchpadPicker(_RESISTIVE)}
+                'capacitive': _TouchpadPicker('capacitive'),
+                'resistive': _TouchpadPicker('resistive')}
 
-        self._setup_touchpad()
+        self._setup_widgets()
         self._initial_value = self._model.get_touchpad()
         self._update_pickers(self._initial_value)
 
         self.setup()
 
-    def _setup_touchpad(self):                
-        """Layout the panel: label, buttons, alert"""
-        label_touchpad = gtk.Label(_('Click to change your touchpad:'))
-        label_touchpad.modify_fg(gtk.STATE_NORMAL, 
+    def _setup_widgets(self):                
+        """Layout the panel: label, buttons"""
+        label = gtk.Label(_('Click to change your touchpad:'))
+        label.modify_fg(gtk.STATE_NORMAL, 
                               style.COLOR_SELECTION_GREY.get_gdk_color())
-        self._group.add_widget(label_touchpad)
-        self._touchpad_label.pack_start(label_touchpad, expand=False)
-        label_touchpad.show()
+        self._group.add_widget(label)
+        self._label_box.pack_start(label, expand=False)
+        label.show()
 
         for touchpad_mode in sorted(self._pickers.keys()):
             picker = self._pickers[touchpad_mode]
             picker.show()
-            self._touchpad_box.pack_start(picker, expand=False)
-
-        label_touchpad_error = gtk.Label()
-        self._group.add_widget(label_touchpad_error)
-        self._touchpad_alert_box.pack_start(label_touchpad_error, expand=False)
-        label_touchpad_error.show()
-
-        self._touchpad_alert = InlineAlert()
-        self._touchpad_alert_box.pack_start(self._touchpad_alert)
+            self._box.pack_start(picker, expand=False)
 
         self._center_in_panel = gtk.Alignment(0.5)
-        self._center_in_panel.add(self._touchpad_box)
-        self.pack_start(self._touchpad_label, False)
-        self.pack_start(self._center_in_panel, False)
-        self.pack_start(self._touchpad_alert_box, False)        
-        self._touchpad_label.show()
-        self._touchpad_box.show()
-        self._touchpad_alert_box.show()
+        self._center_in_panel.add(self._box)
+        self.pack_start(self._label_box, False)
+        self.pack_start(self._center_in_panel, False)      
+        self._label_box.show()
+        self._box.show()
         self._center_in_panel.show()
     
     def setup(self):
@@ -161 +145 @@
 
     def undo(self):
         """Undo any changes."""
-        for widget, handler in self._handlers:
-            widget.disconnect(handler)
         self._model.set_touchpad(self._initial_value)
-        self._touchpad_alert.hide()        
 
     def _update_pickers(self, touchpad):
         """Update the buttons to reflect selection"""