From 0dba6679372799b7975b1ffff509ce96f99eb970 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 3 Feb 2013 13:13:46 +0800 Subject: [PATCH] rename setScreenViewMode to setScreenMode --- frontend/document/credocument.lua | 2 +- frontend/document/koptinterface.lua | 6 +++--- frontend/ui/reader/readerconfig.lua | 4 ++-- frontend/ui/reader/readermenu.lua | 4 ++-- frontend/ui/reader/readerview.lua | 4 ++-- frontend/ui/screen.lua | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua index 65623bae2..80016b9d8 100644 --- a/frontend/document/credocument.lua +++ b/frontend/document/credocument.lua @@ -13,7 +13,7 @@ CreOptions = { item_text = {"portrait", "landscape"}, args = {"portrait", "landscape"}, default_arg = nil, - event = "SetScreenViewMode", + event = "SetScreenMode", } } }, diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index d7a2f4074..b1553fd7f 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -23,12 +23,12 @@ KoptOptions = { icon = "resources/icons/appbar.transform.rotate.right.large.png", options = { { - name="screen_mode", + name = "screen_mode", name_text = "Screen Mode", toggle = {"portrait", "landscape"}, args = {"portrait", "landscape"}, default_arg = nil, - event = "SetScreenViewMode", + event = "SetScreenMode", } } }, @@ -36,7 +36,7 @@ KoptOptions = { icon = "resources/icons/appbar.crop.large.png", options = { { - name="trim_page", + name = "trim_page", name_text = "Page Crop", toggle = {"auto", "manual"}, values = {1, 0}, diff --git a/frontend/ui/reader/readerconfig.lua b/frontend/ui/reader/readerconfig.lua index c49adcf8d..47970d568 100644 --- a/frontend/ui/reader/readerconfig.lua +++ b/frontend/ui/reader/readerconfig.lua @@ -111,8 +111,8 @@ function ReaderConfig:onSetDimensions(dimen) self.dimen.y = 7 * Screen:getHeight() / 8 self.dimen.w = Screen:getWidth() self.dimen.h = Screen:getHeight() / 8 - -- since we cannot redraw config_dialog with new size, we close the old - -- one it on screen size change + -- since we cannot redraw config_dialog with new size, we close + -- the old one on screen size change if self.config_dialog then self.config_dialog.close_callback() end diff --git a/frontend/ui/reader/readermenu.lua b/frontend/ui/reader/readermenu.lua index 2f051bd7d..4b0865ca8 100644 --- a/frontend/ui/reader/readermenu.lua +++ b/frontend/ui/reader/readermenu.lua @@ -38,14 +38,14 @@ function ReaderMenu:setUpdateItemTable() text = "landscape", callback = function() self.ui:handleEvent( - Event:new("SetScreenViewMode", "landscape")) + Event:new("SetScreenMode", "landscape")) end }, { text = "portrait", callback = function() self.ui:handleEvent( - Event:new("SetScreenViewMode", "portrait")) + Event:new("SetScreenMode", "portrait")) end }, } diff --git a/frontend/ui/reader/readerview.lua b/frontend/ui/reader/readerview.lua index cf7cdd02e..7c931358a 100644 --- a/frontend/ui/reader/readerview.lua +++ b/frontend/ui/reader/readerview.lua @@ -130,9 +130,9 @@ function ReaderView:PanningUpdate(dx, dy) return true end -function ReaderView:onSetScreenViewMode(new_mode) +function ReaderView:onSetScreenMode(new_mode) if new_mode == "landscape" or new_mode == "portrait" then - Screen:setViewMode(new_mode) + Screen:setScreenMode(new_mode) self.ui:handleEvent(Event:new("SetDimensions", Screen:getSize())) end return true diff --git a/frontend/ui/screen.lua b/frontend/ui/screen.lua index 9586bfb82..93c17e885 100644 --- a/frontend/ui/screen.lua +++ b/frontend/ui/screen.lua @@ -124,7 +124,7 @@ function Screen:setRotationMode(mode) Input.rotation = mode end -function Screen:setViewMode(mode) +function Screen:setScreenMode(mode) if mode == "portrait" then if self.cur_rotation_mode ~= 0 then self:setRotationMode(0)