master
yumoqing 2023-10-09 13:52:30 +08:00
parent 263636779b
commit 9e60443e79
249 changed files with 698 additions and 678 deletions

0
README.md 100644 → 100755
View File

0
docs/blocks.md 100644 → 100755
View File

0
docs/changelog.md 100644 → 100755
View File

0
docs/cn/binds.md 100644 → 100755
View File

0
docs/cn/cdf.md 100644 → 100755
View File

0
docs/cn/index.md 100644 → 100755
View File

0
docs/cn/intro.md 100644 → 100755
View File

0
docs/en/box.md 100644 → 100755
View File

0
docs/imgs/hello_window.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
github-speed-up.md 100644 → 100755
View File

0
kivyblocks/__init__.py 100644 → 100755
View File

0
kivyblocks/android_rotation.py 100644 → 100755
View File

0
kivyblocks/anz/__init__.py 100644 → 100755
View File

0
kivyblocks/anz/bluetooth.py 100644 → 100755
View File

0
kivyblocks/aplayer.py 100644 → 100755
View File

0
kivyblocks/backendfunction.py 100644 → 100755
View File

21
kivyblocks/baseWidget.py 100644 → 100755
View File

@ -75,7 +75,7 @@ from .threadcall import HttpClient
from .i18n import I18n from .i18n import I18n
from .widget_css import WidgetCSS from .widget_css import WidgetCSS
from .ready import WidgetReady from .ready import WidgetReady
from .utils import CSize, SUPER from .utils import CSize
from .swipebehavior import SwipeBehavior from .swipebehavior import SwipeBehavior
from .widgetExt.inputext import MyDropDown from .widgetExt.inputext import MyDropDown
@ -140,7 +140,7 @@ def ScatterBox(WidgetCSS, WidgetReady, ScatterLayout):
class Box(WidgetCSS, WidgetReady, BoxLayout): class Box(WidgetCSS, WidgetReady, BoxLayout):
def __init__(self, **kw): def __init__(self, **kw):
try: try:
SUPER(Box, self, kw) super(Box, self).__init__(**kw)
except Exception as e: except Exception as e:
print('Box(',kw,') Error') print('Box(',kw,') Error')
raise e raise e
@ -157,9 +157,7 @@ class VBox(Box):
Box.__init__(self, **kw) Box.__init__(self, **kw)
class SwipeBox(SwipeBehavior, Box): class SwipeBox(SwipeBehavior, Box):
def __init__(self, **kw): pass
SUPER(SwipeBox, self, kw)
class Text(Label): class Text(Label):
lang=StringProperty('') lang=StringProperty('')
@ -182,7 +180,7 @@ class Text(Label):
if not kwargs.get('text'): if not kwargs.get('text'):
kwargs['text'] = kwargs.get('otext','') kwargs['text'] = kwargs.get('otext','')
SUPER(Text, self, kwargs) super(Text, self).__init__(**kwargs)
if self._i18n: if self._i18n:
self.i18n.addI18nWidget(self) self.i18n.addI18nWidget(self)
if self.wrap: if self.wrap:
@ -277,6 +275,7 @@ class Modal(VBox):
self._target = None self._target = None
super(Modal, self).__init__(**kw) super(Modal, self).__init__(**kw)
self.set_size_position() self.set_size_position()
print('size_hint=', self.size_hint, kw)
self._target.bind(size=self.set_size_position) self._target.bind(size=self.set_size_position)
self.register_event_type('on_open') self.register_event_type('on_open')
self.register_event_type('on_pre_open') self.register_event_type('on_pre_open')
@ -299,7 +298,7 @@ class Modal(VBox):
return super().on_touch_down(touch) return super().on_touch_down(touch)
def on_target(self): def on_target(self, o, target):
w = Window w = Window
if self.target is not None: if self.target is not None:
w = Factory.Blocks.getWidgetById(self.target) w = Factory.Blocks.getWidgetById(self.target)
@ -324,9 +323,9 @@ class Modal(VBox):
self.width = self.size_hint_x * self._target.width self.width = self.size_hint_x * self._target.width
if self.size_hint_y: if self.size_hint_y:
self.height = self.size_hint_y * self._target.height self.height = self.size_hint_y * self._target.height
print(self.width, self.height, print("size with target:", self.width, self.height,
self.size_hint_x, self.size_hint_y, self.size_hint, self.size_hint,
self._target.size "target size=", self._target.size
) )
self.set_modal_position() self.set_modal_position()
@ -392,7 +391,7 @@ class TimedModal(Modal):
show_time = NumericProperty(0) show_time = NumericProperty(0)
def __init__(self, **kw): def __init__(self, **kw):
self.time_task = None self.time_task = None
SUPER(TimedModal, self, kw) super(TimedModal, self).__init__(**kw)
def open(self, *args, **kw): def open(self, *args, **kw):
if self.time_task is not None: if self.time_task is not None:

