Create base widget classes

IPython/html/widgets/__init__.py

@@ -3,11 +3,9 b' from .widget import Widget, DOMWidget'
 from .widget_bool import CheckBoxWidget, ToggleButtonWidget
 from .widget_button import ButtonWidget
 from .widget_container import ContainerWidget, ModalWidget
-from .widget_float import FloatTextWidget
-from .widget_float_range import BoundedFloatTextWidget, FloatSliderWidget, FloatProgressWidget
+from .widget_float import FloatTextWidget, BoundedFloatTextWidget, FloatSliderWidget, FloatProgressWidget
 from .widget_image import ImageWidget
-from .widget_int import IntTextWidget
-from .widget_int_range import BoundedIntTextWidget, IntSliderWidget, IntProgressWidget
+from .widget_int import IntTextWidget, BoundedIntTextWidget, IntSliderWidget, IntProgressWidget
 from .widget_selection import RadioButtonsWidget, ToggleButtonsWidget, DropdownWidget, ListBoxWidget
 from .widget_selectioncontainer import TabWidget, AccordionWidget
 from .widget_string import HTMLWidget, LatexWidget, TextBoxWidget, TextAreaWidget

IPython/html/widgets/widget_bool.py

@@ -19,15 +19,16 b' from IPython.utils.traitlets import Unicode, Bool, List'
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class CheckBoxWidget(DOMWidget):
-    view_name = Unicode('CheckBoxView', sync=True)
-
-    # Model Keys
+class _BoolWidget(DOMWidget):
     value = Bool(False, help="Bool value", sync=True)
     description = Unicode('', help="Description of the boolean (label).", sync=True) 
     disabled = Bool(False, help="Enable or disable user changes.", sync=True)
 
 
-class ToggleButtonWidget(CheckBoxWidget):
+class CheckBoxWidget(_BoolWidget):
+    view_name = Unicode('CheckBoxView', sync=True)
+
+
+class ToggleButtonWidget(_BoolWidget):
     view_name = Unicode('ToggleButtonView', sync=True)
     
  No newline at end of file

IPython/html/widgets/widget_float.py

@@ -14,15 +14,46 b' Represents an unbounded float using a widget.'
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, CFloat, Bool, List
+from IPython.utils.traitlets import Unicode, CFloat, Bool, List, Enum
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class FloatTextWidget(DOMWidget):
-    view_name = Unicode('FloatTextView', sync=True)
-
-    # Keys
+class _FloatWidget(DOMWidget):
     value = CFloat(0.0, help="Float value", sync=True) 
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
+
+
+class _BoundedFloatWidget(_FloatWidget):
+    max = CFloat(100.0, help="Max value", sync=True)
+    min = CFloat(0.0, help="Min value", sync=True)
+    step = CFloat(0.1, help="Minimum step that the value can take (ignored by some views)", sync=True)
+
+    def __init__(self, *pargs, **kwargs):
+        """Constructor"""
+        DOMWidget.__init__(self, *pargs, **kwargs)
+        self.on_trait_change(self._validate, ['value', 'min', 'max'])
+
+    def _validate(self, name, old, new):
+        """Validate value, max, min."""
+        if self.min > new or new > self.max:
+            self.value = min(max(new, self.min), self.max)
+
+
+class FloatTextWidget(_FloatWidget):
+    view_name = Unicode('FloatTextView', sync=True)
+
+
+class BoundedFloatTextWidget(_BoundedFloatWidget):
+    view_name = Unicode('FloatTextView', sync=True)
+
+
+class FloatSliderWidget(_BoundedFloatWidget):
+    view_name = Unicode('FloatSliderView', sync=True)
+    orientation = Enum([u'horizontal', u'vertical'], u'horizontal', 
+        help="Vertical or horizontal.", sync=True)
+
+
+class FloatProgressWidget(_BoundedFloatWidget):
+    view_name = Unicode('ProgressView', sync=True)

IPython/html/widgets/widget_float_range.py

