Updated keyboard shortcuts and guide

This commit is contained in:
Mark Qvist 2024-06-01 15:35:10 +02:00
parent 3bf142d21a
commit b1aa8cb704
2 changed files with 28 additions and 22 deletions

View File

@ -997,12 +997,17 @@ class SidebandApp(MDApp):
else: else:
self.telemetry_action(self) self.telemetry_action(self)
if text == "o": if text == "u":
# if self.root.ids.screen_manager.current == "telemetry_screen":
self.map_display_own_telemetry() self.map_display_own_telemetry()
if text == "o":
self.objects_action()
if text == "r": if text == "r":
if self.root.ids.screen_manager.current == "conversations_screen": if self.root.ids.screen_manager.current == "conversations_screen":
if self.include_objects:
self.conversations_action(self, direction="right")
else:
self.lxmf_sync_action(self) self.lxmf_sync_action(self)
elif self.root.ids.screen_manager.current == "telemetry_screen": elif self.root.ids.screen_manager.current == "telemetry_screen":
self.conversations_action(self, direction="right") self.conversations_action(self, direction="right")
@ -4965,28 +4970,32 @@ The Propagation Nodes also distribute copies of messages between each other, suc
If you use Reticulum and LXMF on hardware that does not carry any identifiers tied to you, it is possible to establish a completely free and anonymous communication system with Reticulum and LXMF clients.""" If you use Reticulum and LXMF on hardware that does not carry any identifiers tied to you, it is possible to establish a completely free and anonymous communication system with Reticulum and LXMF clients."""
guide_text8 = """ guide_text8 = """
[size=18dp][b]Keyboard Shortcuts[/b][/size][size=5dp]\n \n[/size] - Ctrl+Q or Ctrl-W Shut down Sideband [size=18dp][b]Keyboard Shortcuts[/b][/size][size=5dp]\n \n[/size] - [b]Ctrl+Q[/b] or [b]Ctrl-W[/b] Shut down Sideband
- Ctrl-D or Ctrl-S Send message - [b]Ctrl-R[/b] Go to Conversations
- Ctrl-R Show Conversations - [b]Ctrl-R[/b] Start LXMF sync (from Conversations screen)
- Ctrl-L Show Announce Stream - [b]Ctrl-N[/b] Create new conversation
- Ctrl-M Show Situation Map - [b]Ctrl-[i]n[/i][/b] Go to conversation number [i]n[/i]
- Ctrl-T Show Telemetry Setup - [b]Ctrl-D[/b] or [b]Ctrl-S[/b] Send message
- Ctrl-N New conversation - [b]Ctrl-U[/b] Display own telemetry
- Ctrl-G Show guide""" - [b]Ctrl-O[/b] Go to Objects & Devices
- [b]Ctrl-L[/b] Go to Announce Stream
- [b]Ctrl-M[/b] Go to Situation Map
- [b]Ctrl-T[/b] Go to Telemetry configuration
- [b]Ctrl-G[/b] Go to Guide"""
guide_text9 = """ guide_text9 = """
[size=18dp][b]Sow Seeds Of Freedom[/b][/size][size=5dp]\n \n[/size]It took me more than seven years to design and built the entire ecosystem of software and hardware that makes this possible. If this project is valuable to you, please go to [u][ref=link]https://unsigned.io/donate[/ref][/u] to support the project with a donation. Every donation directly makes the entire Reticulum project possible. [size=18dp][b]Please Support This Project[/b][/size][size=5dp]\n \n[/size]It took me more than seven years to design and built the entire ecosystem of software and hardware that makes this possible. If this project is valuable to you, please go to [u][ref=link]https://unsigned.io/donate[/ref][/u] to support the project with a donation. Every donation directly makes the entire Reticulum project possible.
Thank you very much for using Free Communications Systems. Thank you very much for using Free Communications Systems.
""" """
info1 = guide_text1 info1 = guide_text1
info2 = guide_text2 info2 = guide_text8
info3 = guide_text3 info3 = guide_text2
info4 = guide_text4 info4 = guide_text3
info5 = guide_text5 info5 = guide_text4
info6 = guide_text6 info6 = guide_text5
info7 = guide_text7 info7 = guide_text6
info8 = guide_text8 info8 = guide_text7
info9 = guide_text9 info9 = guide_text9
if self.theme_cls.theme_style == "Dark": if self.theme_cls.theme_style == "Dark":

View File

@ -176,12 +176,10 @@ class Conversations():
remove_widgets = [] remove_widgets = []
for w in self.list.children: for w in self.list.children:
if not w.sb_uid in [e["dest"] for e in self.context_dests]: if not w.sb_uid in [e["dest"] for e in self.context_dests]:
RNS.log("Should remove "+RNS.prettyhexrep(w.sb_uid)+" from list", RNS.LOG_DEBUG)
remove_widgets.append(w) remove_widgets.append(w)
self.added_item_dests.remove(w.sb_uid) self.added_item_dests.remove(w.sb_uid)
for w in remove_widgets: for w in remove_widgets:
RNS.log("Removing "+str(w))
self.list.remove_widget(w) self.list.remove_widget(w)
@ -214,7 +212,6 @@ class Conversations():
is_object = self.app.sideband.is_object(dest, conv_data=cd) is_object = self.app.sideband.is_object(dest, conv_data=cd)
send_telemetry = self.app.sideband.should_send_telemetry(dest, conv_data=cd) send_telemetry = self.app.sideband.should_send_telemetry(dest, conv_data=cd)
allow_requests = self.app.sideband.requests_allowed_from(dest, conv_data=cd) allow_requests = self.app.sideband.requests_allowed_from(dest, conv_data=cd)
RNS.log("is_object: "+str(is_object))
yes_button = MDRectangleFlatButton(text="Save",font_size=dp(18), theme_text_color="Custom", line_color=self.app.color_accept, text_color=self.app.color_accept) yes_button = MDRectangleFlatButton(text="Save",font_size=dp(18), theme_text_color="Custom", line_color=self.app.color_accept, text_color=self.app.color_accept)
no_button = MDRectangleFlatButton(text="Cancel",font_size=dp(18)) no_button = MDRectangleFlatButton(text="Cancel",font_size=dp(18))