Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #584 from chrox/master

Browse Source 
remove full screen option in koptoption
pull/586/head v2014.05.20-nightly
Qingping Hou 10 years ago
parent db28fbf396 1d292f16a9
commit 365b52c215
5 changed files with 50 additions and 104 deletions
Show Stats Download Patch File Download Diff File

21
frontend/apps/reader/modules/readerfooter.lua
Unescape Escape View File

@ -23,7 +23,7 @@ local ReaderFooter = InputContainer:new{
progress_percentage = 0.0, progress_percentage = 0.0,
progress_text = "0 / 0", progress_text = "0 / 0",
show_time = false, show_time = false,
bar_width = 0.85, bar_width = 0.87,
text_width = 0.15, text_width = 0.15,
text_font_face = "ffont", text_font_face = "ffont",
text_font_size = 14, text_font_size = 14,
@ -122,11 +122,12 @@ function ReaderFooter:onPosUpdate(pos)
self:updateFooterPos() self:updateFooterPos()
end end
function ReaderFooter:applyFooterMode() function ReaderFooter:applyFooterMode(mode)
-- three modes switcher for reader footer -- three modes switcher for reader footer
-- 0 for footer off -- 0 for footer off
-- 1 for footer page info -- 1 for footer page info
-- 2 for footer time info -- 2 for footer time info
if mode ~= nil then self.mode = mode end
if self.mode == 0 then if self.mode == 0 then
self.view.footer_visible = false self.view.footer_visible = false
else else
@ -139,12 +140,24 @@ function ReaderFooter:applyFooterMode()
end end
end end
function ReaderFooter:onEnterFlippingMode()
self.orig_mode = self.mode
self:applyFooterMode(1)
end
function ReaderFooter:onExitFlippingMode()
self:applyFooterMode(self.orig_mode)
end
function ReaderFooter:onTapFooter(arg, ges) function ReaderFooter:onTapFooter(arg, ges)
if self.view.flipping_visible then if self.view.flipping_visible then
local pos = ges.pos local pos = ges.pos
local dimen = self.progress_bar.dimen local dimen = self.progress_bar.dimen
local percentage = (pos.x - dimen.x)/dimen.w -- if reader footer is not drawn before the dimen value should be nil
self.ui:handleEvent(Event:new("GotoPercentage", percentage)) if dimen then
local percentage = (pos.x - dimen.x)/dimen.w
self.ui:handleEvent(Event:new("GotoPercentage", percentage))
end
else else
self.mode = (self.mode + 1) % 3 self.mode = (self.mode + 1) % 3
self:applyFooterMode() self:applyFooterMode()

33
frontend/apps/reader/modules/readerpaging.lua
Unescape Escape View File

@ -18,7 +18,7 @@ local ReaderPaging = InputContainer:new{
page_area = nil, page_area = nil,
show_overlap_enable = nil, show_overlap_enable = nil,
overlap = Screen:scaleByDPI(DOVERLAPPIXELS), overlap = Screen:scaleByDPI(DOVERLAPPIXELS),
page_flipping_mode = false, page_flipping_mode = false,
bookmark_flipping_mode = false, bookmark_flipping_mode = false,
flip_steps = {0,1,2,5,10,20,50,100} flip_steps = {0,1,2,5,10,20,50,100}
@ -138,9 +138,9 @@ end
function ReaderPaging:addToMainMenu(tab_item_table) function ReaderPaging:addToMainMenu(tab_item_table)
if self.ui.document.info.has_pages then if self.ui.document.info.has_pages then
table.insert(tab_item_table.typeset, { table.insert(tab_item_table.typeset, {
text_func = function() text_func = function()
return self.show_overlap_enable and return self.show_overlap_enable and
_("Turn off page overlap") or _("Turn off page overlap") or
_("Turn on page overlap") _("Turn on page overlap")
end, end,
callback = function() callback = function()
@ -153,7 +153,7 @@ end
--[[ --[[
Set reading position on certain page Set reading position on certain page
Page position is a fractional number ranging from 0 to 1, indicating the read percentage on Page position is a fractional number ranging from 0 to 1, indicating the read percentage on
certain page. With the position information on each page whenever users change font size, certain page. With the position information on each page whenever users change font size,
page margin or line spacing or close and reopen the book, the page view will be roughly the same. page margin or line spacing or close and reopen the book, the page view will be roughly the same.
--]] --]]
function ReaderPaging:setPagePosition(page, pos) function ReaderPaging:setPagePosition(page, pos)
@ -165,9 +165,9 @@ end
Get reading position on certain page Get reading position on certain page
--]] --]]
function ReaderPaging:getPagePosition(page) function ReaderPaging:getPagePosition(page)
-- Page number ought to be integer, somehow I notice that with -- Page number ought to be integer, somehow I notice that with
-- fractional page number the reader runs silently well, but the -- fractional page number the reader runs silently well, but the
-- number won't fit to retrieve page position. -- number won't fit to retrieve page position.
page = math.floor(page) page = math.floor(page)
DEBUG("get page position", self.page_positions[page]) DEBUG("get page position", self.page_positions[page])
return self.page_positions[page] or 0 return self.page_positions[page] or 0
@ -187,7 +187,7 @@ function ReaderPaging:onTogglePageFlipping()
self.view.flipping_visible = not self.view.flipping_visible self.view.flipping_visible = not self.view.flipping_visible
self.page_flipping_mode = self.view.flipping_visible self.page_flipping_mode = self.view.flipping_visible
self.flipping_page = self.current_page self.flipping_page = self.current_page
if self.page_flipping_mode then if self.page_flipping_mode then
self:updateOriginalPage(self.current_page) self:updateOriginalPage(self.current_page)
self:enterFlippingMode() self:enterFlippingMode()
@ -195,7 +195,6 @@ function ReaderPaging:onTogglePageFlipping()
self:updateOriginalPage(nil) self:updateOriginalPage(nil)
self:exitFlippingMode() self:exitFlippingMode()
end end
self.view:resetLayout()
self.ui:handleEvent(Event:new("SetHinting", not self.page_flipping_mode)) self.ui:handleEvent(Event:new("SetHinting", not self.page_flipping_mode))
self.ui:handleEvent(Event:new("ReZoom")) self.ui:handleEvent(Event:new("ReZoom"))
UIManager:setDirty(self.view.dialog, "partial") UIManager:setDirty(self.view.dialog, "partial")
@ -203,11 +202,11 @@ end
function ReaderPaging:onToggleBookmarkFlipping() function ReaderPaging:onToggleBookmarkFlipping()
self.bookmark_flipping_mode = not self.bookmark_flipping_mode self.bookmark_flipping_mode = not self.bookmark_flipping_mode
if self.bookmark_flipping_mode then if self.bookmark_flipping_mode then
self.orig_flipping_mode = self.view.flipping_visible self.orig_flipping_mode = self.view.flipping_visible
self.orig_dogear_mode = self.view.dogear_visible self.orig_dogear_mode = self.view.dogear_visible
self.view.flipping_visible = true self.view.flipping_visible = true
self.view.dogear_visible = true self.view.dogear_visible = true
self.bm_flipping_orig_page = self.current_page self.bm_flipping_orig_page = self.current_page
@ -218,32 +217,30 @@ function ReaderPaging:onToggleBookmarkFlipping()
self:exitFlippingMode() self:exitFlippingMode()
self:gotoPage(self.bm_flipping_orig_page) self:gotoPage(self.bm_flipping_orig_page)
end end
self.view:resetLayout()
self.ui:handleEvent(Event:new("SetHinting", not self.bookmark_flipping_mode)) self.ui:handleEvent(Event:new("SetHinting", not self.bookmark_flipping_mode))
self.ui:handleEvent(Event:new("ReZoom")) self.ui:handleEvent(Event:new("ReZoom"))
UIManager:setDirty(self.view.dialog, "partial") UIManager:setDirty(self.view.dialog, "partial")
end end
function ReaderPaging:enterFlippingMode() function ReaderPaging:enterFlippingMode()
self.ui:handleEvent(Event:new("EnterFlippingMode"))
self.orig_reflow_mode = self.view.document.configurable.text_wrap self.orig_reflow_mode = self.view.document.configurable.text_wrap
self.orig_footer_mode = self.view.footer_visible
self.orig_scroll_mode = self.view.page_scroll self.orig_scroll_mode = self.view.page_scroll
self.orig_zoom_mode = self.view.zoom_mode self.orig_zoom_mode = self.view.zoom_mode
DEBUG("store zoom mode", self.orig_zoom_mode) DEBUG("store zoom mode", self.orig_zoom_mode)
self.DGESDETECT_DISABLE_DOUBLE_TAP = DGESDETECT_DISABLE_DOUBLE_TAP self.DGESDETECT_DISABLE_DOUBLE_TAP = DGESDETECT_DISABLE_DOUBLE_TAP
self.view.document.configurable.text_wrap = 0 self.view.document.configurable.text_wrap = 0
self.view.page_scroll = false self.view.page_scroll = false
self.view.footer_visible = true
Input.disable_double_tap = false Input.disable_double_tap = false
DGESDETECT_DISABLE_DOUBLE_TAP = false DGESDETECT_DISABLE_DOUBLE_TAP = false
self.ui:handleEvent(Event:new("SetZoomMode", "page")) self.ui:handleEvent(Event:new("SetZoomMode", "page"))
end end
function ReaderPaging:exitFlippingMode() function ReaderPaging:exitFlippingMode()
self.ui:handleEvent(Event:new("ExitFlippingMode"))
self.view.document.configurable.text_wrap = self.orig_reflow_mode self.view.document.configurable.text_wrap = self.orig_reflow_mode
self.view.page_scroll = self.orig_scroll_mode self.view.page_scroll = self.orig_scroll_mode
self.view.footer_visible = self.orig_footer_mode
DGESDETECT_DISABLE_DOUBLE_TAP = self.DGESDETECT_DISABLE_DOUBLE_TAP DGESDETECT_DISABLE_DOUBLE_TAP = self.DGESDETECT_DISABLE_DOUBLE_TAP
Input.disable_double_tap = DGESDETECT_DISABLE_DOUBLE_TAP Input.disable_double_tap = DGESDETECT_DISABLE_DOUBLE_TAP
DEBUG("restore zoom mode", self.orig_zoom_mode) DEBUG("restore zoom mode", self.orig_zoom_mode)
@ -598,7 +595,7 @@ function ReaderPaging:onScrollPanRel(diff)
end end
-- update current pageno to the very last part in current view -- update current pageno to the very last part in current view
self:gotoPage(self.view.page_states[#self.view.page_states].page, "scrolling") self:gotoPage(self.view.page_states[#self.view.page_states].page, "scrolling")
UIManager:setDirty(self.view.dialog, "fast") UIManager:setDirty(self.view.dialog, "fast")
end end

1
frontend/ui/data/koptoptions.lua
Unescape Escape View File

@ -56,6 +56,7 @@ local KoptOptions = {
default_value = DFULL_SCREEN, default_value = DFULL_SCREEN,
event = "SetFullScreen", event = "SetFullScreen",
args = {true, false}, args = {true, false},
show = false,
}, },
{ {
name = "page_margin", name = "page_margin",

32
frontend/ui/input.lua
Unescape Escape View File

@ -286,11 +286,11 @@ function Input:init()
input.open("fake_events") input.open("fake_events")
end end
if dev_mod == "KindlePaperWhite" then if dev_mod == "KindlePaperWhite" then
print(_("Auto-detected Kindle PaperWhite")) print("Auto-detected Kindle PaperWhite")
Device:setTouchInputDev("/dev/input/event0") Device:setTouchInputDev("/dev/input/event0")
input.open("/dev/input/event0") input.open("/dev/input/event0")
elseif dev_mod == "KindlePaperWhite2" then elseif dev_mod == "KindlePaperWhite2" then
print(_("Auto-detected Kindle PaperWhite")) print("Auto-detected Kindle PaperWhite")
Device:setTouchInputDev("/dev/input/event1") Device:setTouchInputDev("/dev/input/event1")
input.open("/dev/input/event1") input.open("/dev/input/event1")
elseif dev_mod == "KindleTouch" then elseif dev_mod == "KindleTouch" then
@ -314,21 +314,17 @@ function Input:init()
end end
return ev return ev
end end
print(_("Auto-detected Kindle Touch")) print("Auto-detected Kindle Touch")
elseif Device:isKobo() then elseif Device:isKobo() then
local firm_rev = Device:getFirmVer() local firm_rev = Device:getFirmVer()
input.open("/dev/input/event1") input.open("/dev/input/event1")
Device:setTouchInputDev("/dev/input/event1") Device:setTouchInputDev("/dev/input/event1")
input.open("/dev/input/event0") -- Light button and sleep slider input.open("/dev/input/event0") -- Light button and sleep slider
print(_("Auto-detected Kobo")) print("Auto-detected Kobo")
print(_("Device model=")) print("Device model=", dev_mod)
print(_(dev_mod)) print("Firmware revision", firm_rev)
print(_("Firmware revision")) print("Screen width =", Screen:getWidth())
print(_(firm_rev)) print("Screen height =", Screen:getHeight())
print(_("Screen height ="))
print(_(Screen:getHeight()))
print(_("Screen width ="))
print(_(Screen:getWidth()))
self:adjustKoboEventMap() self:adjustKoboEventMap()
if dev_mod ~= 'Kobo_trilogy' then if dev_mod ~= 'Kobo_trilogy' then
function Input:eventAdjustHook(ev) function Input:eventAdjustHook(ev)
@ -378,25 +374,25 @@ function Input:init()
end end
end end
elseif dev_mod == "Kindle4" then elseif dev_mod == "Kindle4" then
print(_("Auto-detected Kindle 4")) print("Auto-detected Kindle 4")
input.open("/dev/input/event1") input.open("/dev/input/event1")
self:adjustKindle4EventMap() self:adjustKindle4EventMap()
elseif dev_mod == "Kindle3" then elseif dev_mod == "Kindle3" then
print(_("Auto-detected Kindle 3")) print("Auto-detected Kindle 3")
input.open("/dev/input/event1") input.open("/dev/input/event1")
input.open("/dev/input/event2") input.open("/dev/input/event2")
elseif dev_mod == "KindleDXG" then elseif dev_mod == "KindleDXG" then
print(_("Auto-detected Kindle DXG")) print("Auto-detected Kindle DXG")
input.open("/dev/input/event1") input.open("/dev/input/event1")
elseif dev_mod == "Kindle2" then elseif dev_mod == "Kindle2" then
print(_("Auto-detected Kindle 2")) print("Auto-detected Kindle 2")
input.open("/dev/input/event1") input.open("/dev/input/event1")
else else
print(_("Not supported device model!")) print("Not supported device model!")
os.exit(-1) os.exit(-1)
end end
end end
if Device:getModel() ~= 'Kobo_phoenix' then if Device:getModel() ~= 'Kobo_phoenix' then
function Input:handleTouchEv(ev) function Input:handleTouchEv(ev)
return Input:handleTypeBTouchEv(ev) return Input:handleTypeBTouchEv(ev)

67
l10n/templates/koreader.pot
Unescape Escape View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n" "Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
"POT-Creation-Date: 2014-05-15 09:54+0000\n" "POT-Creation-Date: 2014-05-19 04:34+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -78,42 +78,6 @@ msgid ""
"Auto Straighten" "Auto Straighten"
msgstr "" msgstr ""
#: frontend/ui/input.lua:392
msgid ""
"Auto-detected Kindle 2"
msgstr ""
#: frontend/ui/input.lua:385
msgid ""
"Auto-detected Kindle 3"
msgstr ""
#: frontend/ui/input.lua:381
msgid ""
"Auto-detected Kindle 4"
msgstr ""
#: frontend/ui/input.lua:389
msgid ""
"Auto-detected Kindle DXG"
msgstr ""
#: frontend/ui/input.lua:289
#: frontend/ui/input.lua:293
msgid ""
"Auto-detected Kindle PaperWhite"
msgstr ""
#: frontend/ui/input.lua:317
msgid ""
"Auto-detected Kindle Touch"
msgstr ""
#: frontend/ui/input.lua:323
msgid ""
"Auto-detected Kobo"
msgstr ""
#: frontend/apps/reader/modules/readerbookmark.lua:14 #: frontend/apps/reader/modules/readerbookmark.lua:14
msgid "" msgid ""
"Bookmarks" "Bookmarks"
@ -178,11 +142,6 @@ msgid ""
"Delete" "Delete"
msgstr "" msgstr ""
#: frontend/ui/input.lua:324
msgid ""
"Device model="
msgstr ""
#: frontend/ui/data/strings.lua:16 #: frontend/ui/data/strings.lua:16
msgid "" msgid ""
"Dewatermark" "Dewatermark"
@ -267,11 +226,6 @@ msgid ""
"Fine Tuning" "Fine Tuning"
msgstr "" msgstr ""
#: frontend/ui/input.lua:326
msgid ""
"Firmware revision"
msgstr ""
#: frontend/ui/data/strings.lua:24 #: frontend/ui/data/strings.lua:24
msgid "" msgid ""
"Font Weight" "Font Weight"
@ -430,11 +384,6 @@ msgid ""
"No reader engine for this file" "No reader engine for this file"
msgstr "" msgstr ""
#: frontend/ui/input.lua:395
msgid ""
"Not supported device model!"
msgstr ""
#: plugins/evernote.koplugin/main.lua:339 #: plugins/evernote.koplugin/main.lua:339
msgid "" msgid ""
"Note: " "Note: "
@ -522,16 +471,6 @@ msgid ""
"Screen Mode" "Screen Mode"
msgstr "" msgstr ""
#: frontend/ui/input.lua:328
msgid ""
"Screen height ="
msgstr ""
#: frontend/ui/input.lua:330
msgid ""
"Screen width ="
msgstr ""
#: frontend/ui/data/strings.lua:8 #: frontend/ui/data/strings.lua:8
msgid "" msgid ""
"Scroll Mode" "Scroll Mode"
@ -779,8 +718,8 @@ msgid ""
"close dialog" "close dialog"
msgstr "" msgstr ""
#: frontend/apps/reader/readerui.lua:45 #: frontend/apps/reader/readerui.lua:46
#: frontend/apps/reader/readerui.lua:74 #: frontend/apps/reader/readerui.lua:75
msgid "" msgid ""
"close document" "close document"
msgstr "" msgstr ""

Write Preview
Loading…
Cancel
Save