From 232d8cd74a44583a8af89c34a59ec632d5818d49 Mon Sep 17 00:00:00 2001
From: Paulo Matias <paulo.matias@usp.br>
Date: Sat, 10 Aug 2013 21:00:13 -0300
Subject: [PATCH] Fix multiple ReaderFrontLight instances, i18n issues, and
 refactor event handling to follow codebase patterns

---
 frontend/ui/inputevent.lua              |  7 ------
 frontend/ui/reader/readerfrontlight.lua | 33 ++++++++++---------------
 frontend/ui/reader/readermenu.lua       |  8 ------
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/frontend/ui/inputevent.lua b/frontend/ui/inputevent.lua
index e6c384f9e..085d71836 100644
--- a/frontend/ui/inputevent.lua
+++ b/frontend/ui/inputevent.lua
@@ -3,7 +3,6 @@ require "ui/device"
 require "ui/time"
 require "ui/gesturedetector"
 require "ui/geometry"
-require "ui/reader/readerfrontlight"
 
 -- constants from <linux/input.h>
 EV_SYN = 0
@@ -425,12 +424,6 @@ function Input:handleKeyBoardEv(ev)
 		return keycode
 	end
 
-	if keycode == "Light" then
-		if ev.value == EVENT_VALUE_KEY_RELEASE then
-			ReaderFrontLight:toggle()
-		end
-	end
-
 	-- handle modifier keys
 	if self.modifiers[keycode] ~= nil then
 		if ev.value == EVENT_VALUE_KEY_PRESS then
diff --git a/frontend/ui/reader/readerfrontlight.lua b/frontend/ui/reader/readerfrontlight.lua
index 3ab2d2555..2b3b4f82d 100644
--- a/frontend/ui/reader/readerfrontlight.lua
+++ b/frontend/ui/reader/readerfrontlight.lua
@@ -3,14 +3,15 @@ require "ui/widget/inputdialog"
 require "ui/device"
 
 ReaderFrontLight = InputContainer:new{
-	fldial_menu_title = ("Frontlight Settings"),
-	fl_dialog_title = ("Frontlight Level"),
+	fldial_menu_title = _("Frontlight settings"),
+	fl_dialog_title = _("Frontlight Level"),
 	steps = {0,1,2,3,4,5,6,7,8,9,10},
 	intensity = nil,
 	fl = nil,
 }
 
 function ReaderFrontLight:init()
+	if not Device:hasFrontlight() then return end
 	local dev_mod = Device:getModel()
 	if dev_mod == "KindlePaperWhite" then
 		require "liblipclua"
@@ -31,15 +32,16 @@ function ReaderFrontLight:init()
 				}
 			},
 		}
-	end
-	if Device:isKobo() then
+	elseif Device:isKobo() then
 		self.fl = kobolight.open()
 		self.intensity = G_reader_settings:readSetting("frontlight_intensity")
 		if not self.intensity then
 			self.intensity = 20
 		end
-		self:setIntensity(self.intensity, "Set intensity")
+		self:setIntensity(self.intensity, _("Set intensity "))
+		self.key_events.Toggle = { {"Light"}, doc = _("Toggle light") }
 	end
+	self.ui.menu:registerToMainMenu(self)
 end
 
 function ReaderFrontLight:onAdjust(arg, ges)
@@ -70,13 +72,9 @@ function ReaderFrontLight:setIntensity(intensity, msg)
 			text = msg..intensity,
 			timeout = 1
 		})
-	end
-	if Device:isKobo() then
+	elseif Device:isKobo() then
 		intensity = intensity < 1 and 1 or intensity
 		intensity = intensity > 100 and 100 or intensity
-		if self.fl == nil then
-			ReaderFrontLight:init()
-		end
 		if self.fl ~= nil then
 			self.fl:setBrightness(intensity)
 			self.intensity = intensity
@@ -85,14 +83,9 @@ function ReaderFrontLight:setIntensity(intensity, msg)
 	return true
 end
 
-function ReaderFrontLight:toggle()
-	if Device:isKobo() then
-		if self.fl == nil then
-			ReaderFrontLight:init()
-		end
-		if self.fl ~= nil then
-			self.fl:toggle()
-		end
+function ReaderFrontLight:onToggle()
+	if Device:isKobo() and self.fl ~= nil then
+		self.fl:toggle()
 	end
 	return true
 end
@@ -111,7 +104,7 @@ function ReaderFrontLight:onShowFlDialog()
 	DEBUG("show fldial dialog")
 	self.fl_dialog = InputDialog:new{
 		title = self.fl_dialog_title,
-		input_hint = "(1 - 100)",
+		input_hint = Device:isKobo() and "(1 - 100)" or "(0 - 24)",
 		buttons = {
 			{
 				{
@@ -149,7 +142,7 @@ end
 function ReaderFrontLight:fldialIntensity()
 	local number = tonumber(self.fl_dialog:getInputText())
 	if number then
-		self:setIntensity(number, "Set intensity")
+		self:setIntensity(number, _("Set intensity "))
 	end
 	return true
 end
diff --git a/frontend/ui/reader/readermenu.lua b/frontend/ui/reader/readermenu.lua
index 35055b663..157c17f3e 100644
--- a/frontend/ui/reader/readermenu.lua
+++ b/frontend/ui/reader/readermenu.lua
@@ -56,14 +56,6 @@ function ReaderMenu:setUpdateItemTable()
 	for _, widget in pairs(self.registered_widgets) do
 		widget:addToMainMenu(self.tab_item_table)
 	end
-	if Device:hasFrontlight() then
-		table.insert(self.tab_item_table.main, {
-			text = _("Frontlight settings"),
-			callback = function()
-				ReaderFrontLight:onShowFlDialog()
-			end
-		})
-	end
 	table.insert(self.tab_item_table.main, {
 		text = _("Help"),
 		callback = function()