Merge pull request #340 from tigran123/master

Two fixes from NuPogodi

filechooser.lua

@@ -90,8 +90,9 @@ end
 
 function DrawFooter(text,font_face,h)
 	local y = G_height - 7
-	local x = (G_width / 2) - 50
-	renderUtf8Text(fb.bb, x, y, font_face, text, true)
+	-- NuPogodi, 29.09.12: just dirty fix to have the same footer everywhere
+	local x = FileChooser.margin_H --(G_width / 2) - 50
+	renderUtf8Text(fb.bb, x, y, font_face, text.."  - Press H for help", true)
 end
 
 function DrawFileItem(name,x,y,image)

fileinfo.lua

@@ -200,6 +200,8 @@ function FileInfo:show(path, name)
 				dy = dy + renderUtf8Multiline(fb.bb, xrcol, y, cface, self.result[c].name, true,
 						G_width - self.margin_H - xrcol, 1.65).y - y
 			end
+			-- NuPogodi, 29.09.12: restored footer > to see 'Press H for help'
+			DrawFooter("Page 1 of 1",fface,self.foot_H)
 			fb:refresh(0)
 			self.pagedirty = false
 		end

inputbox.lua

@@ -493,7 +493,7 @@ function InputBox:defineCalcFunctions() -- for the calculator documentation
 	self.calcfunctions:del(KEY_OUTOF_SCREEN_SAVER, nil, "Slider")
 	self.calcfunctions:del(KEY_CHARGING, nil, "plugin/out usb")
 	self.calcfunctions:del(KEY_NOT_CHARGING, nil, "plugin/out usb")
-	self.calcfunctions:del(KEY_SPACE, MOD_ALT, "Space")
+	self.calcfunctions:del(KEY_P, MOD_SHIFT, "P")
 
 	local s = " " -- space for function groups
 	local a = 100 -- arithmetic functions