From b1aa8cb704cf1b6177d06926533cd9cc0a01d600 Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Sat, 1 Jun 2024 15:35:10 +0200
Subject: [PATCH] Updated keyboard shortcuts and guide

---
 sbapp/main.py             | 47 +++++++++++++++++++++++----------------
 sbapp/ui/conversations.py |  3 ---
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/sbapp/main.py b/sbapp/main.py
index e49777c..31e9a54 100644
--- a/sbapp/main.py
+++ b/sbapp/main.py
@@ -997,13 +997,18 @@ class SidebandApp(MDApp):
                         else:
                             self.telemetry_action(self)
 
-                    if text == "o":
-                        # if self.root.ids.screen_manager.current == "telemetry_screen":
+                    if text == "u":
                         self.map_display_own_telemetry()
 
+                    if text == "o":
+                        self.objects_action()
+
                     if text == "r":
                         if self.root.ids.screen_manager.current == "conversations_screen":
-                            self.lxmf_sync_action(self)
+                            if self.include_objects:
+                                self.conversations_action(self, direction="right")
+                            else:
+                                self.lxmf_sync_action(self)
                         elif self.root.ids.screen_manager.current == "telemetry_screen":
                             self.conversations_action(self, direction="right")
                         elif self.root.ids.screen_manager.current == "object_details_screen":
@@ -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."""
         
             guide_text8 = """
-[size=18dp][b]Keyboard Shortcuts[/b][/size][size=5dp]\n \n[/size] - Ctrl+Q or Ctrl-W Shut down Sideband
- - Ctrl-D or Ctrl-S Send message
- - Ctrl-R Show Conversations
- - Ctrl-L Show Announce Stream
- - Ctrl-M Show Situation Map
- - Ctrl-T Show Telemetry Setup
- - Ctrl-N New conversation
- - Ctrl-G Show guide"""
+[size=18dp][b]Keyboard Shortcuts[/b][/size][size=5dp]\n \n[/size] - [b]Ctrl+Q[/b] or [b]Ctrl-W[/b] Shut down Sideband
+ - [b]Ctrl-R[/b] Go to Conversations
+ - [b]Ctrl-R[/b] Start LXMF sync (from Conversations screen)
+ - [b]Ctrl-N[/b] Create new conversation
+ - [b]Ctrl-[i]n[/i][/b] Go to conversation number [i]n[/i]
+ - [b]Ctrl-D[/b] or [b]Ctrl-S[/b] Send message
+ - [b]Ctrl-U[/b] Display own telemetry
+ - [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 = """
-[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.
 """
             info1 = guide_text1
-            info2 = guide_text2
-            info3 = guide_text3
-            info4 = guide_text4
-            info5 = guide_text5
-            info6 = guide_text6
-            info7 = guide_text7
-            info8 = guide_text8
+            info2 = guide_text8
+            info3 = guide_text2
+            info4 = guide_text3
+            info5 = guide_text4
+            info6 = guide_text5
+            info7 = guide_text6
+            info8 = guide_text7
             info9 = guide_text9
 
             if self.theme_cls.theme_style == "Dark":
diff --git a/sbapp/ui/conversations.py b/sbapp/ui/conversations.py
index 9c74df9..c48d5bf 100644
--- a/sbapp/ui/conversations.py
+++ b/sbapp/ui/conversations.py
@@ -176,12 +176,10 @@ class Conversations():
         remove_widgets = []
         for w in self.list.children:
             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)
                 self.added_item_dests.remove(w.sb_uid)
 
         for w in remove_widgets:
-            RNS.log("Removing "+str(w))
             self.list.remove_widget(w)
 
             
@@ -214,7 +212,6 @@ class Conversations():
                             is_object = self.app.sideband.is_object(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)
-                            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)
                             no_button = MDRectangleFlatButton(text="Cancel",font_size=dp(18))