added Screen:screenshot()

12 years ago · a08c35a52c
parent 86513c3793
commit a08c35a52c
7 changed files with 15 additions and 27 deletions
--- a/crereader.lua
+++ b/crereader.lua
@ -366,10 +366,7 @@ function CREReader:adjustCreReaderCommands()
 	self.commands:add(KEY_P, MOD_SHIFT, "P",
 		"make screenshot",
 		function(cr)
-			os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
-			local d = os.date("%Y%m%d%H%M%S")
-			showInfoMsgWithDelay("making screenshot... ", 1000, 1)
-			os.execute("dd ".."if=/dev/fb0 ".."of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
+			Screen:screenshot()
 		end
 	)
 	
--- a/filechooser.lua
+++ b/filechooser.lua
@ -346,11 +346,7 @@ function FileChooser:choose(ypos, height)
 				end
 				pagedirty = true
 			elseif ev.code == KEY_P then	-- make screenshot
-				os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
-				local d = os.date("%Y%m%d%H%M%S")
-				showInfoMsgWithDelay("making screenshot... ", 1000, 1)
-				os.execute("dd ".."if=/dev/fb0 ".."of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
-				pagedirty = true
+				Screen:screenshot()
 			elseif ev.code == KEY_FW_RIGHT or ev.code == KEY_I then	-- show file info
 				return nil, function()
 						local newdir = self.dirs[perpage*(self.page-1)+self.current]
--- a/filehistory.lua
+++ b/filehistory.lua
@ -148,10 +148,7 @@ function FileHistory:addAllCommands()
 	self.commands:add(KEY_P, MOD_SHIFT, "P",
 		"make screenshot",
 		function(self)
-			os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
-			local d = os.date("%Y%m%d%H%M%S")
-			showInfoMsgWithDelay("making screenshot... ", 1000, 1)
-			os.execute("dd ".."if=/dev/fb0 ".."of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
+			Screen:screenshot()
 		end
 	) 
 	
--- a/fileinfo.lua
+++ b/fileinfo.lua
@ -207,10 +207,7 @@ function FileInfo:addAllCommands()
 	self.commands:add(KEY_P, MOD_SHIFT, "P",
 		"make screenshot",
 		function(self)
-			os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
-			local d = os.date("%Y%m%d%H%M%S")
-			showInfoMsgWithDelay("making screenshot... ", 1000, 1)
-			os.execute("dd ".."if=/dev/fb0 ".."of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
+			Screen:screenshot()
 		end
 	) 
 	-- recent documents
--- a/filesearcher.lua
+++ b/filesearcher.lua
@ -140,10 +140,7 @@ function FileSearcher:addAllCommands()
 	self.commands:add(KEY_P, MOD_SHIFT, "P",
 		"make screenshot",
 		function(self)
-			os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
-			local d = os.date("%Y%m%d%H%M%S")
-			showInfoMsgWithDelay("making screenshot... ", 1000, 1)
-			os.execute("dd ".."if=/dev/fb0 ".."of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
+			Screen:screenshot()
 		end
 	) 
 	
--- a/screen.lua
+++ b/screen.lua
@ -106,3 +106,12 @@ function Screen:restoreFromBB(bb)
 		debug("Got nil bb in restoreFromSavedBB!")
 	end
 end
+
+function Screen:screenshot()
+		--@TODO convert bitmap to png or jpeg  30.04 2012 (houqp)
+		os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
+		local d = os.date("%Y%m%d%H%M%S")
+		os.execute("dd if=/dev/fb0 of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
+		showInfoMsgWithDelay("screenshot "..d.." created", 1000, 1)
+end
+
--- a/unireader.lua
+++ b/unireader.lua
@ -2421,12 +2421,7 @@ function UniReader:addAllCommands()
 	self.commands:add(KEY_P, MOD_SHIFT, "P",
 	"make screenshot",
 	function(unireader)
-		--@TODO convert bitmap to png or jpeg  30.04 2012 (houqp)
-		os.execute("mkdir ".."/mnt/us/kindlepdfviewer/screenshots")
-		local d = os.date("%Y%m%d%H%M%S")
-		InfoMessage:show("making screenshot...", 1)
-		os.execute("dd ".."if=/dev/fb0 ".."of=/mnt/us/kindlepdfviewer/screenshots/" .. d .. ".raw")
-		unireader:redrawCurrentPage()
+		Screen:screenshot()
 	end 
 	)
 	-- commands.map is very large, impacts startup performance on device