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

3869 Commits

Author SHA1 Message Date
Huang Xin
e54d2fec30 Merge pull request #1186 from Frenzie/filesearcher
Initial file search implementation
2014-11-17 10:04:38 +08:00
Huang Xin
05b17429a0 Merge pull request #1189 from hwhw/master
fix strcoll() workaround
2014-11-17 09:58:08 +08:00
Hans-Werner Hilse
3d03713cb1 implement case-insensitive sort, make default and configurable
This will convert any file name to lowercase before doing the comparison.
Note that this will only work for ASCII character range, a full Unicode
aware solution will be much more complicated. And in the end, file names
are byte arrays, not character strings ;-)

fixes #1183.
2014-11-16 19:27:31 +01:00
Hans-Werner Hilse
e031599c0a fix strcoll() workaround
The strcoll() workaround we had in place for Kobo devices was (or has
become) ineffective. We had set self.strcoll to nil on Kobo devices -
but this was the instance variable. Setting it to nil effectively makes
the instance variable vanish, so when trying to access it later, it
was not there and got looked up via the metatable - which had the original
reference. Setting it to nil had no effect whatsoever.

We simplify that approach and set the replacement function where before we
had set this to nil.

This is a partial fix for issue #1183 (and explains a comment in issue #686
which says that the old fix did not work).

However, to really fix #1183 - if we want to do so - we would need a collate
function that normalizes uppercase/lowercase before compare.
2014-11-16 19:15:24 +01:00
NiLuJe
16459fe442 Merge pull request #1188 from hwhw/master
fix dump() recursion detection
2014-11-16 17:33:08 +01:00
Hans-Werner Hilse
7e0b49edd1 fix dump() recursion detection
only detect recursions for table values.
2014-11-16 17:27:37 +01:00
Huang Xin
fd81ebdc00 Merge pull request #1187 from Frenzie/language
Changed "delete" in history to "remove this item from history" for clarity
2014-11-16 23:15:08 +08:00
Frans de Jonge
7a4b737ecd Changed "delete" in history to "remove this item from history" for clarity 2014-11-16 15:54:47 +01:00
Frans de Jonge
518c46033e Change "Search Books" to "Search books" for consistency with other search dialogs 2014-11-16 13:09:03 +01:00
Frans de Jonge
19029d1aab Comment out wasteful DEBUG statements 2014-11-16 13:08:41 +01:00
Frans de Jonge
06239fb9ec Initial file search implementation
See #1165.
2014-11-16 12:57:56 +01:00
Huang Xin
b5521df335 Merge pull request #1185 from erosennin/phoenix-viewport
Fix the viewport on Kobo Aura (phoenix).
2014-11-16 17:56:19 +08:00
Andrey Golovizin
f785b29f34 Fix the viewport on Kobo Aura (phoenix). 2014-11-16 09:53:52 +01:00
Huang Xin
e904a99589 Merge pull request #1178 from erosennin/show-current-settings
Show current font face and hyphenation dictionary in menu
2014-11-16 16:17:32 +08:00
Andrey Golovizin
50d9041c1d Use checked_func instead of remembering the checked item. 2014-11-16 09:03:00 +01:00
Andrey Golovizin
a3e51b339d Show current font face in menu. 2014-11-16 08:59:35 +01:00
Andrey Golovizin
c5122abb21 Show current hyphenation dictionary in menu. 2014-11-16 08:59:35 +01:00
NiLuJe
40a9615d5f Merge pull request #1184 from hwhw/master
update to latest base
2014-11-16 00:45:27 +01:00
Hans-Werner Hilse
a41ccb7ba0 update to latest base
Pull changes to CREngine property setting
(should speed things up when re-rendering is being done)
2014-11-15 23:17:40 +01:00
NiLuJe
f899af32d9 Merge pull request #1182 from hwhw/master
fix bug in viewport offset calculation for refreshes
2014-11-15 22:09:59 +01:00
Hans-Werner Hilse
e8d576f99f fix bug in viewport offset calculation for refreshes
The calculation did not correctly calculate the offset in rotated
modes when the rotation was 90 or 270 degrees. Under these circumstances,
getWidth() and getHeight() did return rotated values for the framebuffer,
while Device.viewport did return not rotated values.
2014-11-15 22:01:04 +01:00
Huang Xin
560131957c Merge pull request #1177 from erosennin/remember-hyphenation
Preserve hyphenation settings when changing font face
2014-11-15 22:56:47 +08:00
Andrey Golovizin
99eecde875 Use setStringProperty method to set hyphenation dictionary. 2014-11-15 12:22:47 +01:00
Huang Xin
7dbe940b71 Merge pull request #1174 from Frenzie/master
Various language-related fixes.
2014-11-15 07:43:18 +08:00
Frans de Jonge
90d3c23030 Enter *a* word to look up. 2014-11-14 23:04:27 +01:00
Frans de Jonge
fcb59bfd30 Improved SetDefaults dialog message. 2014-11-14 22:01:32 +01:00
Frans de Jonge
26baa5e007 Added timeout to successful delete message. 2014-11-14 21:57:06 +01:00
Frans de Jonge
324d67a7a8 Various language-related fixes. 2014-11-14 20:34:55 +01:00
NiLuJe
ac7e25504e Merge pull request #1172 from hwhw/master
factor out dump() function, handle reference loops
2014-11-14 16:39:34 +01:00
Hans-Werner Hilse
5b48c165b3 factor out dump() function, handle reference loops 2014-11-14 16:33:52 +01:00
HW
3459a432de Merge pull request #1171 from tigran123/fix1164
Fix #1164 by registering .txt.zip/.html.zip/.htm.zip formats
2014-11-14 14:30:31 +01:00
Tigran Aivazian
e5e50ed0f9 Fix 1169 by registering .txt.zip/.html.zip/.htm.zip formats 2014-11-14 12:25:02 +00:00
Huang Xin
2dbda247a2 Merge pull request #1168 from hwhw/master
Fix double-check of task list
2014-11-14 18:17:45 +08:00
Hans-Werner Hilse
45cf927ee8 Fix double-check of task list
Since commit 12a76fee33, we had a potential
bug on the event mechanism:

