From 5a3b9c6856ff394c0935db4ee111b2ce7e16cafd Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 31 Jan 2016 14:57:54 -0800 Subject: [PATCH] style: make staick-check happier --- frontend/device.lua | 2 +- frontend/device/input.lua | 3 --- frontend/device/kobo/device.lua | 1 - frontend/ui/uimanager.lua | 2 +- .../ui/widget/container/inputcontainer.lua | 2 -- utils/wtest.lua | 22 +++++++++++++------ 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/frontend/device.lua b/frontend/device.lua index aeacc5e8e..540ed945e 100644 --- a/frontend/device.lua +++ b/frontend/device.lua @@ -1,4 +1,4 @@ -local isAndroid, android = pcall(require, "android") +local isAndroid, _ = pcall(require, "android") local util = require("ffi/util") local function probeDevice() diff --git a/frontend/device/input.lua b/frontend/device/input.lua index 73206304f..322a2ed4c 100644 --- a/frontend/device/input.lua +++ b/frontend/device/input.lua @@ -1,10 +1,7 @@ local Event = require("ui/event") local TimeVal = require("ui/timeval") local input = require("ffi/input") -local util = require("ffi/util") -local Math = require("optmath") local DEBUG = require("dbg") -local ffi = require("ffi") local _ = require("gettext") local Key = require("device/key") local GestureDetector = require("device/gesturedetector") diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua index 675d80287..cc547fbff 100644 --- a/frontend/device/kobo/device.lua +++ b/frontend/device/kobo/device.lua @@ -1,5 +1,4 @@ local Generic = require("device/generic/device") -local lfs = require("libs/libkoreader-lfs") local Geom = require("ui/geometry") local DEBUG = require("dbg") diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua index e98aa184f..fd207dc64 100644 --- a/frontend/ui/uimanager.lua +++ b/frontend/ui/uimanager.lua @@ -85,7 +85,7 @@ end -- modal widget should be always on the top -- for refreshtype & refreshregion see description of setDirty() function UIManager:show(widget, refreshtype, refreshregion, x, y) - DEBUG("show widget", widget.id) + DEBUG("show widget", widget._name) self._running = true local window = {x = x or 0, y = y or 0, widget = widget} -- put this window on top of the toppest non-modal window diff --git a/frontend/ui/widget/container/inputcontainer.lua b/frontend/ui/widget/container/inputcontainer.lua index 0b40ad3d8..546eb92be 100644 --- a/frontend/ui/widget/container/inputcontainer.lua +++ b/frontend/ui/widget/container/inputcontainer.lua @@ -3,7 +3,6 @@ local UIManager = require("ui/uimanager") local Screen = require("device").screen local Geom = require("ui/geometry") local Event = require("ui/event") -local DEBUG = require("dbg") local _ = require("gettext") --[[ @@ -89,7 +88,6 @@ end function InputContainer:onGesture(ev) for name, gsseq in pairs(self.ges_events) do for _, gs_range in ipairs(gsseq) do - --DEBUG("gs_range", gs_range) if gs_range:match(ev) then local eventname = gsseq.event or name return self:handleEvent(Event:new(eventname, gsseq.args, ev)) diff --git a/utils/wtest.lua b/utils/wtest.lua index 859295c18..0524b29e5 100755 --- a/utils/wtest.lua +++ b/utils/wtest.lua @@ -34,10 +34,13 @@ local TouchMenu = require("ui/widget/touchmenu") local InputText = require("ui/widget/inputtext") local DocumentRegistry = require("document/documentregistry") local ReaderUI = require("apps/reader/readerui") -local Dbg = require("dbg") +local DEBUG = require("dbg") local Device = require("device") local Screen = require("device").screen local Blitbuffer = require("ffi/blitbuffer") +local InputText = require("ui/widget/inputtext") + +DEBUG:turnOn() ----------------------------------------------------- -- widget that paints the grid on the background @@ -260,9 +263,8 @@ readerwindow = CenterContainer:new{ reader = ReaderUI:new{ dialog = readerwindow, dimen = Geom:new{ w = Screen:getWidth() - 100, h = Screen:getHeight() - 100 }, - document = DocumentRegistry:openDocument("test/2col.pdf") - --document = DocumentRegistry:openDocument("test/djvu3spec.djvu") - --document = DocumentRegistry:openDocument("./README.TXT") + document = DocumentRegistry:openDocument("spec/front/unit/data/2col.pdf") + --document = DocumentRegistry:openDocument("spec/front/unit/data/djvu3spec.djvu") } readerwindow[1][1] = reader @@ -341,9 +343,14 @@ touch_menu = TouchMenu:new{ }, } -inputtext = InputText:new{ +local TestInputText = InputText:new{ width = 400, - height = 300, + enter_callback = function() print("Entered") end, + scroll = false, + input_type = "number", + parent = { + onSwitchFocus = false, + }, } ----------------------------------------------------------------------- @@ -358,6 +365,7 @@ UIManager:show(Clock:new()) --UIManager:show(readerwindow) --UIManager:show(touch_menu) --UIManager:show(keyboard) --- UIManager:show(inputtext) +UIManager:show(TestInputText) +TestInputText:onShowKeyboard() UIManager:run()