Merge pull request #1471 from chrox/minibar_goto

Popup goto dialog only when holding on visible status bar and various fixes
pull/1483/head v2015.04.01-nightly
HW 9 years ago
commit 9e1178a86a

@ -10,7 +10,11 @@ env:
- EMULATE_READER=1 USE_NO_CCACHE=1 - EMULATE_READER=1 USE_NO_CCACHE=1
before_install: before_install:
- sudo apt-get update - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
- sudo apt-get install -qq g++-4.8
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
install: install:
# nasm for building libpng # nasm for building libpng

@ -8,7 +8,7 @@ KOReader
KOReader is a document viewer application, originally created for Kindle KOReader is a document viewer application, originally created for Kindle
e-ink readers. It currently runs on Kindle 5 (Touch), Kindle Paperwhite, e-ink readers. It currently runs on Kindle 5 (Touch), Kindle Paperwhite,
Kobo, PocketBook 840 and Android (2.3+) devices. Developers can also run Koreader emulator Kobo, PocketBook and Android (2.3+) devices. Developers can also run Koreader emulator
for development purpose on desktop PC with Linux or Windows operating system. for development purpose on desktop PC with Linux or Windows operating system.
Main features for users Main features for users

@ -1 +1 @@
Subproject commit fb73781726adf2e2fc39762fa1754c611f0f9d60 Subproject commit 9d9e1297339160aabc3e0d73fa131dbce7bddbae

@ -351,6 +351,7 @@ function ReaderFooter:onTapFooter(arg, ges)
end end
function ReaderFooter:onHoldFooter(arg, ges) function ReaderFooter:onHoldFooter(arg, ges)
if self.mode == 0 then return end
self.ui:handleEvent(Event:new("ShowGotoDialog")) self.ui:handleEvent(Event:new("ShowGotoDialog"))
return true return true
end end

@ -7,6 +7,7 @@ local function yes() return true end
local Device = Generic:new{ local Device = Generic:new{
model = "Android", model = "Android",
hasKeys = yes,
isAndroid = yes, isAndroid = yes,
firmware_rev = "none", firmware_rev = "none",
display_dpi = ffi.C.AConfiguration_getDensity(android.app.config), display_dpi = ffi.C.AConfiguration_getDensity(android.app.config),

@ -620,7 +620,9 @@ function KoptInterface:getNativeOCRWord(doc, pageno, rect)
kc:setZoom(30/rect.h) kc:setZoom(30/rect.h)
local page = doc._document:openPage(pageno) local page = doc._document:openPage(pageno)
page:getPagePix(kc) page:getPagePix(kc)
--kc:exportSrcPNGFile({rect}, nil, "ocr-word.png")
local word_w, word_h = kc:getPageDim() local word_w, word_h = kc:getPageDim()
--DEBUG(word_w, word_h)
local ok, word = pcall( local ok, word = pcall(
kc.getTOCRWord, kc, "src", kc.getTOCRWord, kc, "src",
0, 0, word_w, word_h, 0, 0, word_w, word_h,

Loading…
Cancel
Save