2
0
mirror of https://github.com/koreader/koreader synced 2024-11-16 06:12:56 +00:00
Commit Graph

1208 Commits

Author SHA1 Message Date
Hans-Werner Hilse
9c4088a3ac small change of UIManager:show(): No more automatic refresh
This eliminates the API difference between the extra parameters of
UIManager:show() and setDirty(). They work the same now.
Note that this also eliminates the automatic refresh that took place
before when using show() without refresh options. It always refreshed
the full screen, which led to too big refresh regions all over the
place. Thus, refresh has now explicitly to be asked for, hopefully
encouraging to implement it in the widget that gets shown (and is
aware about the screen region it covers).

Also add an event that is triggered when a widget is closed:
CloseWidget. So a widget can implement "onCloseWidget()" to trigger
actions upon closing - most commonly, this is a refresh for the area
previously taken by the widget. That way, the widget's user does not
have to take measures to ensure that the area is refreshed later.
2014-12-01 14:42:38 +00:00
Huang Xin
ddae003925 Merge pull request #1310 from hwhw/master
fixes for scrolling, fix for double-refresh, misc stuff
2014-12-01 09:56:04 +08:00
Hans-Werner Hilse
e8642fbad7 use API for refresh when closing widgets in message popups 2014-11-30 22:35:08 +00:00
Hans-Werner Hilse
1091a8a3b9 add refresh control to UIManager:close() 2014-11-30 22:35:07 +00:00
Hans-Werner Hilse
143c56c48c record ButtonDialog.dimen 2014-11-30 22:33:38 +00:00
Hans-Werner Hilse
afb59667c0 allow for more control on refreshes when show()ing widgets
for now, we have show() automatically call setDirty() for the new
widget, as before. However, now show() takes two arguments for
refresh configuration that will get passed on to setDirty().

For compatibility, the default is here in show() to do a partial
refresh. So if you want no refresh triggered (via this show() call),
add a function that doesn't return anything.
2014-11-30 22:33:36 +00:00
Frans de Jonge
47d7a48555 OPDS: refactored unit test and fixed a minor bug with undefined image_rel 2014-11-30 21:44:47 +01:00
Hans-Werner Hilse
3f9dc46315 fix dict window refresh
was still using old API
also, move this to another place.
2014-11-30 18:38:03 +00:00
Frans de Jonge
c25254a7ec OPDS: embryonic unit test for OPDS browser
This initial seed specifically tests against what recently broke in Gutenberg and FeedBooks.
2014-11-30 19:06:27 +01:00
Hans-Werner Hilse
f02be20a65 refresh fixes for the menus
this will only refresh the areas that actually need to be refreshed.
2014-11-30 12:04:33 +00:00
Hans-Werner Hilse
6793a4fee1 reader config dialog: properly refresh config pane
This serves as a good example for the way refreshes are done:
setDirty("all", function() ... end)
* the "all" will have all widgets on screen repainted.
  In this case that is needed because the config pane has
  different sizes, covering different parts of underlying
  widgets. So they need to be repainted every time.
* the function will return the area to refresh and is evaluated
  after painting. In this example, we take the area that is covered
  by the config pane before switching it (if present at all), and
  hand it to the refresh area function as an upvalue.
  When the function is called later after painting, it will
  use that saved area and combine it with the area that is covered
  then by the widget. That way, parts that are covered no more are
  included in the refresh area, too.
