From e3d13a692f87dcd529db3ecff0ad13a83454ef12 Mon Sep 17 00:00:00 2001 From: Christopher Denter Date: Thu, 17 Mar 2011 20:48:47 +0100 Subject: [PATCH] docs: change inner link color in the pdf to orange as well + several minor fixes --- doc/sources/conf.py | 2 +- doc/sources/kivystyle.sty | 2 +- kivy/core/__init__.py | 2 +- kivy/graphics/context_instructions.pyx | 3 ++- kivy/graphics/instructions.pyx | 2 +- kivy/graphics/vertex_instructions.pyx | 4 ++-- kivy/uix/widget.py | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/doc/sources/conf.py b/doc/sources/conf.py index 5fadfa121..bdc29ad53 100644 --- a/doc/sources/conf.py +++ b/doc/sources/conf.py @@ -178,7 +178,7 @@ latex_documents = [ latex_elements = { 'fontpkg': r'\usepackage{mathpazo}', 'papersize': 'a4paper', - 'pointsize': '8pt', + 'pointsize': '10pt', 'preamble': r'\usepackage{kivystyle}' } latex_additional_files = ['kivystyle.sty', 'logo.pdf'] diff --git a/doc/sources/kivystyle.sty b/doc/sources/kivystyle.sty index 9e653fa2d..0670b50b8 100644 --- a/doc/sources/kivystyle.sty +++ b/doc/sources/kivystyle.sty @@ -1,6 +1,6 @@ \definecolor{TitleColor}{rgb}{0,0,0} -\definecolor{InnerLinkColor}{rgb}{0,0,0} % Make links the same color as links on the website +\definecolor{InnerLinkColor}{rgb}{0.875,0.392,0.133} \definecolor{OuterLinkColor}{rgb}{0.875,0.392,0.133} % TODO Find a way not to have this active when printing the file diff --git a/kivy/core/__init__.py b/kivy/core/__init__.py index e10436338..bed74f7a4 100644 --- a/kivy/core/__init__.py +++ b/kivy/core/__init__.py @@ -11,7 +11,7 @@ by the core abstraction. Always try to use our providers first. In case we are missing a feature or method, please let us know by opening a new Bug report instead of relying on your library. - **Note:** + .. warning:: These are **not** widgets! These are just abstractions of the respective functionality. For example, you cannot add a core image to your window. You have to use the image **widget** class instead. If you're really diff --git a/kivy/graphics/context_instructions.pyx b/kivy/graphics/context_instructions.pyx index db2a2dca5..de8406c2c 100644 --- a/kivy/graphics/context_instructions.pyx +++ b/kivy/graphics/context_instructions.pyx @@ -106,8 +106,9 @@ cdef tuple hsv_to_rgb(float h, float s, float v): if i == 5: return v, p, q # Cannot get here + cdef class Color(ContextInstruction): - '''Instruction to set the color state for any vetices being drawn after it + '''Instruction to set the color state for any vertices being drawn after it ''' def __init__(self, *args, **kwargs): ContextInstruction.__init__(self, **kwargs) diff --git a/kivy/graphics/instructions.pyx b/kivy/graphics/instructions.pyx index 3478fba3f..7a137f32b 100644 --- a/kivy/graphics/instructions.pyx +++ b/kivy/graphics/instructions.pyx @@ -435,7 +435,7 @@ cdef class Canvas(CanvasBase): self.canvas.add(Color(1., 1., 0)) self.canvas.add(Rectangle(size=(50, 50))) - Usage of Canvas with the "with" statement:: + Usage of Canvas with Python's ``with`` statement:: with self.canvas: Color(1., 1., 0) diff --git a/kivy/graphics/vertex_instructions.pyx b/kivy/graphics/vertex_instructions.pyx index 0488ef0bf..ad192f19c 100644 --- a/kivy/graphics/vertex_instructions.pyx +++ b/kivy/graphics/vertex_instructions.pyx @@ -65,7 +65,7 @@ cdef class Line(VertexInstruction): '''Property for getting/settings points of the triangle .. warning:: - + This will always reconstruct the whole graphics from the new points list. It can be very CPU expensive. ''' @@ -510,7 +510,7 @@ cdef class BorderImage(Rectangle): cdef class Ellipse(Rectangle): - '''A 2d ellipse. + '''A 2D ellipse. :Parameters: `segments`: int, default to 180 diff --git a/kivy/uix/widget.py b/kivy/uix/widget.py index 7725d6fe5..4567c95ed 100644 --- a/kivy/uix/widget.py +++ b/kivy/uix/widget.py @@ -289,7 +289,7 @@ class Widget(EventDispatcher): Example usage:: def my_x_callback(obj, value): - print 'on object', obj', 'x changed to', value + print 'on object', obj, 'x changed to', value def my_width_callback(obj, value): print 'on object', obj, 'width changed to', value self.bind(x=my_x_callback, width=my_width_callback)