2
0
mirror of https://github.com/koreader/koreader synced 2024-11-13 19:11:25 +00:00
Commit Graph

829 Commits

Author SHA1 Message Date
Qingping Hou
c1a9a2505f Merge pull request #404 from chrox/master
fix closing dict window will bookmark current page
2013-12-19 21:55:15 -08:00
chrox
f476a638a8 fix highlight dialog triggering bookmark 2013-12-20 12:17:11 +08:00
chrox
e5bf0eb13e fix closing dict window will bookmark current page
use `self.highlight:handleEvent(Event:new("Tap"))` instead of
`self.ui:handleEvent(Event:new("Tap"))` when clearing highlighted
text since Tap event in latter situation will be captured by
the dogear widget.
2013-12-20 12:05:11 +08:00
Qingping Hou
213c121e63 Merge pull request #403 from Markismus/MultitouchKoboAura
This should fix the pinch and expand gesture on Kobo Aura
2013-12-19 18:43:29 -08:00
Qingping Hou
1d08b69055 Merge pull request #401 from chrox/master
append page number in toc entry
2013-12-19 18:43:20 -08:00
Markismus
5e7eed3a17 I was not able to generate the gestures "pinch" and "expand" on Kobo Aura.
While debugging ```GestureDetector:panState(tev)```  I saw that the TRACK ID never had -1 values .
So back to debugging ```input.lua```.

Now the Kobo Aura can pinch and expand.
2013-12-19 23:56:03 +01:00
chrox
648b4f33ec add vertical span between title and content in filemanager 2013-12-19 23:21:41 +08:00
chrox
42c5ae2ac0 add option to display file size in filemanager
file size is not shown by default
2013-12-19 23:20:16 +08:00
chrox
5b31076025 calculate widgetcontainer dimension if not given 2013-12-19 23:15:24 +08:00
chrox
2bb3c7c286 append page number in toc entry 2013-12-19 23:14:27 +08:00
Qingping Hou
3951b0ca8b Merge pull request #399 from chrox/master
customizable tap zones for page flipping and bookmarking
2013-12-17 22:54:25 -08:00
chrox
93866822d0 always show progress bar in flipping mode
tap on progress bar in flipping mode will goto corresponding page
2013-12-17 22:42:31 +08:00
chrox
da317ed14a customizable tap zones for top menu 2013-12-17 20:11:34 +08:00
chrox
f0039cbb02 customizable tap zones for page flipping and bookmarking 2013-12-17 19:53:43 +08:00
chrox
3205f228d3 partial refresh when switching time display in progress bar 2013-12-17 19:51:07 +08:00
Huang Xin
c052655989 Merge pull request #397 from Markismus/MultitouchKoboAura
Two small changes to improve use for Kobo ereaders
2013-12-16 07:21:15 -08:00
Markismus
74e03bc615 Kobo Aura Hd and Mini users get the error message:
/luajit: ./frontend/ui/gesturedetector.lua:84: attempt to concatenate field 'y' (a nil value)

