diff --git a/doc/sources/.static/background.png b/doc/sources/.static/background.png index 7eb1d661f..84c01f574 100644 Binary files a/doc/sources/.static/background.png and b/doc/sources/.static/background.png differ diff --git a/doc/sources/.static/default.css b/doc/sources/.static/default.css index 5be838dfd..86953250a 100644 --- a/doc/sources/.static/default.css +++ b/doc/sources/.static/default.css @@ -93,7 +93,7 @@ div.related { /* ::: TOC :::: */ div.sphinxsidebar h3 { font-family: 'Trebuchet MS', sans-serif; - color: #727905; + color: #f1d4c3; font-size: 1.4em; font-weight: normal; margin: 0; @@ -101,12 +101,12 @@ div.sphinxsidebar h3 { } div.sphinxsidebar h3 a { - color: #727905; + color: #f1d4c3; } div.sphinxsidebar h4 { font-family: 'Trebuchet MS', sans-serif; - color: #727905; + color: #f1d4c3; font-size: 1.3em; font-weight: normal; margin: 5px 0 0 0; @@ -114,7 +114,7 @@ div.sphinxsidebar h4 { } div.sphinxsidebar p { - color: #727905; + color: #f1d4c3; } div.sphinxsidebar p.topless { @@ -125,7 +125,7 @@ div.sphinxsidebar ul { margin: 10px; padding: 0; list-style: none; - color: #727905; + color: #fff; } div.sphinxsidebar ul ul, @@ -140,7 +140,7 @@ div.sphinxsidebar ul ul { } div.sphinxsidebar a { - color: #989e49; + color: #fff; } div.sphinxsidebar form { @@ -291,12 +291,12 @@ p.subhead { } a { - color: #4488cc; + color: #af4225; text-decoration: none; } a:hover { - color: #4488cc; + color: #f05b33; text-decoration: underline; } @@ -310,7 +310,7 @@ div.body h6 { --background-color: #f2f2f2; --border-bottom: 1px solid #ccc; font-weight: normal; - color: #20435c; + color: #574d46; margin: 20px -20px 10px -20px; padding: 3px 0 3px 10px; } diff --git a/doc/sources/kivy-logo.png b/doc/sources/kivy-logo.png index 481b404f4..84e8b0642 100644 Binary files a/doc/sources/kivy-logo.png and b/doc/sources/kivy-logo.png differ diff --git a/kivy/core/window/__init__.py b/kivy/core/window/__init__.py index 40276607b..3daab8a83 100644 --- a/kivy/core/window/__init__.py +++ b/kivy/core/window/__init__.py @@ -293,7 +293,7 @@ class WindowBase(EventDispatcher): # XXX FIXME use late binding from kivy.graphics.opengl import glClearColor, glClear, \ GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT - glClearColor(0, 0, 0, 0) + glClearColor(1, 0, 1, 1) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT) def to_widget(self, x, y, initial=True, relative=False): diff --git a/kivy/factory_registers.py b/kivy/factory_registers.py index 8f4f7ee4c..337c1f1bd 100644 --- a/kivy/factory_registers.py +++ b/kivy/factory_registers.py @@ -3,18 +3,22 @@ from kivy.factory import Factory r = Factory.register +r('Animation', module='kivy.animation') +r('AnimationTransition', module='kivy.animation') r('ExceptionHandler', module='kivy.base') +r('Cache', module='kivy.cache') +r('ClockBase', module='kivy.clock') +r('KivyConfigParser', module='kivy.config') +r('EventDispatcher', module='kivy.event') r('FactoryException', module='kivy.factory') r('Gesture', module='kivy.gesture') r('GestureDatabase', module='kivy.gesture') r('GesturePoint', module='kivy.gesture') r('GestureStroke', module='kivy.gesture') -r('ClockBase', module='kivy.clock') -r('Cache', module='kivy.cache') -r('LoggerHistory', module='kivy.logger') +r('Parser', module='kivy.lang') r('LoaderBase', module='kivy.loader') r('ProxyImage', module='kivy.loader') -r('EventDispatcher', module='kivy.event') +r('LoggerHistory', module='kivy.logger') r('NumericProperty', module='kivy.properties') r('StringProperty', module='kivy.properties') r('ListProperty', module='kivy.properties') @@ -29,12 +33,6 @@ r('Property', module='kivy.properties') r('SafeList', module='kivy.utils') r('OrderedDict', module='kivy.utils') r('Vector', module='kivy.vector') -r('KivyConfigParser', module='kivy.config') -r('Animation', module='kivy.animation') -r('AnimationTransition', module='kivy.animation') -r('Parser', module='kivy.lang') -r('Texture', module='kivy.graphics.texture') -r('TextureRegion', module='kivy.graphics.texture') r('LineWidth', module='kivy.graphics.context_instructions') r('Color', module='kivy.graphics.context_instructions') r('BindTexture', module='kivy.graphics.context_instructions') @@ -44,10 +42,8 @@ r('Rotate', module='kivy.graphics.context_instructions') r('Scale', module='kivy.graphics.context_instructions') r('Translate', module='kivy.graphics.context_instructions') r('MatrixInstruction', module='kivy.graphics.context_instructions') -r('Matrix', module='kivy.graphics.transformation') r('Fbo', module='kivy.graphics.fbo') r('FboException', module='kivy.graphics.fbo') -r('VBO', module='kivy.graphics.vbo') r('Instruction', module='kivy.graphics.instructions') r('InstructionGroup', module='kivy.graphics.instructions') r('ContextInstruction', module='kivy.graphics.instructions') @@ -56,6 +52,11 @@ r('Canvas', module='kivy.graphics.instructions') r('CanvasBase', module='kivy.graphics.instructions') r('RenderContext', module='kivy.graphics.instructions') r('Shader', module='kivy.graphics.shader') +r('Texture', module='kivy.graphics.texture') +r('TextureRegion', module='kivy.graphics.texture') +r('Matrix', module='kivy.graphics.transformation') +r('VBO', module='kivy.graphics.vbo') +r('VertexBatch', module='kivy.graphics.vbo') r('Triangle', module='kivy.graphics.vertex_instructions') r('Quad', module='kivy.graphics.vertex_instructions') r('Rectangle', module='kivy.graphics.vertex_instructions') @@ -64,19 +65,20 @@ r('Ellipse', module='kivy.graphics.vertex_instructions') r('Line', module='kivy.graphics.vertex_instructions') r('Point', module='kivy.graphics.vertex_instructions') r('MotionEventFactory', module='kivy.input.factory') +r('MotionEventProvider', module='kivy.input.provider') r('Shape', module='kivy.input.shape') r('ShapeRect', module='kivy.input.shape') -r('MotionEventProvider', module='kivy.input.provider') +r('BoxLayout', module='kivy.uix.boxlayout') +r('Button', module='kivy.uix.button') +r('Camera', module='kivy.uix.camera') r('Image', module='kivy.uix.image') r('AsyncImage', module='kivy.uix.image') r('Label', module='kivy.uix.label') -r('BoxLayout', module='kivy.uix.boxlayout') -r('ToggleButton', module='kivy.uix.togglebutton') -r('Button', module='kivy.uix.button') -r('Slider', module='kivy.uix.slider') +r('Layout', module='kivy.uix.layout') r('Scatter', module='kivy.uix.scatter') r('ScatterPlane', module='kivy.uix.scatter') +r('Slider', module='kivy.uix.slider') +r('ToggleButton', module='kivy.uix.togglebutton') r('Video', module='kivy.uix.video') r('Widget', module='kivy.uix.widget') r('WidgetException', module='kivy.uix.widget') -r('Camera', module='kivy.uix.camera') diff --git a/kivy/uix/button.py b/kivy/uix/button.py index e5fcb9f73..7d83ab004 100644 --- a/kivy/uix/button.py +++ b/kivy/uix/button.py @@ -2,24 +2,25 @@ Button ====== -The button is a :class:`~kivy.uix.label.Label` with action. The button when you -touch on it. You can use the same properties as Label to configure the label -showed inside the Button :: +The button is a :class:`~kivy.uix.label.Label` with an action associated to it +that is triggered when the button is pressed (or released after a click/touch). +To configure the button, you can use the same properties that you can use for +the Label class:: button = Button(text='Hello world', font_size=14) -Attaching a callback when the button is pushed :: +Attaching a callback when the button is pressed (clicked/touched) :: def callback(instance): - print 'The button <%s> is pressed' % instance.text + print 'The button <%s> is being pressed' % instance.text btn1 = Button(text='Hello world 1') btn1.bind(on_press=callback) btn2 = Button(text='Hello world 2') btn2.bind(on_press=callback) -If you want to know every time the button state is changing, you can attach on -:data:`Button.state` property :: +If you want to be notified every time the button state changes, you can attach +to the :data:`Button.state` property :: def callback(instance, value): print 'My button <%s> state is <%s>' % (instance, value) @@ -39,9 +40,10 @@ class Button(Label): :Events: `on_press` - Fired when the button is pressed + Fired when the button is pressed. `on_release` - Fired when the button is released + Fired when the button is released (i.e., the touch/click that + pressed the button goes away). ''' state = OptionProperty('normal', options=('normal', 'down'))