renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #281 from tigran123/master

Browse Source 
Minor changes to djvu and filesearcher.
This commit is contained in:
{Qingping,Dave} Hou
2012-09-15 13:07:01 -07:00
parent a99f429afc dac88587bf
commit 31fd466425
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
djvu.c
View File

@@ -79,9 +79,9 @@ static int openDocument(lua_State *L) {
luaL_getmetatable(L, "djvudocument");
lua_setmetatable(L, -2);
doc->context = ddjvu_context_create("DJVUReader");
doc->context = ddjvu_context_create("kindlepdfviewer");
if (! doc->context) {
return luaL_error(L, "cannot create context.");
return luaL_error(L, "cannot create context");
}
printf("## cache_size = %d\n", cache_size);
@@ -91,12 +91,12 @@ static int openDocument(lua_State *L) {
while (! ddjvu_document_decoding_done(doc->doc_ref))
handle(L, doc->context, True);
if (! doc->doc_ref) {
return luaL_error(L, "cannot open DJVU file <%s>", filename);
return luaL_error(L, "cannot open DjVu file <%s>", filename);
}
doc->pixelformat = ddjvu_format_create(DDJVU_FORMAT_GREY8, 0, NULL);
if (! doc->pixelformat) {
return luaL_error(L, "cannot create DJVU pixelformat for <%s>", filename);
return luaL_error(L, "cannot create DjVu pixelformat for <%s>", filename);
}
ddjvu_format_set_row_order(doc->pixelformat, 1);
ddjvu_format_set_y_direction(doc->pixelformat, 1);

2
djvureader.lua
View File

@@ -47,9 +47,7 @@ function DJVUReader:select_render_mode()
local mode = mode_menu:choose(0, fb.bb:getHeight())
if mode then
self.render_mode = mode - 1
Debug("select_render_mode(), render_mode=", self.render_mode)
self:clearCache()
self.doc:cleanCache()
end
self:redrawCurrentPage()
end

6
filesearcher.lua
View File

@@ -64,7 +64,7 @@ function FileSearcher:setSearchResult(keywords)
self.result = self.files
else
for __,f in pairs(self.files) do
if string.find(string.lower(f.name), keywords) then
if string.find(string.lower(f.name), string.lower(keywords)) then
table.insert(self.result, f)
end
end
@@ -219,7 +219,7 @@ function FileSearcher:addAllCommands()
function(self)
file_entry = self.result[self.perpage*(self.page-1)+self.current]
local file_to_del = file_entry.dir .. "/" .. file_entry.name
InfoMessage:show("Press \'Y\' to confirm deleting... ",0)
InfoMessage:show("Press \'Y\' to confirm... ",0)
while true do
ev = input.saveWaitForEvent()
ev.code = adjustKeyEvents(ev)
@@ -275,7 +275,7 @@ function FileSearcher:choose(keywords)
fb.bb:paintRect(0, 0, G_width, G_height, 0)
-- draw menu title
DrawTitle("Search Results for \'"..string.upper(self.keywords).."\'",self.margin_H,0,self.title_H,3,tface)
DrawTitle("Search Results for \'"..self.keywords.."\'".." ("..tostring(self.items).." hits)",self.margin_H,0,self.title_H,3,tface)
-- draw results
local c
if self.items == 0 then -- nothing found

2
unireader.lua
View File

@@ -1483,6 +1483,8 @@ end
-- change current page and cache next page after rendering
function UniReader:goto(no, is_ignore_jump)
if no < 1 or no > self.doc:getPages() then
-- may be reached by following TOC entry pointing to external file.
self:redrawCurrentPage()
return
end