Merge branch 'master' of github.com:hwhw/kindlepdfviewer

Conflicts:
	crereader.lua
This commit is contained in:
HW
2012-04-09 12:36:28 +02:00
10 changed files with 145 additions and 148 deletions

View File

@@ -110,7 +110,7 @@ if optarg["G"] ~= nil then
end
fb = einkfb.open("/dev/fb0")
width, height = fb:getSize()
G_width, G_height = fb:getSize()
-- read current rotation mode
Screen:updateRotationMode()
Screen.native_rotation_mode = Screen.cur_rotation_mode
@@ -135,7 +135,7 @@ if ARGV[optind] and lfs.attributes(ARGV[optind], "mode") == "directory" then
local running = true
FileChooser:setPath(ARGV[optind])
while running do
local file, callback = FileChooser:choose(0,height)
local file, callback = FileChooser:choose(0, G_height)
if callback then
callback()
else