diff --git a/.gitignore b/.gitignore index d7d285d..7750d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ sbapp/bin sbapp/app_storage sbapp/RNS sbapp/LXMF +sbapp/LXST sbapp/precompiled sbapp/*.DS_Store sbapp/*.pyc diff --git a/sbapp/Makefile b/sbapp/Makefile index b6b55dc..d0f9028 100644 --- a/sbapp/Makefile +++ b/sbapp/Makefile @@ -97,6 +97,9 @@ getrns: -(rm ./RNS/__pycache__ -r) (cp -rv ../../LXMF/LXMF ./;rm ./LXMF/Utilities/LXMF) -(rm ./LXMF/__pycache__ -r) + (cp -rv ../../LXST/LXST ./;rm ./LXST/Utilities/LXST) + -(rm ./LXST/__pycache__ -r) + -(rm ./LXST/Utilities/__pycache__ -r) cleanrns: -(rm ./RNS -r) diff --git a/sbapp/main.py b/sbapp/main.py index ea0631e..c816eb8 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -2572,21 +2572,27 @@ class SidebandApp(MDApp): if RNS.vendor.platformutils.is_android(): hs = dp(22) yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18)) + full_button = MDRectangleFlatButton(text="Full RNS Status",font_size=dp(18), theme_text_color="Custom", line_color=self.color_accept, text_color=self.color_accept) dialog = MDDialog( title="Connectivity Status", text=str(self.get_connectivity_text()), - buttons=[ yes_button ], + buttons=[full_button, yes_button], # elevation=0, ) def cs_updater(dt): dialog.text = str(self.get_connectivity_text()) def dl_yes(s): - self.connectivity_updater.cancel() dialog.dismiss() if self.connectivity_updater != None: self.connectivity_updater.cancel() + def cb_rns(sender): + dialog.dismiss() + if self.connectivity_updater != None: + self.connectivity_updater.cancel() + self.rnstatus_action() yes_button.bind(on_release=dl_yes) + full_button.bind(on_release=cb_rns) dialog.open() if self.connectivity_updater != None: @@ -2595,9 +2601,12 @@ class SidebandApp(MDApp): self.connectivity_updater = Clock.schedule_interval(cs_updater, 2.0) else: - if not self.utilities_ready: - self.utilities_init() - self.utilities_screen.rnstatus_action() + self.rnstatus_action() + + def rnstatus_action(self, sender=None): + if not self.utilities_ready: + self.utilities_init() + self.utilities_screen.rnstatus_action() def ingest_lxm_action(self, sender): def cb(dt): diff --git a/setup.py b/setup.py index aa03687..8d4fea9 100644 --- a/setup.py +++ b/setup.py @@ -123,6 +123,7 @@ setuptools.setup( "ffpyplayer", "sh", "numpy<=1.26.4", + "lxst>=0.2.2", "mistune>=3.0.2", "beautifulsoup4", "pycodec2;sys.platform!='Windows' and sys.platform!='win32' and sys.platform!='darwin'",