Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #380 from tigran123/master

Browse Source 
TTS in EMU and PDF/DjVu info cleanup.
This commit is contained in:
{Qingping,Dave} Hou 2012-10-06 07:47:17 -07:00
commit d916c55a87
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -26,7 +26,7 @@ Follow these steps:
* install popen_noshell sources into subfolder "popen-noshell"
* automatically fetch thirdparty sources with Makefile:
* make sure you have wget, unzip, git and svn installed
* make sure you have patch, wget, unzip, git and svn installed
* run `make fetchthirdparty`.
* adapt Makefile to your needs

6
dialog.lua
View File

@ -263,7 +263,11 @@ function InfoMessage:getVolumeLevels()
end ]]
function say(text)
os.execute("say \""..text.."\"")
if util.isEmulated() == 1 then
os.execute("espeak \""..text.."\"")
else
os.execute("say \""..text.."\"")
end
end
-- The read/write global InfoMessage settings. When properly tested, the

28
djvureader.lua
View File

@ -70,6 +70,24 @@ function DJVUReader:invertTextYAxel(pageno, text_table)
return text_table
end
function render_mode_string(rm)
if (rm == 0) then
return "COLOUR"
elseif (rm == 1) then
return "B&W"
elseif (rm == 2) then
return "COLOUR ONLY"
elseif (rm == 3) then
return "MASK ONLY"
elseif (rm == 4) then
return "COLOUR BG"
elseif (rm == 5) then
return "COLOUR FG"
else
return "UNKNOWN"
end
end
function DJVUReader:_drawReadingInfo()
local width, height = G_width, G_height
local numpages = self.doc:getPages()
@ -82,13 +100,15 @@ function DJVUReader:_drawReadingInfo()
renderUtf8Text(fb.bb, 10, 15+6, face,
"M: "..
math.ceil( self.cache_current_memsize / 1024 ).."/"..math.ceil( self.cache_max_memsize / 1024 ).."k, "..
math.ceil( self.doc:getCacheSize() / 1024 ).."/"..math.ceil( self.cache_document_size / 1024 ).."k, "..
os.date("%a %d %b %Y %T")..
" ["..BatteryLevel().."]", true)
math.ceil( self.doc:getCacheSize() / 1024 ).."/"..math.ceil( self.cache_document_size / 1024 ).."k", true)
local txt = os.date("%a %d %b %Y %T").." ["..BatteryLevel().."]"
local w = sizeUtf8Text(0, G_width, face, txt, true).x
renderUtf8Text(fb.bb, width - w - 10, 15+6, face, txt, true)
renderUtf8Text(fb.bb, 10, 15+6+22, face,
"Gm:"..string.format("%.1f",self.globalgamma).." ["..tostring(page_gamma).."], "..
tostring(page_width).."x"..tostring(page_height)..", "..
tostring(page_dpi).."dpi, "..page_type, true)
tostring(page_dpi).."dpi, "..page_type..", "..
render_mode_string(self.render_mode), true)
-- display reading progress on bottom of page
local ypos = height - 50

6
unireader.lua
View File

@ -2122,8 +2122,10 @@ function UniReader:_drawReadingInfo()
renderUtf8Text(fb.bb, 10, 15+6, face,
"M: "..
math.ceil( self.cache_current_memsize / 1024 ).."/"..math.ceil( self.cache_max_memsize / 1024 )..
" "..math.ceil( self.doc:getCacheSize() / 1024 ).."/"..math.ceil( self.cache_document_size / 1024 ).."k "..os.date("%a %d %b %Y %T").." ["..BatteryLevel().."]",
true)
" "..math.ceil( self.doc:getCacheSize() / 1024 ).."/"..math.ceil( self.cache_document_size / 1024 ).."k", true)
local txt = os.date("%a %d %b %Y %T").." ["..BatteryLevel().."]"
local w = sizeUtf8Text(0, G_width, face, txt, true).x
renderUtf8Text(fb.bb, width - w - 10, 15+6, face, txt, true)
-- display reading progress on bottom of page
local ypos = height - 50