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
1,110 Commits 2 Branches 264 Tags
69e43d1c4de3139856db112a2407f331d5ce6bbf
Commit Graph

1110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
{Qingping,Dave} Hou
69e43d1c4d Merge pull request #343 from dpavlin/preCache 
don't preCache in two column mode
 2012-09-30 13:26:42 -07:00
{Qingping,Dave} Hou
fcecd1425a Merge pull request #344 from tigran123/master 
Restrict the values of rcountmax to the range 0 to 10.
 2012-09-30 13:26:03 -07:00
Tigran Aivazian
72f669ff3c Don't allow floating point values for rcountmax 
This is a better version of the previous commit, which:
a) makes the code more readable
b) disallows rcountmax values like "6.05", i.e. restricts to integers
only.
 2012-09-30 18:28:10 +01:00
Tigran Aivazian
79c1dd44ca Restrict the values of rcountmax to the range 0-10 
Currently the user can enter any value like -10 and it is accepted and
saved in the settings file(s).
 2012-09-30 16:06:55 +01:00
Dobrica Pavlinusic
4d187aad4e don't preCache in two column mode 
This also cleanups code to make it easier to follow chaning logic
a bit to generate useful Debug messages
 2012-09-30 16:18:16 +02:00
Tigran Aivazian
72b064fa9a Merge remote-tracking branch 'upstream/master' 2012-09-30 10:23:39 +01:00
{Qingping,Dave} Hou
a8197950d0 Merge pull request #342 from dpavlin/ZOOM_FIT_TO_CONTENT_WIDTH_PAN 
ZOOM_FIT_TO_CONTENT_WIDTH_PAN pan centers page
 2012-09-29 15:51:22 -07:00
Dobrica Pavlinusic
12e9930975 ZOOM_FIT_TO_CONTENT_WIDTH_PAN pan centers page 
When we start panning up in fit to width mode, we shouldn't
center page vertically on screen.
 2012-09-30 00:48:06 +02:00
Tigran Aivazian
051926637b Merge remote-tracking branch 'upstream/master' 2012-09-29 20:49:28 +01:00
Tigran Aivazian
b4c0162a40 Merge remote-tracking branch 'upstream/master' 2012-09-29 20:49:20 +01:00
{Qingping,Dave} Hou
c3b0c343c9 Merge pull request #340 from tigran123/master 
Two fixes from NuPogodi
 2012-09-29 12:42:41 -07:00
Tigran Aivazian
1a3371c5bf Two fixes from NuPogodi 
1. ATM, the footers in selectmenu.lua & helppage.lua are left-adjusted,
these also contain the prompt for users how to call help
(selectmenu.lua) and how to go back (helppage.lua). By minor correction
to function DrawFooter() in filechooser.lua, one may readily make the
rest footers to look in a similar way.
2. When writing the code of inputbox.lua, I (NuPogodi) left the wrong
command to delete the 1st entry in the math function list
(called in calculator mode by pressing Alt-M).
 2012-09-29 19:03:29 +01:00
Dobrica Pavlinušić
00bdcd7f14 Merge pull request #339 from tigran123/master 
Typo: --disable-largefiles -> --disable-largefile
Optimize compilation of cre.cpp
Comment out debug printf() in pdf.c
 2012-09-29 10:17:22 -07:00
Tigran Aivazian
5959c56937 Remove "-d" switch from reader.lua invocation. 2012-09-29 12:12:52 +01:00
Tigran Aivazian
24e9d77a37 Comment out debug printf() in pdf.c 
The printf() about the number of links on a page is very useful, but
only for debugging. As other instances of debugging printf() in djvu.c
and pdf.c are commented out, it seemed consistent to do the same with
this one.
 2012-09-29 10:07:04 +01:00
