Merge branch 'master' of git://github.com/tito/kivy into pdf

Author: tshirtman

examples/demo/showcase/main.py

@@ -16,6 +16,7 @@
 from kivy.uix.label import Label
 from kivy.uix.popup import Popup
 from kivy.uix.accordion import Accordion, AccordionItem
+from kivy.uix.filechooser import FileChooserIconView, FileChooserListView
 
 
 class Showcase(FloatLayout):
@@ -60,22 +61,20 @@ def attach_node(text, n):
         n = create_tree('Buttons')
         attach_node('Standard buttons', n)
         attach_node('Options buttons', n)
-        n = create_tree('Sliders')
         attach_node('Horizontal sliders', n)
         attach_node('Vertical sliders', n)
-        n = create_tree('Scatter')
         attach_node('Scatter with image', n)
         attach_node('Scatter with buttons', n)
-        n = create_tree('Textinput')
         attach_node('Monoline textinput', n)
         attach_node('Multiline textinput', n)
-        n = create_tree('TreeView')
         attach_node('Standard treeview', n)
         attach_node('Treeview without root', n)
-        n = create_tree('Others')
         attach_node('Accordion', n)
         attach_node('Popup', n)
         attach_node('Switch', n)
+        n = create_tree('Experimentals')
+        attach_node('Filechooser icon', n)
+        attach_node('Filechooser list', n)
         root.add_widget(tree)
         self.content = content = BoxLayout()
         root.add_widget(content)
@@ -192,6 +191,12 @@ def show_accordion(self):
         col.add_widget(root)
         return col
 
+    def show_filechooser_icon(self):
+        return FileChooserIconView()
+
+    def show_filechooser_list(self):
+        return FileChooserListView()
+
 
 if __name__ in ('__main__', '__android__'):
     ShowcaseApp().run()

kivy/__init__.py

@@ -28,7 +28,7 @@
     'kivy_config_fn', 'kivy_usermodules_dir',
 )
 
-__version__ = '1.0.9-dev'
+__version__ = '1.0.10-dev'
 
 import sys
 import shutil
@@ -175,6 +175,7 @@ def kivy_usage():
 
 
 # Start !
+Logger.setLevel(level=LOG_LEVELS.get('info'))
 Logger.info('Kivy v%s' % (__version__))
 
 #: Global settings options for kivy

kivy/config.py

@@ -313,9 +313,9 @@ def write(self):
             Config.setdefault('input', 'mouse', 'mouse')
 
             # activate native input provider in configuration
-            if platform == 'darwin':
-                Config.setdefault('input', 'mactouch', 'mactouch')
-            elif platform == 'win32':
+            # from 1.0.9, don't activate mactouch by default, or app are
+            # unusable.
+            if platform == 'win32':
                 Config.setdefault('input', 'wm_touch', 'wm_touch')
                 Config.setdefault('input', 'wm_pen', 'wm_pen')
             elif platform == 'linux2':

kivy/core/camera/__init__.py

@@ -10,7 +10,6 @@
 
 import sys
 
-from kivy.clock import Clock
 from kivy.event import EventDispatcher
 from kivy.logger import Logger
 from kivy.core import core_select_lib
@@ -58,7 +57,7 @@ def __init__(self, **kwargs):
         super(CameraBase, self).__init__()
 
         self.register_event_type('on_load')
-        self.register_event_type('on_frame')
+        self.register_event_type('on_texture')
 
         self.init_camera()
 
@@ -101,13 +100,10 @@ def init_camera(self):
     def start(self):
         '''Start the camera acquire'''
         self.stopped = False
-        Clock.unschedule(self._update)
-        Clock.schedule_interval(self._update, 1. / 30)
 
     def stop(self):
         '''Release the camera'''
         self.stopped = True
-        Clock.unschedule(self._update)
 
     def _update(self, dt):
         '''Update the camera (internal)'''
@@ -120,9 +116,9 @@ def _copy_to_gpu(self):
             return
         self._texture.blit_buffer(self._buffer, colorfmt=self._format)
         self._buffer = None
-        self.dispatch('on_frame')
+        self.dispatch('on_texture')
 
-    def on_frame(self):
+    def on_texture(self):
         pass
 
     def on_load(self):

kivy/core/camera/camera_gstreamer.py

@@ -4,7 +4,7 @@
 
 __all__ = ('CameraGStreamer', )
 
-
+from kivy.clock import Clock
 from kivy.graphics.texture import Texture
 from . import CameraBase
 
@@ -77,7 +77,9 @@ def _gst_new_buffer(self, *largs):
             for x in self._decodebin.src_pads():
                 for cap in x.get_caps():
                     self._texturesize = (cap['width'], cap['height'])
+                    Clock.schedule_once(self._update)
                     return
+        Clock.schedule_once(self._update)
 
     def start(self):
         super(CameraGStreamer, self).start()

kivy/core/camera/camera_opencv.py

@@ -9,6 +9,7 @@
 __all__ = ('CameraOpenCV')
 
 from kivy.logger import Logger
+from kivy.clock import Clock
 from kivy.graphics.texture import Texture
 from . import CameraBase
 
