From 803e4e86005e15547e534b57c8902b26d0557335 Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Wed, 4 Jun 2014 21:54:01 +0800
Subject: [PATCH] font weight option should be persistent between launchings
 This should fix #620.

---
 frontend/apps/reader/modules/readerfont.lua | 39 ++++++++-------------
 frontend/document/credocument.lua           |  6 ++--
 frontend/ui/data/creoptions.lua             |  6 ++--
 frontend/ui/data/strings.lua                |  3 +-
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/frontend/apps/reader/modules/readerfont.lua b/frontend/apps/reader/modules/readerfont.lua
index c27ea0572..31c6be076 100644
--- a/frontend/apps/reader/modules/readerfont.lua
+++ b/frontend/apps/reader/modules/readerfont.lua
@@ -64,36 +64,23 @@ function ReaderFont:onSetDimensions(dimen)
 end
 
 function ReaderFont:onReadSettings(config)
-    self.font_face = config:readSetting("font_face")
-    if not self.font_face then
-        self.font_face = self.ui.document.default_font
-    end
+    self.font_face = config:readSetting("font_face") or self.ui.document.default_font
     self.ui.document:setFontFace(self.font_face)
 
-    self.header_font_face = config:readSetting("header_font_face")
-    if not self.header_font_face then
-        self.header_font_face = self.ui.document.header_font
-    end
+    self.header_font_face = config:readSetting("header_font_face") or self.ui.document.header_font
     self.ui.document:setHeaderFont(self.header_font_face)
 
-    self.font_size = config:readSetting("font_size")
-    if not self.font_size then
-        --@TODO change this!  12.01 2013 (houqp)
-        self.font_size = DCREREADER_CONFIG_DEFAULT_FONT_SIZE
-    end
+    --@TODO change this!  12.01 2013 (houqp)
+    self.font_size = config:readSetting("font_size") or DCREREADER_CONFIG_DEFAULT_FONT_SIZE
     self.ui.document:setFontSize(Screen:scaleByDPI(self.font_size))
 
-    self.line_space_percent = config:readSetting("line_space_percent")
-    if not self.line_space_percent then
-        self.line_space_percent = 100
-    else
-        self.ui.document:setInterlineSpacePercent(self.line_space_percent)
-    end
+    self.font_embolden = config:readSetting("font_embolden") or 0
+    self.ui.document:toggleFontBolder(self.font_embolden)
 
-    self.gamma_index = config:readSetting("gamma_index")
-    if not self.gamma_index then
-        self.gamma_index = 15
-    end
+    self.line_space_percent = config:readSetting("line_space_percent") or 100
+    self.ui.document:setInterlineSpacePercent(self.line_space_percent)
+
+    self.gamma_index = config:readSetting("gamma_index") or 15
     self.ui.document:setGammaIndex(self.gamma_index)
 
     -- Dirty hack: we have to add folloing call in order to set
@@ -176,8 +163,9 @@ function ReaderFont:onChangeLineSpace(direction)
     return true
 end
 
-function ReaderFont:onToggleFontBolder()
-    self.ui.document:toggleFontBolder()
+function ReaderFont:onToggleFontBolder(toggle)
+    self.font_embolden = toggle
+    self.ui.document:toggleFontBolder(toggle)
     self.ui:handleEvent(Event:new("UpdatePos"))
     return true
 end
@@ -204,6 +192,7 @@ function ReaderFont:onSaveSettings()
     self.ui.doc_settings:saveSetting("font_face", self.font_face)
     self.ui.doc_settings:saveSetting("header_font_face", self.header_font_face)
     self.ui.doc_settings:saveSetting("font_size", self.font_size)
+    self.ui.doc_settings:saveSetting("font_embolden", self.font_embolden)
     self.ui.doc_settings:saveSetting("line_space_percent", self.line_space_percent)
     self.ui.doc_settings:saveSetting("gamma_index", self.gamma_index)
 end
diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index aff95677b..af80d727e 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -319,9 +319,9 @@ function CreDocument:setInterlineSpacePercent(percent)
     self._document:setDefaultInterlineSpace(percent)
 end
 
-function CreDocument:toggleFontBolder()
-    DEBUG("CreDocument: toggle font bolder")
-    self._document:toggleFontBolder()
+function CreDocument:toggleFontBolder(toggle)
+    DEBUG("CreDocument: toggle font bolder", toggle)
+    self._document:setIntProperty("font.face.weight.embolden", toggle)
 end
 
 function CreDocument:setGammaIndex(index)
diff --git a/frontend/ui/data/creoptions.lua b/frontend/ui/data/creoptions.lua
index ccb3a752a..82d2900d7 100644
--- a/frontend/ui/data/creoptions.lua
+++ b/frontend/ui/data/creoptions.lua
@@ -93,8 +93,10 @@ local CreOptions = {
             {
                 name = "font_weight",
                 name_text = S.FONT_WEIGHT,
-                toggle = {S.TOGGLE_BOLD},
-                default_arg = nil,
+                toggle = {S.REGULAR, S.BOLD},
+                values = {0, 1},
+                default_value = 0,
+                args = {0, 1},
                 event = "ToggleFontBolder",
             },
             {
diff --git a/frontend/ui/data/strings.lua b/frontend/ui/data/strings.lua
index 1188fe585..51ed3a2bf 100644
--- a/frontend/ui/data/strings.lua
+++ b/frontend/ui/data/strings.lua
@@ -50,7 +50,8 @@ S.FIVE_DEG = _("5 deg")
 S.TEN_DEG = _("10 deg")
 S.PORTRAIT = _("portrait")
 S.LANDSCAPE = _("landscape")
-S.TOGGLE_BOLD = _("toggle bold")
+S.REGULAR = _("regular")
+S.BOLD = _("bold")
 S.VIEW_SCROLL = _("scroll")
 S.VIEW_PAGE = _("page")
 S.LTR = _("LTR")