0
kivyblocks/bgcolorbehavior.py 100644 → 100755
View File

0
kivyblocks/block_test.py 100644 → 100755
View File

2
kivyblocks/blocks.py 100644 → 100755
View File

@ -204,7 +204,7 @@ x = ClassX{klass_cnt}()
return None return None
if url.startswith('file://'): if url.startswith('file://'):
return self.script.dispatch(url, **params) return self.script.dispatch(url, params)
elif url.startswith('http://') or url.startswith('https://'): elif url.startswith('http://') or url.startswith('https://'):
try: try:
hc = HttpClient() hc = HttpClient()

28
kivyblocks/blocksapp.py 100644 → 100755
View File

@ -60,10 +60,13 @@ class BlocksApp(App):
with codecs.open(config.css.css_filename, 'r', 'utf-8') as f: with codecs.open(config.css.css_filename, 'r', 'utf-8') as f:
d = json.load(f) d = json.load(f)
self.buildCsses(d) self.buildCsses(d)
if config.css.css_url: try:
hc = HttpClient() if config.css.css_url:
d = hc.get(self.realurl(config.css.css_url)) hc = HttpClient()
self.buildCsses(d) d = hc.get(self.realurl(config.css.css_url))
self.buildCsses(d)
except:
pass
def on_rotate(self,*largs): def on_rotate(self,*largs):
self.current_rotation = Window.rotation self.current_rotation = Window.rotation
@ -76,10 +79,19 @@ class BlocksApp(App):
register_css(k,v) register_css(k,v)
def build(self): def build(self):
i18n = I18n() config = getConfig()
self.workers = Workers(maxworkers=config.maxworkers or 80)
self.workers.start()
try:
i18n = I18n()
except:
i18n = None
self.platform = platform self.platform = platform
self.is_desktop = platform in ['win', 'linux', 'macosx'] self.is_desktop = platform in ['win', 'linux', 'macosx']
config = getConfig() self.default_params = {}
if config.default_params:
self.default_params.update(config.default_params)
self.public_headers = { self.public_headers = {
"platform":self.platform "platform":self.platform
} }
@ -88,8 +100,6 @@ class BlocksApp(App):
Window.bind(on_request_close=self.on_close) Window.bind(on_request_close=self.on_close)
Window.bind(on_rotate=self.on_rotate) Window.bind(on_rotate=self.on_rotate)
Window.bind(size=self.device_info) Window.bind(size=self.device_info)
self.workers = Workers(maxworkers=config.maxworkers or 80)
self.workers.start()
self.load_csses() self.load_csses()
self.running = True self.running = True
if config.root: if config.root:
@ -163,7 +173,7 @@ class BlocksApp(App):
} }
self.public_headers.update(device) self.public_headers.update(device)
def on_close(self, *args): def on_close(self, *args, **kwargs):
self.workers.running = False self.workers.running = False
return False return False

0
kivyblocks/boxViewer.py 100644 → 100755
View File

0
kivyblocks/circle_progress.py 100644 → 100755
View File

0
kivyblocks/clickable.py 100644 → 100755
View File

0
kivyblocks/color_definitions.py 100644 → 100755
View File

0
kivyblocks/colorcalc.py 100644 → 100755
View File

0
kivyblocks/command_action.py 100644 → 100755
View File

0
kivyblocks/dataloader.py 100644 → 100755
View File

0
kivyblocks/date_picker.py 100644 → 100755
View File

