From f886788bb3fbf28d0f1e06b4835c1e66b10e53df Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Thu, 24 Sep 2020 18:41:53 +0800
Subject: [PATCH] bugfix

---
 kivyblocks/filebrowser.py | 95 +++++++++++++++++++++++++++++++++++++++
 kivyblocks/kivycamera.py  |  3 ++
 2 files changed, 98 insertions(+)
 create mode 100644 kivyblocks/filebrowser.py

diff --git a/kivyblocks/filebrowser.py b/kivyblocks/filebrowser.py
new file mode 100644
index 0000000..4df33a1
--- /dev/null
+++ b/kivyblocks/filebrowser.py
@@ -0,0 +1,95 @@
+from kivy.uix.floatlayout import FloatLayout
+from kivy.factory import Factory
+from kivy.properties import ObjectProperty
+from kivy.uix.popup import Popup
+from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.button import Button
+from kivy.uix.filechooser import FileChooserListView, FileChooserIconView
+from kivyblocks.i18n import I18n
+from kivyblocks.utils import blockImage,CSize
+from kivyblocks.baseWidget import PressableImage, StrInput
+
+import os
+
+def i18n(s):
+	return s
+
+class FileLoaderBrowser(Popup):
+	def __init__(self,rootpath='/', title='load file', choose_dir=False, **kwargs):
+		# i18n = I18n()
+		self.content = BoxLayout(orientation='vertical')
+		Popup.__init__(self, content = self.content, 
+					title=i18n(title), 
+					size_hint=(0.9,0.9))
+		self.choose_dir = choose_dir
+
+		self.list_widget = FileChooserListView(rootpath=rootpath)
+		self.icon_widget = FileChooserIconView(rootpath=rootpath)
+		self.list_widget.bind(on_selection=self.set_txt_input)
+		self.icon_widget.bind(on_selection=self.set_txt_input)
+		self.btn_load = Button(text=i18n('load'),size_hint=(None,None),
+						size=CSize(8,2))
+		self.btn_list_view = PressableImage(	\
+						source=blockImage('list_view.png'),
+						size_hint=(None,None),
+						size=CSize(2,2))
+		self.btn_icon_view = PressableImage(	\
+						source=blockImage('icon_view.png'),
+						size_hint=(None,None),
+						size=CSize(2,2))
+		self.btn_list_view.bind(on_press=self.change_view_mode)
+		self.btn_icon_view.bind(on_press=self.change_view_mode)
+		self.btn_load.bind(on_release=self.do_load)
+		self.control_box = BoxLayout(orientation='horizontal',
+				size_hint_y=None,
+				height=CSize(2.5)
+				)
+		self.txt_input = Factory.StrInput()
+		self.view_mode = 'list_view'
+		self.show_list_view()
+
+	def set_txt_input(self,o,v=None):
+		print('on_selection fired',o.selection)
+		self.txt_input.text = o.path
+
+	def do_load(self,o,d=None):
+		print(o,d)
+		print(self.cur_widget.selection and self.cur_widget.selection[0] or '', 'selected ')
+	def change_view_mode(self,o,v=None):
+		self.content.clear_widgets()
+		if self.view_mode == 'list_view':
+			self.show_icon_view()
+		else:
+			self.show_list_view()
+	def show_list_view(self):
+		self.cur_widget = self.list_widget
+		self.view_mode = 'list_view'
+		self.cur_widget.path = self.icon_widget.path
+		self.content.add_widget(self.list_widget)
+		self.content.add_widget(self.txt_input)
+		self.content.add_widget(self.control_box)
+		self.control_box.clear_widgets()
+		self.control_box.add_widget(self.btn_load)
+		self.control_box.add_widget(self.btn_list_view)
+
+	def show_icon_view(self):
+		self.cur_widget = self.icon_widget
+		self.view_mode = 'icon_view'
+		self.cur_widget.path = self.list_widget.path
+		self.content.add_widget(self.icon_widget)
+		self.content.add_widget(self.txt_input)
+		self.content.add_widget(self.control_box)
+		self.control_box.clear_widgets()
+		self.control_box.add_widget(self.btn_load)
+		self.control_box.add_widget(self.btn_icon_view)
+
+Factory.register('FileLoaderBrowser',FileLoaderBrowser)
+
+if __name__ == '__main__':
+	from kivy.app import App
+	class Test(App):
+		def build(self):
+			x = FileLoaderBrowser()
+			return x
+	app = Test()
+	app.run()
diff --git a/kivyblocks/kivycamera.py b/kivyblocks/kivycamera.py
index 484d384..00af435 100644
--- a/kivyblocks/kivycamera.py
+++ b/kivyblocks/kivycamera.py
@@ -68,6 +68,9 @@ class KivyCamera(Image):
 			image_texture.blit_buffer(buf, colorfmt='bgr', bufferfmt='ubyte')
 			# display image from the texture
 			self.texture = image_texture
+		else:
+			self.update_task.cancel()
+			print('failed to read from capture')
 
 	def __del__(self):
 		if self.update_task: