From c24a5a71151b7c6ecd85da8637e9b1eb599d5fbb Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Sat, 25 Jul 2020 18:52:41 -0600
Subject: [PATCH] help cleanup

---
 sys/apps/Network.lua           | 29 +++--------------------------
 sys/help/Networking.txt        |  9 +++++++++
 sys/help/Opus-Applications.txt | 31 -------------------------------
 sys/help/Opus.txt              | 12 +-----------
 sys/help/Packages.txt          | 13 +++++++++++++
 5 files changed, 26 insertions(+), 68 deletions(-)
 create mode 100644 sys/help/Networking.txt
 delete mode 100644 sys/help/Opus-Applications.txt
 create mode 100644 sys/help/Packages.txt

diff --git a/sys/apps/Network.lua b/sys/apps/Network.lua
index 1f03fe4..f5f91d3 100644
--- a/sys/apps/Network.lua
+++ b/sys/apps/Network.lua
@@ -6,7 +6,6 @@ local Util   = require('opus.util')
 
 local device     = _G.device
 local network    = _G.network
-local os         = _G.os
 local shell      = _ENV.shell
 
 UI:configure('Network', ...)
@@ -103,30 +102,6 @@ local page = UI.Page {
 			return UI.SlideOut.eventHandler(self, event)
 		end,
 	},
-	help = UI.SlideOut {
-		x = 5, ex = -5, height = 8, y = -8,
-		titleBar = UI.TitleBar {
-			title = 'Network Help',
-			event = 'slide_hide',
-		},
-		text = UI.TextArea {
-			x = 1, y = 2,
-			marginLeft = 1,
-			value = [[
-
-In order to connect to another computer:
-
-1. The target computer must have a password set (run 'password' from the shell prompt).
-
-2. From this computer, click trust and enter the password for that computer.
-
-This only needs to be done once.
-			]],
-		},
-		accelerators = {
-			q = 'slide_hide',
-		}
-	},
 	notification = UI.Notification { },
 	accelerators = {
 		t = 'telnet',
@@ -207,12 +182,14 @@ function page:eventHandler(event)
 
 		elseif event.type == 'vnc' then
 			shell.openForegroundTab('vnc.lua ' .. t.id)
+			--[[
 			os.queueEvent('overview_shortcut', {
 				title = t.label,
 				category = "VNC",
 				icon = "\010\030 \009\009\031e\\\031   \031e/\031dn\010\030 \009\009 \031e\\/\031  \031bc",
 				run = "vnc.lua " .. t.id,
 			})
+			--]]
 
 		elseif event.type == 'clear' then
 			Util.clear(network)
@@ -231,7 +208,7 @@ function page:eventHandler(event)
 	end
 
 	if event.type == 'help' then
-		self.help:show()
+		shell.switchTab(shell.openTab('Help Networking'))
 
 	elseif event.type == 'ports' then
 		self.ports.grid:update()
diff --git a/sys/help/Networking.txt b/sys/help/Networking.txt
new file mode 100644
index 0000000..25d12f5
--- /dev/null
+++ b/sys/help/Networking.txt
@@ -0,0 +1,9 @@
+Wireless Networking
+===================
+To establish one-way trust between two computers with modems, run the following in a shell prompt:
+
+On the target computer, run:
+> password
+
+On the source computer, run:
+> trust <target computer ID>
\ No newline at end of file
diff --git a/sys/help/Opus-Applications.txt b/sys/help/Opus-Applications.txt
deleted file mode 100644
index 01cfb5e..0000000
--- a/sys/help/Opus-Applications.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Opus applications are grouped into packages with a common theme.
-
-To install a package, use either the System -> Packages program or the package command line program.
-
-Shell usage:
-
-> package list
-> package install <name>
-> package update <name>
-> package updateall
-> package uninstall <name>
-
-Package definitions are located in usr/config/packages. This file can be modified to add custom packages.
-
-Current stable packages
-=======================
-
-* core
-Programming and miscellaneous applications. Also contains drivers needed for other packages.
-
-* builder
-A program for creating structures from schematic files using a turtle (requires core).
-
-* farms
-Various programs for farming resources (wood, crops, animals).
-
-* milo
-An A/E like storage implementation (requires core).
-
-* miners
-Mining programs.
diff --git a/sys/help/Opus.txt b/sys/help/Opus.txt
index e4c1fc3..c1a8b55 100644
--- a/sys/help/Opus.txt
+++ b/sys/help/Opus.txt
@@ -6,17 +6,7 @@ Shortcut Keys
  * Control-d: Show/toggle logging screen
  * Control-c: Copy (in most applications)
  * Control-shift-v: Paste from internal clipboard
- * Control-shift-doubleclick: Open in Lua the clicked UI element
-
-Wireless Networking
-===================
-To establish one-way trust between two computers with modems, run the following in a shell prompt:
-
-On the target computer, run:
-> password
-
-On the source computer, run:
-> trust <target computer ID>
+ * Control-shift-click: Open the clicked UI element in Lua
 
 Running Custom Programs
 =======================
diff --git a/sys/help/Packages.txt b/sys/help/Packages.txt
new file mode 100644
index 0000000..9c494d3
--- /dev/null
+++ b/sys/help/Packages.txt
@@ -0,0 +1,13 @@
+Opus applications are grouped into packages with a common theme.
+
+To install a package, use either the System -> Packages program or the package command line program.
+
+Shell usage:
+
+> package list
+> package install <name>
+> package update <name>
+> package updateall
+> package uninstall <name>
+
+Package definitions are located in usr/config/packages. This file can be modified to add custom packages.