Tigran Aivazian
db077b2f34 Optimize compilation of cre.cpp 
1. Remove unused "-lsdtc++" from the compilation stage as no linking is
done then.
2. Add our standard CFLAGS to the compilation of cre.cpp which brings in
-O3 -march=armv6 which enables optimizations.
It seemed strange that we compile a cpp file with gcc (as opposed to
g++), but I left it as is for now.
 2012-09-29 10:02:55 +01:00
Tigran Aivazian
f77a201e0b Typo: --disable-largefiles -> --disable-largefile 
As a result of a simple typo we were continuing to include LFS
support unnecessarily...
 2012-09-28 23:23:49 +01:00
{Qingping,Dave} Hou
a416e35555 Merge pull request #337 from tigran123/master 
The fix for the issue #336
 2012-09-28 13:55:06 -07:00
Tigran Aivazian
93e946b0a4 Undoing previous commit to crereader.lua by NuPogodi 
The subject says it all (undoing accidental commit by a fellow
collaborator).
 2012-09-28 17:52:05 +01:00
Dobrica Pavlinušić
a6a4380d41 Merge pull request #335 from tigran123/master 
Fix from NuPogodi: initialize scfont face properly.
 2012-09-28 05:06:41 -07:00
NuPogodi
f872473604 Replace outdated messages by InfoMessage:inform() 2012-09-28 15:00:40 +03:00
Tigran Aivazian
f3b52f269c Tidy up "git status" output a bit. 
Added settings.reader.lua, cr3cache, history, crash.log, .vimrc, data,
fonts to .gitignore.
 2012-09-28 12:49:36 +01:00
Tigran Aivazian
90971a7bf7 Fix from NuPogodi --- initialize scfont face properly. 
This fixes the bug of non-persistency of user's setting of scfont.
 2012-09-28 12:09:02 +01:00
{Qingping,Dave} Hou
33bb760576 Merge pull request #332 from tigran123/master 
Jump history in crereader loses the last position.
 2012-09-27 13:35:03 -07:00
Tigran Aivazian
496fcc089f Merge remote-tracking branch 'upstream/master' 
Conflicts:
	unireader.lua
 2012-09-27 21:20:32 +01:00
Tigran Aivazian
58d19ea7fd Merge pull request #327 from dpavlin/two-column-recalculate-pan 
recalculate pan offsets on page change #275
 2012-09-27 13:15:45 -07:00
Dobrica Pavlinusic
7b983ee7e6 fix fiveway pan to right-bottom of previous page 2012-09-27 21:29:25 +02:00
Dobrica Pavlinusic
01a57b2fb9 recalculate pan offsets on page change 
Store last globalzoom_mode in self.pan_by_page so we can restore it
to force offsets recalculation on page change

This wasn't quite enough to trigger correct re-panning for page
changes when using fiveway to move in two-column mode, issue #275

I considered adding callback to goto method and than transfering
it through function calls, but this approach (allthough very
questionable) seemed to provide simplier code.
 2012-09-27 19:21:51 +02:00
Tigran Aivazian
850a777760 On pressing Back crereader loses last position 
This fix makes the behaviour of Back command handler in crereader
identical with that in unireader, i.e. the last position is saved in
Jump History when pressing Back, so you can return to it by pressing
Shift-Back enough times.
Also, with this change we would need to handle the need for redrawing
the current page because the :addJump() method can force the call to
fillToc() (if TOC is not already present) and this will display
"Retrieving TOC..." message which will need clearing away.
 2012-09-27 13:10:28 +01:00
Tigran Aivazian
68c95e4bb2 Merge remote-tracking branch 'dpavlin/two-column-recalculate-pan' into dpavlin-twocolumn 2012-09-27 11:41:21 +01:00
{Qingping,Dave} Hou
cc1ab45b1c Merge pull request #329 from dpavlin/fit-content-pan 
remember last zoom mode when panning #236
 2012-09-26 21:40:23 -07:00
{Qingping,Dave} Hou
8588b08761 Merge pull request #326 from dpavlin/invertRect-negative 
invertRect should handle negative x or y values
 2012-09-26 21:32:38 -07:00