@@ -1,49 +0,0 b''
-"""FloatRangeWidget class.  
-
-Represents a bounded float using a widget.
-"""
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
-# Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, CFloat, Bool, List, Enum
-
-#-----------------------------------------------------------------------------
-# Classes
-#-----------------------------------------------------------------------------
-class BoundedFloatTextWidget(DOMWidget):
-    view_name = Unicode('FloatTextView', sync=True)
-    value = CFloat(0.0, help="Float value", sync=True) 
-    max = CFloat(100.0, help="Max value", sync=True)
-    min = CFloat(0.0, help="Min value", sync=True)
-    disabled = Bool(False, help="Enable or disable user changes", sync=True)
-    step = CFloat(0.1, help="Minimum step that the value can take (ignored by some views)", sync=True)
-    description = Unicode(help="Description of the value this widget represents", sync=True)
-
-    def __init__(self, *pargs, **kwargs):
-        """Constructor"""
-        DOMWidget.__init__(self, *pargs, **kwargs)
-        self.on_trait_change(self._validate, ['value', 'min', 'max'])
-
-    def _validate(self, name, old, new):
-        """Validate value, max, min."""
-        if self.min > new or new > self.max:
-            self.value = min(max(new, self.min), self.max)
-
-
-class FloatSliderWidget(BoundedFloatTextWidget):
-    view_name = Unicode('FloatSliderView', sync=True)
-    orientation = Enum([u'horizontal', u'vertical'], u'horizontal', 
-        help="Vertical or horizontal.", sync=True)
-
-
-class FloatProgressWidget(BoundedFloatTextWidget):
-    view_name = Unicode('ProgressView', sync=True)

IPython/html/widgets/widget_int.py

@@ -14,15 +14,46 b' Represents an unbounded int using a widget.'
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, CInt, Bool, List
+from IPython.utils.traitlets import Unicode, CInt, Bool, List, Enum
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class IntTextWidget(DOMWidget):
-    view_name = Unicode('IntTextView', sync=True)
-
-    # Keys
+class _IntWidget(DOMWidget):
     value = CInt(0, help="Int value", sync=True) 
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
+
+
+class _BoundedIntWidget(_IntWidget):
+    step = CInt(1, help="Minimum step that the value can take (ignored by some views)", sync=True)
+    max = CInt(100, help="Max value", sync=True)
+    min = CInt(0, help="Min value", sync=True)
+
+    def __init__(self, *pargs, **kwargs):
+        """Constructor"""
+        DOMWidget.__init__(self, *pargs, **kwargs)
+        self.on_trait_change(self._validate, ['value', 'min', 'max'])
+
+    def _validate(self, name, old, new):
+        """Validate value, max, min."""
+        if self.min > new or new > self.max:
+            self.value = min(max(new, self.min), self.max)
+
+
+class IntTextWidget(_IntWidget):
+    view_name = Unicode('IntTextView', sync=True)
+
+
+class BoundedIntTextWidget(_BoundedIntWidget):
+    view_name = Unicode('IntTextView', sync=True)
+
+
+class IntSliderWidget(_BoundedIntWidget):
+    view_name = Unicode('IntSliderView', sync=True)
+    orientation = Enum([u'horizontal', u'vertical'], u'horizontal', 
+        help="Vertical or horizontal.", sync=True)
+
+
+class IntProgressWidget(_BoundedIntWidget):
+    view_name = Unicode('ProgressView', sync=True)

IPython/html/widgets/widget_int_range.py

