bugfix

kivyblocks/blocksapp.py

@@ -2,6 +2,7 @@
 import os
 import sys
 from kivy.resources import resource_add_path
+from kivy.config import Config
 resource_add_path(os.path.join(os.path.dirname(__file__),'./ttf'))
 Config.set('kivy', 'default_font', [
 	'msgothic',
@@ -17,7 +18,6 @@ from appPublic.uniqueID import getID
 from appPublic.rsa import RSA
 
 from kivy.factory import Factory
-from kivy.config import Config
 from kivy.metrics import sp,dp,mm
 from kivy.core.window import WindowBase, Window
 from kivy.clock import Clock

kivyblocks/uitype.py

@@ -8,6 +8,8 @@ we use a register machinans to maintian the ui type information to build the vie
 
 import ujson as json
 from kivy.factory import Factory
+from kivy.properties import NumericProperty, StringProperty, \
+		BooleanProperty
 from kivy.uix.label import Label
 
 from appPublic.myTE import string_template_render
@@ -17,6 +19,36 @@ from .baseWidget import WrapText, Text
 from .widgetExt.inputext import FloatInput,IntegerInput, \
 		StrInput,SelectInput, BoolInput, AmountInput, Password
 
+class StringView(Label):
+	def __init__(self, **kw):
+		super(StringView, self).__init__(**kw)
+		self.wrap = True
+		self.halign = 'left'
+		self.valign = 'middle'
+
+	def getValue(self):
+		return self.text
+
+	def setValue(self, v):
+		self.text = str(v)
+
+class PasswordView(StringView):
+	def __init__(self, text='*', **kw):
+		super(PasswordView, self).__init__(text=text, **kw)
+
+	def getValue(self):
+		return None
+
+	def setValue(self, v):
+		pass
+
+class TextView(WrapText):
+	def getValue(self):
+		return self.text
+
+	def setValue(self, v):
+		self.text = v
+
 view_widget_builders = {
 }
 
@@ -62,7 +94,7 @@ def get_value(desc, rec=None):
 	
 def build_view_str_widget(desc, rec=None):
 	txt = get_value(desc, rec=rec)
-	return Label(text=str(txt) if txt else '',
+	return StringView(text=str(txt) if txt else '',
 						font_size=CSize(1),
 						halign='left',
 						valign='middle')
@@ -74,7 +106,7 @@ view_register('timestamp', build_view_str_widget)
 
 def build_view_text_widget(desc, rec=None):
 	txt = get_value(desc, rec=rec)
-	return WrapText(text=str(txt) if txt else '',
+	return TextView(text=str(txt) if txt else '',
 						font_size=CSize(1),
 						halign='left',
 						valign='middle')
@@ -82,32 +114,74 @@ def build_view_text_widget(desc, rec=None):
 view_register('text', build_view_text_widget)
 
 def build_view_passwd_widget(desc, rec=None):
-	return Label(text='*',
+	return PasswordView(text='*',
 						font_size=CSize(1),
 						halign='left',
 						valign='middle')
 
 view_register('password', build_view_passwd_widget)
+
+class BoolView(Label):
+	value = BooleanProperty(False)
+	def __init__(self, text='', **kw):
+		super(BoolView, self).__init__(text='', **kw)
+		self.wrap = True
+		self.halign = 'center'
+		self.valign = 'middle'
+	
+	def on_value(self, *args):
+		if self.value:
+			self.text = 'true'
+		else:
+			self.text = 'false'
+
+	def getValue(self):
+		return self.value
+
+	def setValue(self, v):
+		self.value = v
+
 def build_view_bool_widget(desc, rec=None):
 	v = get_value(desc, rec)
 	if v is not None:
-		return Label(text='True' if v else 'False',
+		return BoolView(value=v,
 						font_size=CSize(1),
 						halign='left',
 						valign='middle')
 	
-	default_value = desc.get('nullvalue','')
+	default_value = desc.get('nullvalue',False)
-	return Label(text=default_value,
+	return BoolView(value=default_Value,
 						font_size=CSize(1),
 						halign='left',
 						valign='middle')
 
 view_register('bool', build_view_bool_widget)
 
+class IntView(Text):
+	value = NumericProperty(None)
+	nullstr = StringProperty('')
+	def __init__(self, **kw):
+		super(IntView, self).__init__(text='', **kw)
+		self.wrap = True
+		self.halign = 'right'
+		self.valign = 'middle'
+
+	def on_value(self, *args):
+		if self.value is not None:
+			self.text = str(v)
+		else:
+			self.text = self.nullstr
+
+	def setValue(self, v):
+		self.value = v
+
+	def getValue(self):
+		return self.value
+
 def build_view_int_widget(desc, rec=None):
 	v = get_value(desc, rec=rec)
-	default_value = desc.get('nullvalue','')
+	return IntValue(value=v,
-	return Label(text=str(v) if v is not None else default_value,
+			nullstr=desc.get('nullstr',''),
 			font_size=CSize(1), 
 			halign='right', 
 			valign='middle'
@@ -115,11 +189,33 @@ def build_view_int_widget(desc, rec=None):
 
 view_register('int', build_view_int_widget)
 
+class FloatView(Text):
+	value = NumericProperty(None)
+	nullstr = StringProperty('')
+	dec = NumericProperty(2)
+	def __init__(self, **kw):
+		super(FloatView, self).__init__(text=self.nullstr, **kw)
+		self.wrap = True
+		self.halign = 'right'
+		self.valign = 'middle'
+
+	def on_value(self, *args):
+		if self.value is None:
+			self.text = self.bullstr
+		f = '%%.0%df' % self.dec
+		self.text = f % self.value
+		
+	def getValue(self):
+		return self.value
+
+	def setValue(self, v):
+		self.value = v
+
 def build_view_float_widget(desc, rec=None):
 	v = get_value(desc, rec=rec)
-	f = '%%.0%df' % desc.get('dec',2)
+	return FloatView(value=v,
-	default_value = desc.get('nullvalue','')
+					dec=desc.get('dec', 2),
-	return Label(text=f % float(v) if v is not None else default_value,
+					nullstr=desc.get('nullstr',''),
 					font_size=CSize(1), 
 					halign='right', 
 					valign='middle'
@@ -141,38 +237,45 @@ def build_view_code_widget(desc, rec=None):
 
 view_register('code', build_view_code_widget)
 
-def amount_str(v, dec):
+class AmountView(FloatView):
-	f = '%%.0%df' % dec
+	def on_value(self, *args):
-	s = f % v
+		if self.value is None:
-	parts = s.split('.')
+			self.text = self.nullstr
-	p_int = parts[0]
+		else:
-	subs = []
+			self.text = self.amount_str()
-	if p_int[0] == '-':
+	
-		subs.append('-')
+	def amount_str(self):
-		p_int = p_int[1:]
+		f = '%%.0%df' % self.dec
-	l = [i for i in p_int]
+		s = f % self.value
-	l.reverse()
+		parts = s.split('.')
-	k = []
+		p_int = parts[0]
-	for i,c in enumerate(l):
+		subs = []
-		if i and (i) % 3 == 0:
+		if p_int[0] == '-':
-			k.append(',')
+			subs.append('-')
-		k.append(c)
+			p_int = p_int[1:]
-	k.reverse()
+		l = [i for i in p_int]
-	subs.append(''.join(k))
+		l.reverse()
-	if len(parts) > 1:
+		k = []
-		subs.append(f'.{parts[1]}')
+		for i,c in enumerate(l):
-	return ''.join(subs)
+			if i and (i) % 3 == 0:
+				k.append(',')
+			k.append(c)
+		k.reverse()
+		subs.append(''.join(k))
+		if len(parts) > 1:
+			subs.append(f'.{parts[1]}')
+		return ''.join(subs)
 
 def build_view_amount_widget(desc, rec=None):
 	v = get_value(desc, rec=rec)
-	defaultvalue = desc.get('nullvalue', '')
+	defaultvalue = desc.get('nullstr', '')
-	if v:
+	return Amount(value=v,
-		f = '%%.0%df' % desc.get('dec',2)
+					dec=desc.get('dec', 2),
-		return Label(text=amount_str(v, dec),
+					nullstr=defaultvale,
 					font_size=CSize(1), 
 					halign='right', 
 					valign='middle'
-		)
+	)
 
 view_register('amount', build_view_amount_widget)