@@ -59,6 +60,11 @@ def init_camera(self):
         # with self.init_camera (but slowly as we'd have to always get a frame).
         self._resolution = (int(frame.width), int(frame.height))
 
+        #get fps
+        self.fps = cv.GetCaptureProperty(self._device, cv.CV_CAP_PROP_FPS)
+        if self.fps <= 0:
+            self.fps = 1 / 30.
+
         if not self.stopped:
             self.start()
 
@@ -83,3 +89,12 @@ def _update(self, dt):
         except:
             Logger.exception('OpenCV: Couldn\'t get image from Camera')
 
+    def start(self):
+        super(CameraOpenCV, self).start()
+        Clock.unschedule(self._update)
+        Clock.schedule_interval(self._update, self.fps)
+
+    def stop(self):
+        super(CameraOpenCV, self).stop()
+        Clock.unschedule(self._update)
+

kivy/core/camera/camera_videocapture.py

@@ -9,6 +9,7 @@
 __all__ = ('CameraVideoCapture', )
 
 from . import CameraBase
+from kivy.clock import Clock
 
 try:
     from VideoCapture import Device
@@ -33,6 +34,7 @@ def init_camera(self):
             self._device.setResolution(self.resolution[0], self.resolution[1])
         except:
             raise Exception('VideoCapture: Resolution not supported')
+        self.fps = 1 / 30.
 
     def _update(self, dt):
         data, camera_width, camera_height = self._device.getBuffer()
@@ -47,3 +49,14 @@ def _update(self, dt):
         # update buffer
         self._buffer = data
         self._copy_to_gpu()
+
+    def start(self):
+        super(CameraVideoCapture, self).start()
+        Clock.unschedule(self._update)
+        Clock.schedule_interval(self._update, self.fps)
+
+    def stop(self):
+        super(CameraVideoCapture, self).stop()
+        Clock.unschedule(self._update)
+
+

kivy/core/video/video_gstreamer.py

@@ -20,6 +20,7 @@
 
 from os import path
 from threading import Lock
+from urllib import pathname2url
 from kivy.graphics.texture import Texture
 from kivy.logger import Logger
 from functools import partial
@@ -143,9 +144,13 @@ def seek(self, percent):
                 self._buffer = self._videosink.emit('pull-preroll')
 
     def _get_uri(self):
-        if ':' in self.filename:
-            return self.filename
-        return 'file://'+path.abspath(self.filename)
+        uri = self.filename
+        if not uri:
+            return
+        if uri.split(':')[0] not in (
+                'http', 'https', 'file', 'udp', 'rtp', 'rtsp'):
+            uri = 'file:' + pathname2url(path.realpath(uri))
+        return uri
 
     def _do_eos(self, *args):
         self.seek(0)

kivy/data/logo/kivy-icon-128.png

@@ -11,6 +11,7 @@
 
 <Button,ToggleButton>:
     canvas:
+        Clear
         Color:
             rgba: self.background_color
         BorderImage:
@@ -200,6 +201,7 @@
     # Don't allow expansion of the ../ node
     is_leaf: not ctx.isdir or ctx.name.endswith('..' + ctx.sep) or self.locked
     on_touch_down: self.collide_point(*args[1].pos) and ctx.controller.entry_touched(self, args[1])
+    on_touch_up: self.collide_point(*args[1].pos) and ctx.controller.entry_released(self, args[1])
     BoxLayout:
         pos: root.pos
         Label:
@@ -243,6 +245,7 @@
     size_hint: None, None
 
     on_touch_down: self.collide_point(*args[1].pos) and ctx.controller.entry_touched(self, args[1])
+    on_touch_up: self.collide_point(*args[1].pos) and ctx.controller.entry_released(self, args[1])
 
     canvas:
         Color:
@@ -253,25 +256,25 @@
             size: root.size
             source: 'data/images/filechooser_selected.png'
 
-	Image:
-		size: 48, 48
-		source: 'data/images/filechooser_%s.png' % ('folder' if ctx.isdir else 'file')
-		pos: root.x + 24, root.y + 40
-	Label:
-		text: unicode(ctx.name)
-		text_size: (root.width, self.height)
-		halign: 'center'
-		shorten: True
-		size: 100, 16
-		pos: root.x, root.y + 16
-
-	Label:
-		text: unicode(ctx.get_nice_size())
-		font_size: 8
-		color: .8, .8, .8, 1
-		size: 100, 16
-		pos: root.pos
-		halign: 'center'
+    Image:
+        size: 48, 48
+        source: 'data/images/filechooser_%s.png' % ('folder' if ctx.isdir else 'file')
+        pos: root.x + 24, root.y + 40
+    Label:
+        text: unicode(ctx.name)
+        text_size: (root.width, self.height)
+        halign: 'center'
+        shorten: True
+        size: 100, 16
+        pos: root.x, root.y + 16
+
+    Label:
+        text: unicode(ctx.get_nice_size())
+        font_size: 8
+        color: .8, .8, .8, 1
+        size: 100, 16
+        pos: root.pos
+        halign: 'center'
 
 
 # Switch widget