From 8a792d2f31810854213facbb179ea19738b14f4f Mon Sep 17 00:00:00 2001 From: NuPogodi Date: Thu, 6 Sep 2012 21:04:20 +0300 Subject: [PATCH] Replaced: font selection menu (new version), etc 1. New menu Font:chooseFonts() to change font faces 2. Removed duplicate of 'make screenshot' 3. Hotkeys (Back & Home) to exit are moved down, to the end of hotkey list 4. Removed outdated comments & not informative comments --- filehistory.lua | 52 +++++++------------------------------------------ 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/filehistory.lua b/filehistory.lua index bdd29bc15..6fc5bd717 100644 --- a/filehistory.lua +++ b/filehistory.lua @@ -128,7 +128,6 @@ function FileHistory:addAllCommands() self.pagedirty = true end ) - -- last documents self.commands:add(KEY_L, nil, "L", "last documents", function(self) @@ -136,7 +135,6 @@ function FileHistory:addAllCommands() self.pagedirty = true end ) - -- show help page self.commands:add(KEY_H, nil, "H", "show help page", function(self) @@ -144,15 +142,6 @@ function FileHistory:addAllCommands() self.pagedirty = true end ) - -- make screenshot - self.commands:add(KEY_P, MOD_SHIFT, "P", - "make screenshot", - function(self) - Screen:screenshot() - end - ) - - -- file info self.commands:add({KEY_FW_RIGHT, KEY_I}, nil, "joypad right", "document details", function(self) @@ -160,8 +149,7 @@ function FileHistory:addAllCommands() FileInfo:show(file_entry.dir,file_entry.name) self.pagedirty = true end - ) - + ) self.commands:add(KEY_FW_UP, nil, "joypad up", "goto previous item", function(self) @@ -202,30 +190,12 @@ function FileHistory:addAllCommands() end ) self.commands:add({KEY_F, KEY_AA}, nil, "F", - "font menu", + "change font faces", function(self) - -- NuPogodi, 18.05.12: define the number of the current font in face_list - local item_no = 0 - local face_list = Font:getFontList() - while face_list[item_no] ~= Font.fontmap.cfont and item_no < #face_list do - item_no = item_no + 1 - end - - local fonts_menu = SelectMenu:new{ - menu_title = "Fonts Menu", - item_array = face_list, - -- NuPogodi, 18.05.12: define selected item - current_entry = item_no - 1, - } - local re, font = fonts_menu:choose(0, G_height) - if re then - Font.fontmap["cfont"] = font - Font:update() - end + Font:chooseFonts() self.pagedirty = true end ) - self.commands:add({KEY_ENTER, KEY_FW_PRESS}, nil, "Enter", "open selected item", function(self) @@ -242,12 +212,6 @@ function FileHistory:addAllCommands() self.pagedirty = true end ) - self.commands:add({KEY_BACK, KEY_HOME}, nil, "Back", - "back", - function(self) - return "break" - end - ) self.commands:add({KEY_DEL}, nil, "Del", "delete history entry", function(self) @@ -266,14 +230,12 @@ function FileHistory:addAllCommands() self.pagedirty = true end ) ---[[ self.commands:add({KEY_B}, nil, "B", - "file browser", + self.commands:add({KEY_BACK, KEY_HOME}, nil, "Back", + "back", function(self) - --FileChooser:setPath(".") - FileChooser:choose(0, G_height) - self.pagedirty = true + return "break" end - )]] + ) end function FileHistory:choose(keywords)