From c85b768c0ecc43c000e027aa48896c49b510d892 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Tue, 10 Apr 2012 20:45:22 +0800
Subject: [PATCH] switched shortcut between 10 degree and 90 degree rotation

* also deleted 10 degree rotation shortcut in
djvureader, becuase it is not supported by the
library.
---
 commands.lua   |  4 ++--
 djvureader.lua |  3 +++
 unireader.lua  | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/commands.lua b/commands.lua
index abdb19cfe..b818f258b 100644
--- a/commands.lua
+++ b/commands.lua
@@ -162,7 +162,7 @@ function Commands:new(obj)
 	end
 	setmetatable(obj.map, mt)
 
-	obj:add(KEY_INTO_SCREEN_SAVER, nil, "slider",
+	obj:add(KEY_INTO_SCREEN_SAVER, nil, "Slider",
 		"toggle screen saver",
 		function()
 			Screen:saveCurrentBB()
@@ -171,7 +171,7 @@ function Commands:new(obj)
 			--os.execute("killall -cont cvm")
 		end
 	)
-	obj:add(KEY_OUTOF_SCREEN_SAVER, nil, "slider",
+	obj:add(KEY_OUTOF_SCREEN_SAVER, nil, "Slider",
 		"toggle screen saver",
 		function()
 			os.execute("sleep 3")
diff --git a/djvureader.lua b/djvureader.lua
index 460b2167d..9d92229c6 100644
--- a/djvureader.lua
+++ b/djvureader.lua
@@ -19,6 +19,9 @@ function DJVUReader:init()
 end
 
 function DJVUReader:adjustDjvuReaderCommand()
+	self.commands:del(KEY_J, MOD_SHIFT, "J")
+	self.commands:del(KEY_K, MOD_SHIFT, "K")
+
 	self.commands:add(KEY_N, nil, "N",
 		"start highlight mode",
 		function(unireader)
diff --git a/unireader.lua b/unireader.lua
index d84d697e1..551638a11 100644
--- a/unireader.lua
+++ b/unireader.lua
@@ -1006,7 +1006,7 @@ function UniReader:addAllCommands()
 		function(unireader)
 			unireader:setGlobalZoom(unireader.globalzoom-unireader.globalzoom_orig*0.2)
 		end)
-	self.commands:add(KEY_BACK,nil,"back",
+	self.commands:add(KEY_BACK,nil,"Back",
 		"back to last jump",
 		function(unireader)
 			if #unireader.jump_stack ~= 0 then
@@ -1113,22 +1113,22 @@ function UniReader:addAllCommands()
 		function(unireader)
 			unireader:addJump(unireader.pageno)
 		end)
-	self.commands:add(KEY_J,nil,"J",
+	self.commands:add(KEY_J,MOD_SHIFT,"J",
 		"rotate 10° clockwise",
 		function(unireader)
 			unireader:setRotate( unireader.globalrotate + 10 )
 		end)
-	self.commands:add(KEY_J,MOD_SHIFT,"J",
+	self.commands:add(KEY_J,nil,"J",
 		"rotate screen 90° clockwise",
 		function(unireader)
 			unireader:screenRotate("clockwise")
 		end)
-	self.commands:add(KEY_K,nil,"K",
+	self.commands:add(KEY_K,MOD_SHIFT,"K",
 		"rotate 10° counterclockwise",
 		function(unireader)
 			unireader:setRotate( unireader.globalrotate - 10 )
 		end)
-	self.commands:add(KEY_K,MOD_SHIFT,"K",
+	self.commands:add(KEY_K,nil,"K",
 		"rotate screen 90° counterclockwise",
 		function(unireader)
 			unireader:screenRotate("anticlockwise")