@@ -1,51 +0,0 b''
-"""IntRangeWidget class.  
-
-Represents a bounded int using a widget.
-"""
-#-----------------------------------------------------------------------------
-# Copyright (c) 2013, the IPython Development Team.
-#
-# Distributed under the terms of the Modified BSD License.
-#
-# The full license is in the file COPYING.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
-from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, CInt, Bool, List, Enum
-
-#-----------------------------------------------------------------------------
-# Classes
-#-----------------------------------------------------------------------------
-class BoundedIntTextWidget(DOMWidget):
-    view_name = Unicode('IntTextView', sync=True)
-
-    # Keys
-    value = CInt(0, help="Int value", sync=True) 
-    max = CInt(100, help="Max value", sync=True)
-    min = CInt(0, help="Min value", sync=True)
-    disabled = Bool(False, help="Enable or disable user changes", sync=True)
-    step = CInt(1, help="Minimum step that the value can take (ignored by some views)", sync=True)
-    description = Unicode(help="Description of the value this widget represents", sync=True)
-
-    def __init__(self, *pargs, **kwargs):
-        """Constructor"""
-        DOMWidget.__init__(self, *pargs, **kwargs)
-        self.on_trait_change(self._validate, ['value', 'min', 'max'])
-
-    def _validate(self, name, old, new):
-        """Validate value, max, min."""
-        if self.min > new or new > self.max:
-            self.value = min(max(new, self.min), self.max)
-
-
-class IntSliderWidget(BoundedIntTextWidget):
-    view_name = Unicode('IntSliderView', sync=True)
-    orientation = Enum([u'horizontal', u'vertical'], u'horizontal', 
-        help="Vertical or horizontal.", sync=True)
-
-
-class IntProgressWidget(BoundedIntTextWidget):
-    view_name = Unicode('ProgressView', sync=True)

IPython/html/widgets/widget_selection.py

@@ -19,23 +19,24 b' from IPython.utils.traitlets import Unicode, List, Bool'
 #-----------------------------------------------------------------------------
 # SelectionWidget
 #-----------------------------------------------------------------------------
-class ToggleButtonsWidget(DOMWidget):
-    view_name = Unicode('ToggleButtonsView', sync=True)
-
-    # Keys
+class _SelectionWidget(DOMWidget):
     value = Unicode(help="Selected value", sync=True) # TODO: Any support
     values = List(help="List of values the user can select", sync=True)
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
 
 
-class DropdownWidget(ToggleButtonsWidget):
+class ToggleButtonsWidget(_SelectionWidget):
+    view_name = Unicode('ToggleButtonsView', sync=True)
+
+
+class DropdownWidget(_SelectionWidget):
     view_name = Unicode('DropdownView', sync=True)
 
 
-class RadioButtonsWidget(ToggleButtonsWidget):
+class RadioButtonsWidget(_SelectionWidget):
     view_name = Unicode('RadioButtonsView', sync=True)
     
 
-class ListBoxWidget(ToggleButtonsWidget):
+class ListBoxWidget(_SelectionWidget):
     view_name = Unicode('ListBoxView', sync=True)

IPython/html/widgets/widget_selectioncontainer.py

@@ -20,10 +20,7 b' from IPython.utils.traitlets import Unicode, Dict, CInt, List, Instance'
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class AccordionWidget(ContainerWidget):
-    view_name = Unicode('AccordionView', sync=True)
-
-    # Keys
+class _SelectionContainerWidget(ContainerWidget):
     _titles = Dict(help="Titles of the pages", sync=True)
     selected_index = CInt(0, sync=True)
 
@@ -53,5 +50,9 b' class AccordionWidget(ContainerWidget):'
             return None
 
 
-class TabWidget(AccordionWidget):
+class AccordionWidget(_SelectionContainerWidget):
+    view_name = Unicode('AccordionView', sync=True)
+
+
+class TabWidget(_SelectionContainerWidget):
     view_name = Unicode('TabView', sync=True)

IPython/html/widgets/widget_string.py

@@ -19,27 +19,28 b' from IPython.utils.traitlets import Unicode, Bool, List'
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
-class HTMLWidget(DOMWidget):
-    view_name = Unicode('HTMLView', sync=True)
-
-    # Keys
+class _StringWidget(DOMWidget):
     value = Unicode(help="String value", sync=True)
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
 
 
-class LatexWidget(HTMLWidget):
+class HTMLWidget(_StringWidget):
+    view_name = Unicode('HTMLView', sync=True)    
+
+
+class LatexWidget(_StringWidget):
     view_name = Unicode('LatexView', sync=True)
 
 
-class TextAreaWidget(HTMLWidget):
+class TextAreaWidget(_StringWidget):
     view_name = Unicode('TextAreaView', sync=True)
 
     def scroll_to_bottom(self):
         self.send({"method": "scroll_to_bottom"})
 
 
-class TextBoxWidget(HTMLWidget):
+class TextBoxWidget(_StringWidget):
     view_name = Unicode('TextBoxView', sync=True)
 
     def __init__(self, **kwargs):