2014-11-30 11:50:51 +00:00
Hans-Werner Hilse
82c26b1f18 adapt widgets to new refresh/repaint API 2014-11-30 00:17:50 +00:00
Hans-Werner Hilse
229c5ad61c change setDirty/refresh API
See documentation in the code.
In short: There is now one single method, setDirty(), that triggers
repaints and/or refreshes.
All variables in UIManager are gone - at least from an external
perspective. Everything is done through setDirty().
This also allows for easier debugging, since all requests come
in via function calls.
2014-11-30 00:15:17 +00:00
Hans-Werner Hilse
2f9386cd69 move refresh menu table out of UIManager
no need to clutter a core file of the whole UI concept with definitions
of UI elements
2014-11-30 00:15:17 +00:00
Andrey Golovizin
296f63b22a OPDS: ignore links with unknown rel values, treat empty rel as rel="subsection". 2014-11-29 11:15:41 +01:00
HW
cceac98180 Merge pull request #1298 from Frenzie/master
Language: prevent spaces from disappearing in localizations with util.template
2014-11-28 23:14:58 +01:00
Frans de Jonge
73a6f71a0b Prevent spaces from being eaten by Transifex
Fixes #1276
2014-11-28 22:38:54 +01:00
Frans de Jonge
7a87b66fa1 OPDS catalog: auto-fill http:// if no protocol given and revert #1106
This fixes #1259.
2014-11-28 21:58:19 +01:00
Huang Xin
1b07698952 Merge pull request #1296 from hwhw/imagewidget_alpha
Imagewidget alpha
2014-11-29 00:00:29 +08:00
Hans-Werner Hilse
0c80537003 allow image widgets to do alpha-blitting
when the image (e.g. a PNG) does contain an alpha channel, that can
be honored by ImageWidget. It doesn't do so by default for compatibility
(arguably, we should change that in the future), it has to be enabled
by setting the "alpha" property to "true" (boolean, not string).
2014-11-28 15:37:11 +00:00
Hans-Werner Hilse
a82bafc63c fix handling of invalid UTF8 sequences
external data (and in bad cases our own) can contain invalid byte
sequences in UTF8 strings. A prominent example are file names.
There was a 1-off bug in calculating the allowed length for multibyte
chars, and the iterator was a bit too greedy when stumbling upon
invalid sequences, returning a single "invalid" char for a sequence
up to the point where it became invalid in calculation. Now, we present
one invalid char for the first byte of that sequence and then check
for a valid char starting with the next byte.
2014-11-28 14:52:04 +00:00
Huang Xin
a72bc33022 Merge pull request #1293 from Frenzie/language
Reworked several strings
2014-11-28 21:21:51 +08:00
Frans de Jonge
693fa0837e Reworked several strings
This is the remaining gruntwork of #1276. I believe that only leaves networkmgr.lua and filemanagersearch.lua, which will require a little more thought.
2014-11-28 14:10:37 +01:00
Huang Xin
e835c1e502 Merge pull request #1280 from hwhw/master
fix a case when "ip r" command fails
2014-11-28 20:19:06 +08:00
Frans de Jonge
66f04af8fb Various applications of util.template
This is the first bunch for #1276. I'd like to resolve #1281 before doing more.
2014-11-28 12:48:15 +01:00
Hans-Werner Hilse
48610006d5 fix a case when "ip r" command fails
our network manager script isn't the beauty of the code base.
However, this fixes a case where it would crash the reader when an
external command fails.

fixes #1279.
2014-11-28 10:58:54 +00:00
Frans de Jonge
cf93605d04 Change "Screen Mode" to "Orientation"
Screen mode isn't user-oriented. Orientation is.

"Page" in "Page Margin" is redundant
2014-11-28 11:32:45 +01:00
chrox
ca60ceacd0 make radius field respects popout flag 2014-11-27 22:01:57 +08:00
chrox
e1af7f2ed3 prompt users to long press directory to set inbox
This should fix #1233.
2014-11-25 18:19:33 +08:00
chrox
0a06041cd9 fix calculation of widget height of filechooser
the height of filechooser is provided when creating filechooser
widget since there may be no title as in filemanger which needs
a special title widget to contain filemanger menu.
2014-11-25 17:49:46 +08:00
chrox
67693367b9 init width and height of filechooser widget during init
so that everytime a filechooser is inited right dimension
size is used.
2014-11-25 16:31:03 +08:00
Hans-Werner Hilse
21ded080dd fix refactor bug: invalidate update_regions_func 2014-11-23 12:13:33 +00:00
Hans-Werner Hilse
8696ca1fa1 fix old (pre-refactor) refresh call syntax 2014-11-23 12:13:33 +00:00
Hans-Werner Hilse
22697adf20 switch from scaleByDPI() to scaleBySize() 2014-11-23 12:13:32 +00:00
Hans-Werner Hilse
63af71188a refactor refresh
Lots of the device-related distinction wandered into
base/ffi/framebuffer_<driver>. This eases the refresh logic in
UI manager, which basically only decides what kind of refresh
to trigger. The device specific configuration in the framebuffer
driver decides how to realize that whish.

screen.lua is gone, in its place is now the framebuffer driver.
The device abstraction decides what framebuffer driver to load.
2014-11-23 12:13:32 +00:00
HW
7b91935df0 Merge pull request #1230 from chrox/fix_1170
fix #1169 and #1170
2014-11-23 13:13:07 +01:00
chrox
d11dba0558 fix #1169 and #1170 2014-11-23 18:06:20 +08:00
chrox
3574865dcb fix #1166 by auto alignment of option name 2014-11-23 16:52:08 +08:00
Frans de Jonge
da00b4b8a9 Refactored menu
While looking into #1219 I accidentally ended up refactoring some stuff.

