Git-Mirrors/Sideband
1
0
Fork 0
mirror of https://github.com/markqvist/Sideband.git synced 2025-01-15 09:27:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed advanced RNS config acting unexpectedly

Browse Source
This commit is contained in:
Mark Qvist 2025-01-02 10:55:13 +01:00
parent c1f04e8e3e
commit 2ce03c1508
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbapp/sideband/core.py
View File

@ -181,6 +181,7 @@ class SidebandCore():
self.allow_service_dispatch = True self.allow_service_dispatch = True
self.version_str = "" self.version_str = ""
self.config_template = rns_config self.config_template = rns_config
self.default_config_template = rns_config
if config_path == None: if config_path == None:
self.app_dir = plyer.storagepath.get_home_dir()+"/.config/sideband" self.app_dir = plyer.storagepath.get_home_dir()+"/.config/sideband"
@ -5012,6 +5013,6 @@ rns_config = """# This template is used to generate a
# No additional interfaces are currently # No additional interfaces are currently
# defined, but you can use this section # defined, but you can use this section
# to do so. # to add additional custom interfaces.
[interfaces] [interfaces]
""" """

34
sbapp/ui/utilities.py
View File

@ -135,13 +135,24 @@ class Utilities():
def update_advanced(self, sender=None): def update_advanced(self, sender=None):
if RNS.vendor.platformutils.is_android(): if RNS.vendor.platformutils.is_android():
ct = self.app.sideband.config["config_template"] ct = self.app.sideband.config["config_template"]
if ct == None:
ct = self.app.sideband.default_config_template
self.advanced_screen.ids.config_template.text = f"[font=RobotoMono-Regular][size={int(dp(12))}]{ct}[/size][/font]" self.advanced_screen.ids.config_template.text = f"[font=RobotoMono-Regular][size={int(dp(12))}]{ct}[/size][/font]"
else: else:
self.advanced_screen.ids.config_template.text = f"[font=RobotoMono-Regular][size={int(dp(12))}]On this platform, Reticulum configuration is managed by the system. You can change the configuration by editing the file located at:\n\n{self.app.sideband.reticulum.configpath}[/size][/font]" self.advanced_screen.ids.config_template.text = f"[font=RobotoMono-Regular][size={int(dp(12))}]On this platform, Reticulum configuration is managed by the system. You can change the configuration by editing the file located at:\n\n{self.app.sideband.reticulum.configpath}[/size][/font]"
def reset_config(self, sender=None):
if RNS.vendor.platformutils.is_android():
self.app.sideband.config["config_template"] = None
self.app.sideband.save_configuration()
self.update_advanced()
def copy_config(self, sender=None): def copy_config(self, sender=None):
if RNS.vendor.platformutils.is_android(): if RNS.vendor.platformutils.is_android():
Clipboard.copy(self.app.sideband.config_template) if self.app.sideband.config["config_template"]:
Clipboard.copy(self.app.sideband.config["config_template"])
else:
Clipboard.copy(self.app.sideband.default_config_template)
def paste_config(self, sender=None): def paste_config(self, sender=None):
if RNS.vendor.platformutils.is_android(): if RNS.vendor.platformutils.is_android():
@ -409,7 +420,7 @@ MDScreen:
padding: [dp(0), dp(14), dp(0), dp(24)] padding: [dp(0), dp(14), dp(0), dp(24)]
MDRectangleFlatIconButton: MDRectangleFlatIconButton:
id: telemetry_button id: conf_copy_button
icon: "content-copy" icon: "content-copy"
text: "Copy Configuration" text: "Copy Configuration"
padding: [dp(0), dp(14), dp(0), dp(14)] padding: [dp(0), dp(14), dp(0), dp(14)]
@ -420,7 +431,7 @@ MDScreen:
disabled: False disabled: False
MDRectangleFlatIconButton: MDRectangleFlatIconButton:
id: coordinates_button id: conf_paste_button
icon: "download" icon: "download"
text: "Paste Configuration" text: "Paste Configuration"
padding: [dp(0), dp(14), dp(0), dp(14)] padding: [dp(0), dp(14), dp(0), dp(14)]
@ -430,6 +441,23 @@ MDScreen:
on_release: root.delegate.paste_config(self) on_release: root.delegate.paste_config(self)
disabled: False disabled: False
MDBoxLayout:
orientation: "horizontal"
spacing: dp(24)
size_hint_y: None
height: self.minimum_height
padding: [dp(0), dp(0), dp(0), dp(24)]
MDRectangleFlatIconButton:
id: conf_reset_button
icon: "cog-counterclockwise"
text: "Reset Configuration"
padding: [dp(0), dp(14), dp(0), dp(14)]
icon_size: dp(24)
font_size: dp(16)
size_hint: [1.0, None]
on_release: root.delegate.reset_config(self)
disabled: False
MDLabel: MDLabel:
id: config_template id: config_template