From 3934176b6c72c267e4a558099f4c9dacb8a318b4 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 13 Oct 2013 15:28:40 +0800 Subject: [PATCH] emulator has keyboard now --- frontend/ui/device.lua | 3 ++- frontend/ui/widget/menu.lua | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/ui/device.lua b/frontend/ui/device.lua index 4a43e89a4..ac4460d44 100644 --- a/frontend/ui/device.lua +++ b/frontend/ui/device.lua @@ -99,7 +99,8 @@ function Device:isKobo() end function Device:hasNoKeyboard() - return self:isTouchDevice() or (self:getModel() == "Kindle4") + local model = self:getModel() + return (model == "KindlePaperWhite") or (model == "KindleTouch") or self:isKobo() end function Device:hasKeyboard() diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua index 2d71a99b4..c0f046cba 100644 --- a/frontend/ui/widget/menu.lua +++ b/frontend/ui/widget/menu.lua @@ -123,7 +123,8 @@ function MenuItem:init() doc = "Select Menu Item", }, } - else + end + if Device:hasKeyboard() then self.active_key_events = { Select = { {"Press"}, doc = "chose selected item" }, } @@ -374,7 +375,8 @@ function Menu:init() range = self.dimen, } } - else + end + if Device:hasKeyboard() then -- set up keyboard events self.key_events.Close = { {"Back"}, doc = _("close menu") } self.key_events.NextPage = {