Tested in emulator and on H2O, but be wary because I might have overlooked something.
2014-11-21 15:57:10 +01:00
chrox
dbf8faa9b1 remove hardcoded footer height of reader menu 2014-11-20 18:02:50 +08:00
chrox
f52872b081 default autoscale for IconButton 2014-11-20 18:02:50 +08:00
chrox
e66801039b refactoring: reuse IconButton for config menu bar 2014-11-20 18:02:50 +08:00
Hans-Werner Hilse
ab44d1f7e3 fix item number distinction (plural forms) 2014-11-19 13:25:32 +01:00
Frans de Jonge
8b9bbf918c Fix typo in #1176 2014-11-19 12:53:03 +01:00
Frans de Jonge
d701d9b198 First util.template encapsulated strings 2014-11-19 12:23:37 +01:00
NiLuJe
e9573ebe58 Try to avoid more update_regions_func mismatches
scheduling tricks
2014-11-18 10:32:47 +01:00
NiLuJe
9bd089812b Tweaks and fixes for refresh logic
Don't increase counter for regional updates
Also some workarounds for Kobos

Try to avoid update_regions_func poisoning

Reset it at the end of repaint() even if nothing was found dirty

Ensure regional updates are always PARTIAL, in
case we get a region attached to an automatically triggered refresh, not
marked force_partial [which, hey, shouldn't happen, but apparently does
sometimes ^^]
2014-11-18 10:31:32 +01: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
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
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
NiLuJe
13cbed8ea5 Fix partial refreshes on older Kobo devices
Fix #1146 (regression).
2014-11-12 19:12:22 +01:00
NiLuJe
1ee09010c4 Make ScrollTextWidget updates regional
Because I like breaking stuff in fun & interesting ways :D
2014-11-12 15:55:30 +01:00
NiLuJe
3d5dd44a4c Don't hijack "fast" UI refresh w/ the REAGL stuff 2014-11-12 15:03:59 +01:00
Frans de Jonge
e5029b54c1 Capitalization: change a few mentions of calibre to lowercase
The author likes it that way. See http://calibre-ebook.com/about
2014-11-12 13:10:48 +01:00
Frans de Jonge
ff4e2f3458 Minor English improvements. 2014-11-12 12:29:38 +01:00
chrox
efbd7f7b5d schedule in menu option callback
so that new reginal update on menu entry don't
affect screen update from callback results
2014-11-12 15:40:37 +08:00
NiLuJe
859031222e Simplify the H2O special-casing
re #1119

AUTO appears to be doing the right thing...
(even if that baffles me, given the state of the Kernel sources,
unless they flip some switches at compile time
[NTX_WFM_MODE_OPTIMIZED_REAGL / NO_AUTO_REAGL_MODE] ...)

