cleanup

sys/apps/system/kiosk.lua

@@ -4,7 +4,7 @@ local colors     = _G.colors
 local peripheral = _G.peripheral
 local settings   = _G.settings
 
-local tab = UI.Tab {
+return peripheral.find('monitor') and UI.Tab {
 	tabTitle = 'Kiosk',
 	description = 'Kiosk options',
 	form = UI.Form {
@@ -29,35 +29,29 @@ local tab = UI.Tab {
 		backgroundColor = colors.black,
 		value = 'Settings apply to kiosk mode selected during startup'
 	},
-}
+	enable = function(self)
+		local choices = { }
 
-function tab:enable()
-	local choices = {	}
+		peripheral.find('monitor', function(side)
+			table.insert(choices, { name = side, value = side })
+		end)
 
-	peripheral.find('monitor', function(side)
-		table.insert(choices, { name = side, value = side })
-	end)
+		self.form.monitor.choices = choices
+		self.form.monitor.value = settings.get('kiosk.monitor')
 
-	self.form.monitor.choices = choices
-	self.form.monitor.value = settings.get('kiosk.monitor')
+		self.form.textScale.value = settings.get('kiosk.textscale')
 
-	self.form.textScale.value = settings.get('kiosk.textscale')
-
-	UI.Tab.enable(self)
-end
-
-function tab:eventHandler(event)
-	if event.type == 'choice_change' then
-		if self.form.monitor.value then
-			settings.set('kiosk.monitor', self.form.monitor.value)
+		UI.Tab.enable(self)
+	end,
+	eventHandler = function(self, event)
+		if event.type == 'choice_change' then
+			if self.form.monitor.value then
+				settings.set('kiosk.monitor', self.form.monitor.value)
+			end
+			if self.form.textScale.value then
+				settings.set('kiosk.textscale', self.form.textScale.value)
+			end
+			settings.save('.settings')
 		end
-		if self.form.textScale.value then
-			settings.set('kiosk.textscale', self.form.textScale.value)
-		end
-		settings.save('.settings')
 	end
-end
-
-if peripheral.find('monitor') then
-	return tab
-end
+}

sys/apps/system/label.lua

@@ -4,7 +4,7 @@ local Util = require('opus.util')
 local fs   = _G.fs
 local os   = _G.os
 
-local labelTab = UI.Tab {
+return UI.Tab {
 	tabTitle = 'Label',
 	description = 'Set the computer label',
 	labelText = UI.Text {
@@ -40,14 +40,11 @@ local labelTab = UI.Tab {
 			{ key = 'value', textColor = colors.yellow },
 		},
 	},
+	eventHandler = function(self, event)
+		if event.type == 'update_label' and self.label.value then
+			os.setComputerLabel(self.label.value)
+			self:emit({ type = 'success_message', message = 'Label updated' })
+			return true
+		end
+	end,
 }
-
-function labelTab:eventHandler(event)
-	if event.type == 'update_label' and self.label.value then
-		os.setComputerLabel(self.label.value)
-		self:emit({ type = 'success_message', message = 'Label updated' })
-		return true
-	end
-end
-
-return labelTab

sys/apps/system/network.lua

@@ -5,7 +5,7 @@ local UI     = require('opus.ui')
 local colors = _G.colors
 local device = _G.device
 
-local tab = UI.Tab {
+return UI.Tab {
 	tabTitle = 'Network',
 	description = 'Networking options',
 	info = UI.TextArea {
@@ -27,39 +27,35 @@ Reboot to take effect.]], Ansi.yellow, Ansi.reset)
 		x = 10, ex = -3, y = 3,
 		nochoice = 'auto',
 	},
-}
+	enable = function(self)
+		local width = 7
+		local choices = {
+			{ name = 'auto',    value = 'auto' },
+			{ name = 'disable', value = 'none' },
+		}
 