It introduced (besides the checkTasks method itself) a second run of the
checkTasks() method. In the second run, however, scheduled events were
not taken into consideration in how long to wait for input events
afterwards.

So when the after the first run of checkTasks() there were new scheduled
tasks added to the task queue, they were not properly scheduled and
and depended on an already existing scheduled event or an input event
to trigger.

This might have led to unexpected order of execution (though the order
is not guaranteed by the task scheduling anyway!) or to events triggering
not at all until the next input event.
2014-11-14 09:12:46 +01:00
Hans-Werner Hilse
c22dbbe3ae factor out repaint to its own method
it's gotten complex enough to isolate it
2014-11-14 09:09:50 +01:00
Huang Xin
5e24e18d3e Merge pull request #1167 from Frenzie/master
Change rm invocation from rm -r to rm -rf
2014-11-14 08:58:52 +08:00
Frans de Jonge
81cb358775 Change rm invocation from rm -r to rm -rf
Fixes #941.
2014-11-13 22:40:02 +01:00
HW
4f19d5a9b7 Merge pull request #1163 from Frenzie/master
"File to remove" DEBUG message was empty
2014-11-13 13:40:27 +01:00
Frans de Jonge
5faff6331f "File to remove" DEBUG message was empty
You can't get the full file path of a file that no longer exists, obviously.
2014-11-13 12:54:58 +01:00
Huang Xin
c219ba3266 Merge pull request #1162 from Frenzie/master
File manager improvements: added delete confirmation dialog and success/failure message
2014-11-13 19:35:54 +08:00
Frans de Jonge
886a9d8f8f File manager improvements: added delete confirmation dialog and success/failure message
This makes deleting files from within KOReader less scary and also provides the initial framework for handling different exit codes for #941.
2014-11-13 12:28:57 +01:00
Qingping Hou
b0b02182ff Merge pull request #1160 from chrox/fix_1154
fix #1154
2014-11-13 03:41:14 -05:00
Qingping Hou
38cf53b426 Merge pull request #1159 from chrox/fix_1155
dismiss 'Opening file' dialog once reader view is ready
2014-11-13 03:37:34 -05:00
Qingping Hou
2cb23c9df6 Merge pull request #1153 from chrox/fix_1149
fix #1149 by adding 'Network setting' in filemanager
2014-11-13 03:27:33 -05:00
Qingping Hou
244a0cb6f5 Merge pull request #1152 from chrox/fix_1142
fix #1142 by adding 'show page overlap' option for EPUB doc
2014-11-13 03:26:48 -05:00
chrox
111ad02143 fix #1154
And koreader release version is normalized to a 10 digits containing
a four digits year field followed by a two digits month field followed
by a four digits revision field like "2014041079".
2014-11-13 14:43:20 +08:00
chrox
d65e5cf813 dismiss 'Opening file' dialog once reader view is ready 2014-11-13 14:00:35 +08:00
chrox
edb124471d screensaver options only apply to Kobo devices 2014-11-13 12:59:02 +08:00
chrox
cfa4f03c18 fix #1149 by adding 'Network setting' in filemanager 2014-11-13 12:54:42 +08:00
chrox
307bbe8675 fix #1142 by adding 'show page overlap' option for EPUB doc
And 'show page overlap' option is disabled in "page" mode for EPUBs,
and in fit to page/*height zoom mode for PDFs.
2014-11-13 12:37:20 +08:00