Anyway, that's what nickel does, so follow its lead ;).
2014-11-11 17:08:41 +01:00
Qingping Hou
123d0a1230 Merge pull request #1126 from chrox/wifi_toggler
add network settings in reader menu
2014-11-11 03:05:12 -05:00
Qingping Hou
fac2e121d2 Merge pull request #1124 from chrox/remember_menutab
remember menu tab index when showing reader menu
2014-11-11 03:01:35 -05:00
chrox
590073e4a8 add network settings in reader menu
and remove the wifi toggler on the footer of each menu page,
so that network status is only checked (currently with the stdout of ip cmd)
when navigating to the "Network settings" submenu instead of checking
on each menu popup.
2014-11-11 12:12:39 +08:00
NiLuJe
d018a31b0a Me speak english good. ya! 2014-11-11 03:58:57 +01:00
NiLuJe
dbe816062b Be consistent in how we refer to stuff 2014-11-11 03:39:47 +01:00
NiLuJe
c3274a9d5e Unbreak FM by reverting 7a812f
:D
2014-11-11 03:24:56 +01:00
NiLuJe
b88e304845 Make TouchMenu updates regional 2014-11-11 03:17:15 +01:00
NiLuJe
88c26b4112 Make ConfigDialog updates regional 2014-11-11 03:10:03 +01:00
chrox
95ac27df5c remember menu tab index when showing reader menu 2014-11-11 10:06:17 +08:00
NiLuJe
7a812ff86d Make Button update regional 2014-11-11 03:03:25 +01:00
NiLuJe
39244aa0cb Make ToggleSwitch updates regional 2014-11-11 02:52:47 +01:00
NiLuJe
041f11cba0 Tweak some comments 2014-11-11 02:42:07 +01:00
NiLuJe
a4a50b3d0d Fix the REAGL logic.
Never use REAGL to handle UI elements. It makes for a much smoother
experience.
2014-11-11 02:28:41 +01:00
NiLuJe
656a2c7cb6 Actually do what the comment says.
Don't hijack forced partial updates (i.e., from UI elements) on always
FULL REAGL devices. It doesn't implode if we don't, and it makes for a
snappier UI.
2014-11-11 02:15:08 +01:00
NiLuJe
3ce10b697a Moar comments! 2014-11-11 01:27:44 +01:00
NiLuJe
8cfbcca7c5 More comments on the H2O weirdness... 2014-11-11 01:25:44 +01:00
NiLuJe
a44c5e99d1 Use the proper constants for Kobo's waveform modes 2014-11-11 00:48:19 +01:00
NiLuJe
8f3598bec3 Make IconButton updates regional
Beginning of the quest to make menu refreshes slightly smoother ;).
2014-11-10 20:27:35 +01:00
NiLuJe
a2f107075d Shot in the dark at matching the H2O's behavior... 2014-11-10 20:04:34 +01:00
NiLuJe
a12015c0d1 Force the dictionary popup to do a partial update.
It was done the other way around on purpose, so I probably broke some
very specific use-case ;). Feel free to shout at me ^^.
2014-11-10 16:48:16 +01:00
chrox
befa3aa63c normalize version when checking packages in OTA manager
This fixes a bug that version 987 was treated newer than version 1010.
2014-11-10 20:21:28 +08:00
Frans de Jonge
ca75b7a030 Add usage note to unschedule 2014-11-09 16:38:58 +01:00
NiLuJe
d340159de8 Simplify the whole wait_for_marker commit.
Companion commit to the same stuff in base ;).
2014-11-08 15:50:57 +01:00
NiLuJe
cd7e9c3257 First stab at revamping the wait for marker stuff
WIP, untested, can probably simplified some more.
Good news is, it should be smarter, and thus provide a smoother user
experience :).
Relies on the relevant changes in base.
2014-11-08 15:50:57 +01:00
NiLuJe
d488ca43fa Some potentially fun stuff TODO :) 2014-11-08 15:50:56 +01:00
NiLuJe
ed6f027d68 Whee, the eink driver was updated for the KT2/KV! 2014-11-08 15:50:56 +01:00
NiLuJe
76c3a3aa44 Minor comment tweaks 2014-11-08 15:50:56 +01:00
NiLuJe
b3137736c8 Don't highjack regional updates on REAGL devices
We wouldn't want those to become full updates ;).
Also apply an optionally different waveform mode for such partial,
regional updates (right now, only Kindle devices make use of this finer
grained control).
2014-11-08 15:50:56 +01:00
NiLuJe
25adccbcd6 More notes for tomorrow 2014-11-08 15:50:56 +01:00
NiLuJe
374d993355 One more thing to look into/fix... 2014-11-08 15:50:56 +01:00
NiLuJe
13b02cbad9 Request regal waveform on phoenix & dahlia
Depends on the corresponding changes in koreader-base ;)
2014-11-08 15:50:56 +01:00
NiLuJe
1c22c38a5d Review some of my waveform switcheroo logic... 2014-11-08 15:50:56 +01:00
Andrey Golovizin
8bce54a6a0 Ignore OPDS links with unknown rel values. 2014-11-08 09:19:29 +01:00
Andrey Golovizin
5888773c95 Try to fetch next page if loading a new catalog resulted in a single page 2014-11-07 22:10:12 +01:00
Andrey Golovizin
500ad9ba4c Fetch enough items to fill at lest one new page 2014-11-07 22:10:06 +01:00
HW
9a7834113b Merge pull request #1097 from Frenzie/master
Implement UIManager:unschedule(action). Fixes #1007.
2014-11-06 17:53:35 +01:00
HW
a7938b1680 Merge pull request #1090 from chrox/fix_869
fix #869
2014-11-06 16:16:24 +01:00
Frans de Jonge
8cd80288a0 Implement UIManager:unschedule(action). Fixes #1007. 2014-11-06 12:59:00 +01:00
chrox
dd308f6be1 allow closing non-existent widget but throw a warning 2014-11-06 14:00:47 +08:00
chrox
0dd3a1f8a1 add option to turn off e-ink optimization
which currently just sets free the limitation of panning gestures
emitting rate. This should fix #1039 when unchecking the
"E-ink optimization" in the "Screen settings".
2014-11-06 13:16:35 +08:00
Huang Xin
62eef02c86 Merge pull request #1080 from houqp/fix
fix kobo aura hd input handling
2014-11-05 15:57:31 +08:00