Show More
@@ -20,7 +20,7 b' from IPython.kernel.comm import Comm' | |||||
20 | from IPython.config import LoggingConfigurable |
|
20 | from IPython.config import LoggingConfigurable | |
21 | from IPython.utils.importstring import import_item |
|
21 | from IPython.utils.importstring import import_item | |
22 | from IPython.utils.traitlets import Unicode, Dict, Instance, Bool, List, \ |
|
22 | from IPython.utils.traitlets import Unicode, Dict, Instance, Bool, List, \ | |
23 | CaselessStrEnum, Tuple, CUnicode, Int, Set |
|
23 | CaselessStrEnum, Tuple, CUnicode, Int, Set, Color | |
24 | from IPython.utils.py3compat import string_types |
|
24 | from IPython.utils.py3compat import string_types | |
25 |
|
25 | |||
26 | #----------------------------------------------------------------------------- |
|
26 | #----------------------------------------------------------------------------- | |
@@ -438,9 +438,9 b' class DOMWidget(Widget):' | |||||
438 | padding = CUnicode(sync=True) |
|
438 | padding = CUnicode(sync=True) | |
439 | margin = CUnicode(sync=True) |
|
439 | margin = CUnicode(sync=True) | |
440 |
|
440 | |||
441 |
color = |
|
441 | color = Color(None, allow_none=True, sync=True) | |
442 |
background_color = |
|
442 | background_color = Color(None, allow_none=True, sync=True) | |
443 |
border_color = |
|
443 | border_color = Color(None, allow_none=True, sync=True) | |
444 |
|
444 | |||
445 | border_width = CUnicode(sync=True) |
|
445 | border_width = CUnicode(sync=True) | |
446 | border_radius = CUnicode(sync=True) |
|
446 | border_radius = CUnicode(sync=True) |
@@ -14,7 +14,7 b' Represents an unbounded float using a widget.' | |||||
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | from .widget import DOMWidget, register |
|
16 | from .widget import DOMWidget, register | |
17 | from IPython.utils.traitlets import Unicode, CFloat, Bool, CaselessStrEnum, Tuple |
|
17 | from IPython.utils.traitlets import Unicode, CFloat, Bool, CaselessStrEnum, Tuple, Color | |
18 | from IPython.utils.warn import DeprecatedClass |
|
18 | from IPython.utils.warn import DeprecatedClass | |
19 |
|
19 | |||
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
@@ -133,7 +133,7 b' class FloatSlider(_BoundedFloat):' | |||||
133 | default_value='horizontal', help="Vertical or horizontal.", sync=True) |
|
133 | default_value='horizontal', help="Vertical or horizontal.", sync=True) | |
134 | _range = Bool(False, help="Display a range selector", sync=True) |
|
134 | _range = Bool(False, help="Display a range selector", sync=True) | |
135 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) |
|
135 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) | |
136 |
slider_color = |
|
136 | slider_color = Color(None, allow_none=True, sync=True) | |
137 |
|
137 | |||
138 |
|
138 | |||
139 | @register('IPython.FloatProgress') |
|
139 | @register('IPython.FloatProgress') | |
@@ -287,7 +287,7 b' class FloatRangeSlider(_BoundedFloatRange):' | |||||
287 | default_value='horizontal', help="Vertical or horizontal.", sync=True) |
|
287 | default_value='horizontal', help="Vertical or horizontal.", sync=True) | |
288 | _range = Bool(True, help="Display a range selector", sync=True) |
|
288 | _range = Bool(True, help="Display a range selector", sync=True) | |
289 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) |
|
289 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) | |
290 |
slider_color = |
|
290 | slider_color = Color(None, allow_none=True, sync=True) | |
291 |
|
291 | |||
292 | # Remove in IPython 4.0 |
|
292 | # Remove in IPython 4.0 | |
293 | FloatTextWidget = DeprecatedClass(FloatText, 'FloatTextWidget') |
|
293 | FloatTextWidget = DeprecatedClass(FloatText, 'FloatTextWidget') |
@@ -14,7 +14,7 b' Represents an unbounded int using a widget.' | |||||
14 | # Imports |
|
14 | # Imports | |
15 | #----------------------------------------------------------------------------- |
|
15 | #----------------------------------------------------------------------------- | |
16 | from .widget import DOMWidget, register |
|
16 | from .widget import DOMWidget, register | |
17 | from IPython.utils.traitlets import Unicode, CInt, Bool, CaselessStrEnum, Tuple |
|
17 | from IPython.utils.traitlets import Unicode, CInt, Bool, CaselessStrEnum, Tuple, Color | |
18 | from IPython.utils.warn import DeprecatedClass |
|
18 | from IPython.utils.warn import DeprecatedClass | |
19 |
|
19 | |||
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- | |
@@ -87,7 +87,7 b' class IntSlider(_BoundedInt):' | |||||
87 | default_value='horizontal', help="Vertical or horizontal.", sync=True) |
|
87 | default_value='horizontal', help="Vertical or horizontal.", sync=True) | |
88 | _range = Bool(False, help="Display a range selector", sync=True) |
|
88 | _range = Bool(False, help="Display a range selector", sync=True) | |
89 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) |
|
89 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) | |
90 |
slider_color = |
|
90 | slider_color = Color(None, allow_none=True, sync=True) | |
91 |
|
91 | |||
92 |
|
92 | |||
93 | @register('IPython.IntProgress') |
|
93 | @register('IPython.IntProgress') | |
@@ -198,7 +198,7 b' class IntRangeSlider(_BoundedIntRange):' | |||||
198 | default_value='horizontal', help="Vertical or horizontal.", sync=True) |
|
198 | default_value='horizontal', help="Vertical or horizontal.", sync=True) | |
199 | _range = Bool(True, help="Display a range selector", sync=True) |
|
199 | _range = Bool(True, help="Display a range selector", sync=True) | |
200 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) |
|
200 | readout = Bool(True, help="Display the current value of the slider next to it.", sync=True) | |
201 |
slider_color = |
|
201 | slider_color = Color(None, allow_none=True, sync=True) | |
202 |
|
202 | |||
203 | # Remove in IPython 4.0 |
|
203 | # Remove in IPython 4.0 | |
204 | IntTextWidget = DeprecatedClass(IntText, 'IntTextWidget') |
|
204 | IntTextWidget = DeprecatedClass(IntText, 'IntTextWidget') |
General Comments 0
You need to be logged in to leave comments.
Login now