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

Merge pull request #439 from chrox/master

Browse Source 
move setPageMargin to the begining of document initialization
This commit is contained in:
Qingping Hou
2014-01-07 08:10:46 -08:00
parent 9262b17bab d80e89ee3c
commit 764e16f8e5
6 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
defaults.lua
View File

@@ -87,9 +87,9 @@ DCREREADER_CONFIG_DEFAULT_FONT_SIZE = 22 -- default font size
-- crereader margin sizes
-- margin {left, top, right, bottom} in pixels
DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {15, 5, 15, 5}
DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {22, 10, 22, 10}
DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {30, 10, 30, 10}
DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {15, 10, 15, 10}
DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {22, 15, 22, 15}
DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {30, 20, 30, 20}
-- gesture detector defaults
DGESDETECT_DISABLE_DOUBLE_TAP = true

2
frontend/ui/data/creoptions.lua
View File

@@ -90,7 +90,7 @@ local CreOptions = {
},
{
name = "font_gamma",
name_text = S.GAMMA,
name_text = S.CONTRAST,
toggle = {S.DECREASE, S.INCREASE},
alternate = false,
args = {"decrease", "increase"},

8
frontend/ui/reader/readercoptlistener.lua
View File

@@ -20,14 +20,6 @@ function ReaderCoptListener:onReadSettings(config)
self.ui:handleEvent(Event:new("SetViewMode", "scroll"))
end)
end
local copt_margins = config:readSetting("copt_page_margins")
if copt_margins == nil then
copt_margins = DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM
end
table.insert(self.ui.postInitCallback, function()
self.ui:handleEvent(Event:new("SetPageMargins", copt_margins))
end)
end
return ReaderCoptListener

22
frontend/ui/reader/readertypeset.lua
View File

@@ -23,22 +23,16 @@ function ReaderTypeset:onReadSettings(config)
self.css = nil
end
self.embedded_css = config:readSetting("embedded_css")
-- default to enable embedded css
if self.embedded_css == nil then
self.embedded_css = true
self.ui.document:setEmbeddedStyleSheet(1)
end
if not self.embedded_css then
self.ui.document:setEmbeddedStyleSheet(0)
end
self.floating_punctuation = config:readSetting("floating_punctuation")
-- default to no floating punctuation
if self.floating_punctuation == nil then
self.floating_punctuation = 0
end
self.embedded_css = config:readSetting("embedded_css") or true
self.ui.document:setEmbeddedStyleSheet(self.embedded_css and 1 or 0)
-- default to enable floating punctuation
self.floating_punctuation = config:readSetting("floating_punctuation") or 1
self.ui.document:setFloatingPunctuation(self.floating_punctuation)
local copt_margins = self.ui.doc_settings:readSetting("copt_page_margins") or DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM
self.ui:handleEvent(Event:new("SetPageMargins", copt_margins))
end
function ReaderTypeset:onSaveSettings()

2
koreader-base

Submodule koreader-base updated: fc05afc033...d63aacf081

53
l10n/templates/koreader.pot
View File

@@ -1,12 +1,12 @@
# KOReader PATH/TO/FILE.PO
# Copyright (C) 2005-2013 KOReader Development Team
# Copyright (C) 2005-2014 KOReader Development Team
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
"POT-Creation-Date: 2013-12-28 11:04+0000\n"
"POT-Creation-Date: 2014-01-07 15:39+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +63,7 @@ msgid ""
"Apply"
msgstr ""
#: frontend/ui/reader/readertypeset.lua:56
#: frontend/ui/reader/readertypeset.lua:58
msgid ""
"Auto"
msgstr ""
@@ -428,7 +428,7 @@ msgid ""
msgstr ""
#: frontend/ui/widget/configdialog.lua:84
#: frontend/ui/widget/configdialog.lua:138
#: frontend/ui/widget/configdialog.lua:120
msgid ""
"Select Option Item"
msgstr ""
@@ -453,7 +453,7 @@ msgid ""
"Standby"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:245
#: frontend/ui/reader/readerzooming.lua:292
msgid ""
"Switch zoom mode"
msgstr ""
@@ -503,11 +503,6 @@ msgid ""
"Toggle hidden files"
msgstr ""
#: frontend/ui/reader/readerpaging.lua:148
msgid ""
"Toggle page overlap"
msgstr ""
#: frontend/ui/widget/toggleswitch.lua:74
msgid ""
"Toggle switch"
@@ -518,6 +513,26 @@ msgid ""
"Translate"
msgstr ""
#: frontend/ui/reader/readertypeset.lua:127
msgid ""
"Turn off floating punctuation"
msgstr ""
#: frontend/ui/reader/readerpaging.lua:153
msgid ""
"Turn off page overlap"
msgstr ""
#: frontend/ui/reader/readertypeset.lua:128
msgid ""
"Turn on floating punctuation"
msgstr ""
#: frontend/ui/reader/readerpaging.lua:154
msgid ""
"Turn on page overlap"
msgstr ""
#: frontend/apps/filemanager/filemanagermenu.lua:81
#: frontend/ui/reader/readermenu.lua:78
msgid ""
@@ -544,32 +559,32 @@ msgid ""
"Writing Direction"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:264
#: frontend/ui/reader/readerzooming.lua:311
msgid ""
"Zoom to fit content"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:252
#: frontend/ui/reader/readerzooming.lua:299
msgid ""
"Zoom to fit content height"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:248
#: frontend/ui/reader/readerzooming.lua:295
msgid ""
"Zoom to fit content width"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:268
#: frontend/ui/reader/readerzooming.lua:315
msgid ""
"Zoom to fit page"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:260
#: frontend/ui/reader/readerzooming.lua:307
msgid ""
"Zoom to fit page height"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:256
#: frontend/ui/reader/readerzooming.lua:303
msgid ""
"Zoom to fit page width"
msgstr ""
@@ -600,12 +615,12 @@ msgid ""
"chose selected option"
msgstr ""
#: frontend/ui/reader/readertypeset.lua:50
#: frontend/ui/reader/readertypeset.lua:52
msgid ""
"clear all external styles"
msgstr ""
#: frontend/ui/widget/configdialog.lua:462
#: frontend/ui/widget/configdialog.lua:436
msgid ""
"close config menu"
msgstr ""
@@ -872,7 +887,7 @@ msgid ""
"scroll"
msgstr ""
#: frontend/ui/widget/configdialog.lua:466
#: frontend/ui/widget/configdialog.lua:440
#: frontend/ui/widget/menu.lua:439
msgid ""
"select current menu item"