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

Merge pull request #698 from chrox/master

display 2 pages side-by-side in landscape for screen height larger than 7 inches
This commit is contained in:
HW 2014-07-04 13:31:59 +02:00
commit 854b941dcc
4 changed files with 4 additions and 4 deletions

View File

@ -220,7 +220,7 @@ end
function ReaderFont:makeDefault(face)
if face then
UIManager:show(ConfirmBox:new{
text = _("Set default font \"")..face.."\"?",
text = _("Set default font to ")..face.."?",
ok_callback = function()
G_reader_settings:saveSetting("cre_font", face)
end,

View File

@ -335,7 +335,7 @@ end
function ReaderZooming:makeDefault(zoom_mode)
UIManager:show(ConfirmBox:new{
text = _("Set default zoom mode to \"")..zoom_mode.."\"?",
text = _("Set default zoom mode to ")..zoom_mode.."?",
ok_callback = function()
G_reader_settings:saveSetting("zoom_mode", zoom_mode)
end,

View File

@ -121,7 +121,7 @@ function CreDocument:loadDocument()
if not self.info.has_pages then
self.info.doc_height = self._document:getFullHeight()
end
if Device:getModel() ~= "KindleDXG" then
if math.max(Screen:getWidth(), Screen:getHeight())/Screen:getDPI() < 7 then
self:setVisiblePageCount(1)
end
end

View File

@ -577,7 +577,7 @@ end
function ConfigDialog:onMakeDefault(name, name_text, values, labels, position)
UIManager:show(ConfirmBox:new{
text = _("Set default ")..(name_text or "").." to "..labels[position].."?",
text = _("Set default ")..(name_text or "").._(" to ")..labels[position].."?",
ok_callback = function()
local name = self.config_options.prefix.."_"..name
G_reader_settings:saveSetting(name, values[position])