-function tab:enable()
-	local width = 7
-	local choices = {
-		{ name = 'auto',    value = 'auto' },
-		{ name = 'disable', value = 'none' },
-	}
+		for k,v in pairs(device) do
+			if v.isWireless and v.isWireless() and k ~= 'wireless_modem' then
+				table.insert(choices, { name = k, value = v.name })
+				width = math.max(width, #k)
+			end
+		end
 
-	for k,v in pairs(device) do
-		if v.isWireless and v.isWireless() and k ~= 'wireless_modem' then
-			table.insert(choices, { name = k, value = v.name })
-			width = math.max(width, #k)
+		self.modem.choices = choices
+		--self.modem.width = width + 4
+
+		local config = Config.load('os')
+		self.modem.value = config.wirelessModem or 'auto'
+
+		UI.Tab.enable(self)
+	end,
+	eventHandler = function(self, event)
+		if event.type == 'choice_change' then
+			local config = Config.load('os')
+			config.wirelessModem = self.modem.value
+			Config.update('os', config)
+			self:emit({ type = 'success_message', message = 'reboot to take effect' })
+			return true
 		end
 	end
-
-	self.modem.choices = choices
-	--self.modem.width = width + 4
-
-	local config = Config.load('os')
-	self.modem.value = config.wirelessModem or 'auto'
-
-	UI.Tab.enable(self)
-end
-
-function tab:eventHandler(event)
-	if event.type == 'choice_change' then
-		local config = Config.load('os')
-		config.wirelessModem = self.modem.value
-		Config.update('os', config)
-		self:emit({ type = 'success_message', message = 'reboot to take effect' })
-		return true
-	end
-end
-
-return tab
+}

sys/apps/system/password.lua

@@ -4,7 +4,7 @@ local UI       = require('opus.ui')
 
 local colors   = _G.colors
 
-local passwordTab = UI.Tab {
+return UI.Tab {
 	tabTitle = 'Password',
 	description = 'Wireless network password',
 	[1] = UI.Window {
@@ -30,19 +30,17 @@ local passwordTab = UI.Tab {
 		textColor = colors.yellow,
 		inactive = true,
 		value = 'Add a password to enable other computers to connect to this one.',
-	}
-}
-function passwordTab:eventHandler(event)
-	if event.type == 'update_password' then
-		if not self.newPass.value or #self.newPass.value == 0 then
-			self:emit({ type = 'error_message', message = 'Invalid password' })
+	},
+	eventHandler = function(self, event)
+		if event.type == 'update_password' then
+			if not self.newPass.value or #self.newPass.value == 0 then
+				self:emit({ type = 'error_message', message = 'Invalid password' })
 
-		else
-			Security.updatePassword(SHA.compute(self.newPass.value))
-			self:emit({ type = 'success_message', message = 'Password updated' })
+			else
+				Security.updatePassword(SHA.compute(self.newPass.value))
+				self:emit({ type = 'success_message', message = 'Password updated' })
+			end
+			return true
 		end
-		return true
 	end
-end
-
-return passwordTab
+}

sys/apps/system/shell.lua

@@ -38,7 +38,7 @@ if not _colors.backgroundColor then
 	_colors.fileColor = colors.white
 end
 
-local tab = UI.Tab {
+return UI.Tab {
 	tabTitle = 'Shell',
 	description = 'Shell options',
 	grid1 = UI.ScrollingGrid {
@@ -54,6 +54,13 @@ local tab = UI.Tab {
 		columns = { { key = 'name' } },
 		values = allColors,
 		sortColumn = 'name',
+		getRowTextColor = function(self, row)
+			local selected = self.parent.grid1:getSelected()
+			if _colors[selected.name] == row.value then
+				return colors.yellow
+			end
+			return UI.Grid.getRowTextColor(self, row)
+		end
 	},
 	directory = UI.Checkbox {
 		x = 2, y = -2,
@@ -73,68 +80,56 @@ local tab = UI.Tab {
 	},
 	display = UI.Window {
 		x = 2, ex = -2, y = -8, height = 5,
+		draw = function(self)
+			self:clear(_colors.backgroundColor)
+			local offset = 0
+			if config.displayDirectory then
+				self:write(1, 1,
+					'==' .. os.getComputerLabel() .. ':/dir/etc',
+					_colors.directoryBackgroundColor, _colors.directoryTextColor)
+				offset = 1
+			end
+
+			self:write(1, 1 + offset, '$ ',
+				_colors.promptBackgroundColor, _colors.promptTextColor)
+
+			self:write(3, 1 + offset, 'ls /',
+				_colors.backgroundColor, _colors.commandTextColor)
+
+			self:write(1, 2 + offset, 'sys    usr',
+				_colors.backgroundColor, _colors.directoryColor)
+
+			self:write(1, 3 + offset, 'startup',
+				_colors.backgroundColor, _colors.fileColor)
+		end,
 	},
+	eventHandler = function(self, event)
+		if event.type =='checkbox_change' then
+			config.displayDirectory = not not event.checked
+			self.display:draw()
+
+		elseif event.type == 'grid_focus_row' and event.element == self.grid1 then
+			self.grid2:draw()
+
+		elseif event.type == 'grid_select' and event.element == self.grid2 then
+			_colors[tab.grid1:getSelected().name] = event.selected.value
+			self.display:draw()
+			self.grid2:draw()
+
+		elseif event.type == 'reset' then
+			config.color = defaults
+			config.displayDirectory = true
+			self.directory.value = true
+			_colors = Util.shallowCopy(defaults)
+
+			Config.update('shellprompt', config)
+			self:draw()
+
+		elseif event.type == 'update' then
+			config.color = _colors
+			Config.update('shellprompt', config)
+
+		end
+		return UI.Tab.eventHandler(self, event)
+	end
 }
-
-function tab.grid2:getRowTextColor(row)
-	local selected = tab.grid1:getSelected()
-	if _colors[selected.name] == row.value then
-		return colors.yellow
-	end
-	return UI.Grid.getRowTextColor(self, row)
-end
-
-function tab.display:draw()
-	self:clear(_colors.backgroundColor)
-	local offset = 0
-	if config.displayDirectory then
-		self:write(1, 1,
-			'==' .. os.getComputerLabel() .. ':/dir/etc',
-			_colors.directoryBackgroundColor, _colors.directoryTextColor)
-		offset = 1
-	end
-
-	self:write(1, 1 + offset, '$ ',
-		_colors.promptBackgroundColor, _colors.promptTextColor)
-
-	self:write(3, 1 + offset, 'ls /',
-		_colors.backgroundColor, _colors.commandTextColor)
-
-	self:write(1, 2 + offset, 'sys    usr',
-		_colors.backgroundColor, _colors.directoryColor)
-
-	self:write(1, 3 + offset, 'startup',
-		_colors.backgroundColor, _colors.fileColor)
-end
-
-function tab:eventHandler(event)
-	if event.type =='checkbox_change' then
-		config.displayDirectory = not not event.checked
-		self.display:draw()
-
-	elseif event.type == 'grid_focus_row' and event.element == self.grid1 then
-		self.grid2:draw()
-
-	elseif event.type == 'grid_select' and event.element == self.grid2 then
-		_colors[tab.grid1:getSelected().name] = event.selected.value
-		self.display:draw()
-		self.grid2:draw()
-
-	elseif event.type == 'reset' then
-		config.color = defaults
-		config.displayDirectory = true
-		self.directory.value = true
-		_colors = Util.shallowCopy(defaults)
-
-		Config.update('shellprompt', config)
-		self:draw()
-
-	elseif event.type == 'update' then
-		config.color = _colors
-		Config.update('shellprompt', config)
-
-	end
-	return UI.Tab.eventHandler(self, event)
-end
-
-return tab