0
kivyblocks/dateinput.py 100644 → 100755
View File

0
kivyblocks/defaultimage.py 100644 → 100755
View File

1298
kivyblocks/dg.py 100644 → 100755

File diff suppressed because it is too large Load Diff

0
kivyblocks/download.py 100644 → 100755
View File

View File

0
kivyblocks/ffpyplayer_video.py 100644 → 100755
View File

0
kivyblocks/filebrowser.py 100644 → 100755
View File

1
kivyblocks/form.py 100644 → 100755
View File

@ -32,6 +32,7 @@ form options
"method" "method"
} }
"cols":"1" "cols":"1"
"inputwidth",
"labelwidth": "labelwidth":
"textsize": "textsize":
"inputheight": "inputheight":

0
kivyblocks/gps.py 100644 → 100755
View File

0
kivyblocks/hack_ffpyplayer.py 100644 → 100755
View File

0
kivyblocks/hierarchy.py 100644 → 100755
View File

0
kivyblocks/hostimage.py 100644 → 100755
View File

0
kivyblocks/httpvplayer.py 100644 → 100755
View File

0
kivyblocks/i18n.py 100644 → 100755
View File

BIN
kivyblocks/imgs/.DS_Store vendored 100644 → 100755

Binary file not shown.

0
kivyblocks/imgs/Mute64x64.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

0
kivyblocks/imgs/Play64X64.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
kivyblocks/imgs/Sound64x64.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
kivyblocks/imgs/backword.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

0
kivyblocks/imgs/broken.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 201 B

View File

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

0
kivyblocks/imgs/cancel.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
kivyblocks/imgs/checkbox-off.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

0
kivyblocks/imgs/checkbox-on.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
kivyblocks/imgs/clear.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

0
kivyblocks/imgs/conform.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
kivyblocks/imgs/crud_add.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
kivyblocks/imgs/crud_browser.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

0
kivyblocks/imgs/crud_del.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
kivyblocks/imgs/crud_edit.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
kivyblocks/imgs/crud_filter.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
kivyblocks/imgs/delete.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
kivyblocks/imgs/doing.gif 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 171 KiB

After

Width:  |  Height:  |  Size: 171 KiB

0
kivyblocks/imgs/download.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

0
kivyblocks/imgs/error.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

0
kivyblocks/imgs/folder.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 537 B

After

Width:  |  Height:  |  Size: 537 B

0
kivyblocks/imgs/icon_view.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
kivyblocks/imgs/info.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

0
kivyblocks/imgs/kivymd_512.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
kivyblocks/imgs/kivymd_logo.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

0
kivyblocks/imgs/list_view.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

0
kivyblocks/imgs/loading.gif 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

0
kivyblocks/imgs/loading1.gif 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 131 KiB

0
kivyblocks/imgs/menu.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
kivyblocks/imgs/musictrack.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

0
kivyblocks/imgs/musictrack_d.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

0
kivyblocks/imgs/next.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 42 KiB

0
kivyblocks/imgs/next_d.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
kivyblocks/imgs/org_sound.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

0
kivyblocks/imgs/org_sound_d.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

0
kivyblocks/imgs/origin.jpg 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

0
kivyblocks/imgs/pause.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

0
kivyblocks/imgs/pause_d.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

0
kivyblocks/imgs/photo.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
kivyblocks/imgs/picture_empty.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 463 B

0
kivyblocks/imgs/play.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

0
kivyblocks/imgs/play_d.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
kivyblocks/imgs/power64x64.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

0
kivyblocks/imgs/previous.jpg 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

0
kivyblocks/imgs/quad_shadow-0.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

0
kivyblocks/imgs/quad_shadow-1.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
kivyblocks/imgs/quad_shadow-2.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
kivyblocks/imgs/quad_shadow.atlas 100644 → 100755
View File

0
kivyblocks/imgs/question.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

0
kivyblocks/imgs/rec_shadow-0.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
kivyblocks/imgs/rec_shadow-1.png 100644 → 100755
View File

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 43 KiB

0
kivyblocks/imgs/rec_shadow.atlas 100644 → 100755
View File

View File

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Some files were not shown because too many files have changed in this diff Show More