Merge pull request #1696 from chrox/fix_flush_settings

fix FlushSettings event consumed by statistics plugin
pull/1708/head v2015.11-stable
Qingping Hou 9 years ago
commit 6c51645bb4

@ -52,7 +52,8 @@ end
function InputContainer:paintTo(bb, x, y) function InputContainer:paintTo(bb, x, y)
if not self.dimen then if not self.dimen then
self.dimen = self[1]:getSize() local content_size = self[1]:getSize()
self.dimen = Geom:new{w = content_size.w, h = content_size.h}
end end
self.dimen.x = x self.dimen.x = x
self.dimen.y = y self.dimen.y = y

@ -92,7 +92,7 @@ function ReaderStatistics:getStatisticEnabledMenuTable()
if self.is_enabled then if self.is_enabled then
self:initData() self:initData()
end end
self:onSaveSettings() self:saveSettings()
end, end,
} }
end end
@ -138,7 +138,7 @@ function ReaderStatistics:updateSettings()
callback = function() callback = function()
self.settings_dialog:onClose() self.settings_dialog:onClose()
UIManager:close(self.settings_dialog) UIManager:close(self.settings_dialog)
self:onSaveSettings(MultiInputDialog:getFields()) self:saveSettings(MultiInputDialog:getFields())
end end
}, },
}, },
@ -409,20 +409,18 @@ function ReaderStatistics:onAddNote()
end end
-- in case when screensaver starts -- in case when screensaver starts
function ReaderStatistics:onFlushSettings() function ReaderStatistics:onSaveSettings()
self:onSaveSettings() self:saveSettings()
self:exportToFile() self:exportToFile()
self.current_period = 0 self.current_period = 0
return true
end end
-- screensaver off -- screensaver off
function ReaderStatistics:onResume() function ReaderStatistics:onResume()
self.current_period = 0 self.current_period = 0
return true
end end
function ReaderStatistics:onSaveSettings(fields) function ReaderStatistics:saveSettings(fields)
if fields then if fields then
self.page_min_read_sec = tonumber(fields[1]) self.page_min_read_sec = tonumber(fields[1])
self.page_max_read_sec = tonumber(fields[2]) self.page_max_read_sec = tonumber(fields[2])

Loading…
Cancel
Save