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/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/data/logo/kivy-icon-128.png

@@ -201,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:
@@ -244,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:

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

@@ -89,6 +89,9 @@ def __init__(self, **kwargs):
                   resolution=self._on_index)
         self._on_index()
 
+    def on_tex(self, *l):
+        self.canvas.ask_update()
+
     def _on_index(self, *largs):
         self._camera = None
         if self.index < 0:
@@ -98,6 +101,7 @@ def _on_index(self, *largs):
         self._camera.bind(on_load=self._camera_loaded)
         if self.play:
             self._camera.start()
+            self._camera.bind(on_texture=self.on_tex)
 
     def _camera_loaded(self, *largs):
         self.texture = self._camera.texture

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

@@ -140,6 +140,9 @@ def __init__(self, **kwargs):
         self.register_event_type('on_submit')
         super(FileChooserController, self).__init__(**kwargs)
 
+        self._items = []
+        self.bind(selection=self._update_item_selection)
+
         if platform in ('darwin', 'linux2'):
             self.is_hidden = is_hidden_unix
         elif platform == 'win32':
@@ -151,6 +154,10 @@ def __init__(self, **kwargs):
                   filters=self._trigger_update)
         self._trigger_update()
 
+    def _update_item_selection(self, *args):
+        for item in self._items:
+            item.selected = item.path in self.selection
+
     def _trigger_update(self, *args):
         Clock.unschedule(self._update_files)
         Clock.schedule_once(self._update_files)
@@ -168,9 +175,12 @@ def on_remove_subentry(self, subentry, entry):
         pass
 
     def on_submit(self, selected, touch=None):
-        self.selection = []
+        pass
 
     def entry_touched(self, entry, touch):
+        '''(internal) This method must be called by the template when an entry
+        is touched by the user.
+        '''
         if self.multiselect:
             if isdir(entry.path) and touch.is_double_tap:
                 self.open_entry(entry)
@@ -181,10 +191,23 @@ def entry_touched(self, entry, touch):
                     self.selection.append(entry.path)
         else:
             if isdir(entry.path):
-                self.open_entry(entry)
+                pass
             else:
                 self.selection = [entry.path, ]
-                self.dispatch('on_submit', [entry.path], touch)
+
+    def entry_released(self, entry, touch):
+        '''(internal) This method must be called by the template when an entry
+        is touched by the user.
+
+        .. versionadded:: 1.0.10
+        '''
+        if self.multiselect:
+            pass
+        else:
+            if isdir(entry.path):
+                self.open_entry(entry)
+            elif touch.is_double_tap:
+                self.dispatch('on_submit', self.selection, touch)
 
     def open_entry(self, entry):
         try:
@@ -232,6 +255,7 @@ def get_nice_size(self, fn):
     def _update_files(self, *args):
         # Clear current files
         self.dispatch('on_entries_cleared')
+        self._items = []
 
         # Add the components that are always needed
         if platform == 'win32':
@@ -247,6 +271,7 @@ def _update_files(self, *args):
             pardir = Builder.template(self._ENTRY_TEMPLATE, **dict(name=back,
                 size='', path=back, controller=self, isdir=True, parent=None,
                 sep=sep, get_nice_size=lambda: ''))
+            self._items.append(pardir)
             self.dispatch('on_entry_added', pardir)
         try:
             self._add_files(self.path)

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

@@ -250,6 +250,7 @@ def __init__(self, **kwargs):
 
     def on_source(self, instance, value):
         if not value:
+            self._coreimage.unbind(on_texture=self._on_tex_change)
             self.texture = None
             self._coreimage = None
         else:
@@ -271,4 +272,5 @@ def is_uri(self, filename):
         return proto in ('http', 'https', 'ftp')
 
     def _on_tex_change(self, *largs):
-        self.texture = self._coreimage.texture
+        if self._coreimage:
+            self.texture = self._coreimage.texture

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

@@ -95,6 +95,8 @@ def __init__(self, **kwargs):
         super(Video, self).__init__(**kwargs)
 
     def texture_update(self, *largs):
+        '''This method is a no-op in Video widget.
+        '''
         pass
 
     def on_source(self, instance, value):