Dobrica Pavlinušić
d4ee7f2c53 Merge pull request #328 from tigran123/master 
Mixed up unireader.toc with self.toc in the command handler.
 2012-09-26 15:44:34 -07:00
Dobrica Pavlinusic
7ba8d6f877 remember last zoom mode when panning #236 
This tries to address issue #236 so that previous and next keys don't
change meaning when user go into panning mode by pressing fiveway.
 2012-09-27 00:37:32 +02:00
Tigran Aivazian
a7b22ba0d4 Mixed up unireader.toc with self.toc, sorry. 2012-09-26 19:56:07 +01:00
Dobrica Pavlinusic
fe2517ecd2 recalculate pan offsets on page change 
Store last globalzoom_mode in self.pan_by_page so we can restore it
to force offsets recalculation on page change

This wasn't quite enough to trigger correct re-panning for page
changes when using fiveway to move in two-column mode, issue #275

I considered adding callback to goto method and than transfering
it through function calls, but this approach (allthough very
questionable) seemed to provide simplier code.
 2012-09-26 20:24:23 +02:00
Dobrica Pavlinusic
c8b3a0d486 invertRect should handle negative x or y values 
two-column mode combined with showing links in pdf files triggers this bug
 2012-09-26 19:40:18 +02:00
Dobrica Pavlinušić
44bb4d18f2 Merge pull request #325 from tigran123/master 
Various fixes.
 2012-09-26 08:25:49 -07:00
Tigran Aivazian
5d82ffe984 Redraw current page if necessary on pressing Back 
For PDF and DjVu files (but not for crereader) the command handler for
"Back" key can call addJump() in order to avoid losing the top of the
jump history on return. This (addJump()) can cause the TOC to be
retrieved and the message "Retrieving TOC..." to be displayed.
If this happens then we need to redraw the current page after displaying
our own "Already first jump!" message.
 2012-09-26 16:05:07 +01:00
Tigran Aivazian
0987c2826e Don't crash on pressing Del in History 
After deleting all the entries from History we should guard against
pressing Del to try to delete a non-existent entry.
 2012-09-26 15:58:51 +01:00
Tigran Aivazian
819efb55aa Tidy up Screen:fb2bmp() function 
1. Remove unused assert() around io.open of the input device. The failure
to open input device is already guarded by the "if inputf" code.
2. Remove unneeded assert() around io.open of the output device. This is
unneeded because we should not crash the whole application just because
we cannot write screen dump (e.g. because filesystem is full, etc) ---
rather we should exit gracefully.
 2012-09-26 14:08:33 +01:00
Tigran Aivazian
6710aa132f Merge pull request #318 from tigran123/master 
Show real time, not cpu time when making screenshots.
 2012-09-26 03:20:18 -07:00
Tigran Aivazian
9e134ce976 Merge remote-tracking branch 'upstream/master' 2012-09-26 11:04:24 +01:00
Tigran Aivazian
3cdb57ccc7 Merge pull request #309 from dpavlin/pdf-links 
show pdf links using L key
 2012-09-26 03:03:22 -07:00
Dobrica Pavlinusic
929334c00c shortcut_offset should be added directly to shortcut_map 2012-09-26 11:42:15 +02:00
Dobrica Pavlinusic
51e2a0c13b use shortcut_map to track page links 2012-09-26 10:55:03 +02:00
Dobrica Pavlinusic
771901d56e use all shortcuts, skipping uri links 2012-09-26 10:48:07 +02:00
Tigran Aivazian
a0cfcba266 Merge remote-tracking branch 'upstream/master' 2012-09-25 22:04:50 +01:00
{Qingping,Dave} Hou
3fd3ff3680 Merge pull request #319 from dpavlin/crengine-upstream 
bump crengine version to cr3.0.57-15
 2012-09-25 13:41:54 -07:00
Dobrica Pavlinusic
a9bff12d8e version: cr3.0.57-15 
This might help fix #316 since upstream has cache changes
 2012-09-25 21:54:04 +02:00