Hopefully the use of the "," in the DEBUG function instead of the string concatenate operator gets rid of it.
2013-12-16 11:37:41 +01:00
chrox
5dd96b8756 tap on reader footer will toggle time display 2013-12-15 20:19:06 +08:00
chrox
90d91d567a add content range method in BottomContainer 2013-12-15 20:18:10 +08:00
chrox
912a8a496b add customizable tap zones for tap forward/backward and config 2013-12-15 17:02:52 +08:00
chrox
ea91cdb4be set title bar height to height of text widget in Menu widget
without the height of the close button widget
This will make room for one more menu item entry and fix #355 and #394.
The larger tap zone for close button widget is still there.
2013-12-15 13:51:17 +08:00
chrox
4d7d88cfbc page overlap is turned on by default
Page overlap added when turning in non-fit-to-page zoom mode
is now distinguishable from dim area overlap.
2013-12-09 15:58:25 +08:00
chrox
127e053d5b add PAN_THRESHOLD when detecting hold_pan gesture
This should fix #383.
2013-12-09 11:14:15 +08:00
Huang Xin
d4b76f89b4 Merge pull request #388 from Markismus/MultitouchKoboAura
Further improvements on Input:handlePhoenixTouchEv
2013-12-08 18:30:45 -08:00
Markismus
485ab8aa9d Signed-off-by: Markismus <zulde.zuldemans@gmail.com> 2013-12-08 14:37:03 +01:00
Qingping Hou
0ed65f9b4e Merge pull request #387 from chrox/master
fix highlight drawing in #379
2013-12-05 11:14:07 -08:00
chrox
64f77c4210 refactoring handleTouchEv 2013-12-04 23:39:18 +08:00
Markismus
37b6f5e041 Signed-off-by: Markismus <zulde.zuldemans@gmail.com> 2013-12-04 16:17:53 +01:00
Markismus
6f5c0d86cd Signed-off-by: Markismus <zulde.zuldemans@gmail.com> 2013-12-04 15:57:03 +01:00
chrox
2fd66e1fa3 typo fix 2013-12-04 22:17:05 +08:00
Markismus
acf1525630 Signed-off-by: Markismus <zulde.zuldemans@gmail.com> 2013-12-04 13:13:46 +01:00
Markismus
b26b0729b9 Multitouch for Kobo Aura
Signed-off-by: Markismus <zulde.zuldemans@gmail.com>
2013-12-04 13:02:19 +01:00
chrox
998193aa7b add detection of more 3G Paperwhite 2 models 2013-12-01 21:06:33 +08:00
chrox
e4c77c272a sort history file with modification time 2013-12-01 20:41:52 +08:00
chrox
84ad0f2307 fix null export highlight in reflowed mode 2013-11-30 21:17:13 +08:00
chrox
71cb2d3f93 fix looking up wrong word in reflowed page
that has a text layer underneath.

For multi-column page reflowing usually fits individual column to
page width and no finner word boxes are available to map reflowed
word box onto native word box. Now the relative position of a reflowed
word center is calculated as portion of the width and height of a larger
block it belongs. This relative position is also considered in
reflow-to-native position transform so that dictionary lookup now works
on multi-column pages in reflowing mode.

This should fix #376.
2013-11-30 18:18:16 +08:00
chrox
153d0866d5 remove auto "contentwidth" in landscape
This should fix #365.
2013-11-29 17:18:50 +08:00
HW
af902d1d79 fix for Kobo framebuffers: allow for rotation at framebuffer setup
the Kobo framebuffer comes up in landscape mode, that is, landscape
in the other direction as we do it when going into landscape mode.
we leave it this way, and rather allow for a rotation correction at
framebuffer setup.

this PR pulls the relevant changes from koreader-base and makes the
screen code aware of this additional rotation setting.

Kobo framebuffers should now work properly with the new framebuffer
FFI code. They can stay in 16bpp mode and don't change the current
framebuffer settings. They should thus properly interoperate with
the native framework on Kobos as well as sergeys KoboLauncher
(no garbled screen when returning)
2013-11-27 15:57:50 +01:00
chrox
326765a2d8 fix default full refresh in Kindle since the new ffi framebuffer 2013-11-27 21:38:36 +08:00
HW
962c2a15d3 Merge remote-tracking branch 'upstream/master' into native-framebuffer 2013-11-26 16:05:23 +01:00
HW
11bb9009fa replace Screen.width/Screen.height with accessor methods
Screen.width and Screen.height are now gone, use the methods
getWidth() and getHeight() to get the relevant data. They will
take blitbuffer/framebuffer rotation into account.
2013-11-26 16:04:20 +01:00
HW
9d3c27117d remove redundancy: new framebuffer supports rotation, multi-bpp
We can get rid of shadow blitbuffers. Screen.bb is now fb.bb.
All bpp conversion is now done by the blitbuffer abstraction layer.
Rotation mechanism is adapted to this.
2013-11-26 16:01:38 +01:00
chrox
0f61ddd01d revert main GUI font to better-looking DroidSans 2013-11-25 23:35:24 +08:00
chrox
88c2307c14 fix kindle paperwhite2 support
reported at http://www.mobileread.com/forums/showpost.php?p=2696481&postcount=316
tested at http://www.hi-pda.com/forum/redirect.php?goto=findpost&ptid=1078988&pid=23393929
2013-11-25 23:30:54 +08:00
NiLuJe
3754ca1ec3 Crappy rework of the model detection on Kindle.
In case it wasn't obvious, I badly suck at lua :D.
2013-11-23 00:09:37 +01:00
Giorgio Micotti
b3ac4c97cb Fix input for kobo phoenix, second iteration. 2013-11-22 21:02:30 +01:00
Giorgio Micotti
9576201da5 Tentative fix for touch coordinates on phoenix. 2013-11-19 22:44:40 +01:00
Giorgio Micotti
ffc27d4437 Fix DPI for nex Kobo Aura (phoenix). 2013-11-17 14:43:41 +01:00
ciro
cfd1f07f0e fixed issue: https://github.com/koreader/koreader/issues/354 2013-11-08 10:42:06 +08:00
chrox
5bf56cbf4c check position nullity in getTextFromBoxes 2013-10-28 21:49:54 +08:00
chrox
2f2d3553ff fix cannot highlight text with only one word in the first line 2013-10-28 21:48:17 +08:00
chrox
4b312528f7 fix lost refresh in inputdialog enter callback 2013-10-28 20:01:44 +08:00
chrox
63d574c3b5 less verbose on fallback text rendering 2013-10-25 20:10:15 +08:00
chrox
0cdc5b64f4 fix debug on/off toggle 2013-10-25 20:07:58 +08:00
chrox
974927db54 smoother relative panning in scrolled pages 2013-10-25 16:07:04 +08:00
chrox
ae2462c17e relative x and y in pan gesture are relative to first touch events 2013-10-25 16:05:20 +08:00
chrox
2590cc7ca5 highlight text from scratch instead of reusing rectmaps in reflowing mode 2013-10-25 13:22:49 +08:00
giorgio130
2cefdf7c6b Merge pull request #344 from houqp/houqp-master
call scaleByDPI from screen module fixes #343
2013-10-24 11:03:36 -07:00
Qingping Hou
d3979ff72d call scaleByDPI from screen module fixes #343 2013-10-24 13:47:22 -04:00
chrox
184a6f5d21 highlight word from scratch instead of reusing rectmaps in reflowing mode
Totally revert the OCR in reflowed page to build 545.
And this should fix #309.
2013-10-24 23:45:09 +08:00
chrox
90d55cbde4 set auto detect word gap in reflowing by default 2013-10-24 23:45:09 +08:00
Hans-Werner Hilse
526137deda add missing require of gettext 2013-10-24 15:45:02 +02:00
Hans-Werner Hilse
fd586a56e9 missing require() of infomessage in UIManager
require() must be done locally in order to not create circular dependencies
2013-10-24 14:54:55 +02:00
Hans-Werner Hilse
22e5117cce add missing require for defining DEBUG 2013-10-24 10:44:15 +02:00
chrox
f49f64bc15 add missing gettext and Menu module 2013-10-23 22:51:07 +08:00
chrox
4cfdce6105 fix several local calls of Math.round 2013-10-23 22:37:55 +08:00
HW
141d72ddbe Merge remote-tracking branch 'upstream/master' 2013-10-22 20:54:57 +02:00
HW
09cd5c4104 Make DEBUG a require()d local 2013-10-22 20:51:29 +02:00
HW
748a443cd5 Merge remote-tracking branch 'upstream/master'
resolved conflicts with refactored structure
2013-10-22 17:19:08 +02:00
HW
2154e7e852 Further refactoring
This should finish the work to make all globals to local variables.
That allows LuaJIT to properly compile things by interning the
references to the relevant parts (rather than looking up globals
all the time which stops a trace).
2013-10-22 17:11:31 +02:00
chrox
99e0da52b6 check json output before decoding
This should fix #332.
2013-10-22 22:13:47 +08:00
chrox
8b6bf2e72b export highlights only if highlighted text is not nil 2013-10-20 12:32:35 +08:00
HW
ef111b99c6 Refactored to use strictly locals 2013-10-18 22:38:07 +02:00
Giorgio Micotti
a7d545632a Nicer close button, solves #321. 2013-10-18 21:03:28 +02:00
Qingping Hou
bc91b932d1 style cleanup in document.lua 2013-10-17 17:37:53 -04:00
Qingping Hou
a59723c053 add pic document type 2013-10-17 17:35:05 -04:00
Qingping Hou
10bf048d77 move configurable to Document class
since every document type is depend on it now
2013-10-17 17:28:20 -04:00
chrox
957cfdbb1b revert JSON hack since the unusual utf8 representation is fixed 2013-10-18 00:06:34 +08:00
chrox
1ccba6ce39 use --utf8-input and --utf8-out params when calling sdcv
This will prevent string encoding conversion in Kobo in which it
has problem to doing so.
This patch should fix #252 and #272.
2013-10-18 00:02:55 +08:00
chrox
d7d2b9a20b press Enter in Goto Dialog will goto page/location directly 2013-10-17 23:56:03 +08:00
chrox
c86bb46ef7 add gotoLocation for credocument 2013-10-17 23:53:29 +08:00
chrox
506dbed865 save cre3.ini on closing each credocument
and page margin settings will be restored before rendering.
This patch should fix #299.
2013-10-16 23:21:20 +08:00
chrox
c20bc91ba3 fix JSON parser on some rare utf8 representations
This patch is provided by @hchaojie and should fix #252.
2013-10-16 21:09:39 +08:00
chrox
cd2ee14b91 various fixes on Device:hasKeyboard check 2013-10-16 20:56:18 +08:00
chrox
c829b01d67 fix onSelect revert on config and menu 2013-10-16 20:54:53 +08:00
chrox
aac1509c21 check dimension restraint on regional refresh request 2013-10-16 20:52:32 +08:00
chrox
32ffacdf77 adjust font sizes in credocument according to screen dpi
and font sizes list is moved to defaults.lua
2013-10-16 17:06:28 +08:00
chrox
3f3e434157 rescale font size when fallbacks to fallback fonts
and make FreeSerif font the default font instead of DroidSansFallback

This patch should fix #272.
2013-10-16 12:22:53 +08:00
chrox
ca37eb8889 remove the ui/image dependency 2013-10-15 23:00:52 +08:00
chrox
987b34f092 reactivate FFI blitbuffer module
This should fix #274 and #288.
2013-10-15 22:55:42 +08:00
chrox
9f42289226 use pixels from reflowed page when doing OCR in reflowing mode
I hope it will get back OCR accuracy as in build 545.
2013-10-14 23:06:05 +08:00
chrox
2cd5a083ae fix getAutoBBox failed bug
If getAutoBBox is fed with a blank page the returned bbox will be
much smaller than the native page dimensions. The problem is that
in zoom to 'content*' mode document renderer will try to render
the whole page at a zoom level that can cover the screen with the
bbox region of the page. That's if the blank page size is 3000*4000
and the returned autobbox is 300*400, the screen size is 600*800,
then the page will be rendered in 3000*(600/300)*4000*(800/400)
which is so large that the cache manager will not accept.

This patch just check if the returned autobbox is considerablely
much smaller than the native page dimensions. If so it will return
the manual bbox.

This patch should fix #293. And it's tested with the case provided
by @Markismus in #291.
2013-10-14 14:21:08 +08:00
chrox
3e94520e53 add width param in ToggleSwitch 2013-10-13 23:10:31 +08:00
chrox
7a5ce55b8d fix extra page rendering when starts up in landscape mode 2013-10-13 22:13:04 +08:00
chrox
1ee6d5a9c5 add DEBUGBT function to traceback certain location 2013-10-13 21:59:24 +08:00
chrox
f32e9e4548 change medium and large defect sizes to 3.0 and 5.0 respectively 2013-10-13 21:31:39 +08:00
chrox
ead331924f fix toggle color inconsistency 2013-10-13 16:52:32 +08:00
chrox
5cc8fc4c10 update page info layout in menu
this should fix #281
2013-10-13 16:50:28 +08:00
chrox
2b9b9bc9a5 add DSHOWHIDDENFILES in defaults.lua
this should fix #239
2013-10-13 15:50:44 +08:00
chrox
39da1251ec free blitbuffer as soon as tile is kicked out from cache
other than waiting for the lazy garbage collector of lua
2013-10-13 15:30:48 +08:00