[farmanager] r13287 - in /trunk/plugins/luamacro: _globalinfo.lua changelog luamacro.rc utils.lua

[yarosl...@users.sourceforge.net]

Author: shmuz
Date: Tue Jun 16 11:20:37 2015
New Revision: 13287

URL: https://sourceforge.net/p/farmanager/code/13287
Log:
Продолжение revision 13282: если пользователь назначил свой хоткей, то он имеет преимущество перед автоматически назначаемым.

Modified:
trunk/plugins/luamacro/_globalinfo.lua
trunk/plugins/luamacro/changelog
trunk/plugins/luamacro/luamacro.rc
trunk/plugins/luamacro/utils.lua

Modified: trunk/plugins/luamacro/_globalinfo.lua
==============================================================================
--- trunk/plugins/luamacro/_globalinfo.lua [windows-1251] (original)
+++ trunk/plugins/luamacro/_globalinfo.lua [windows-1251] Tue Jun 16 11:20:37 2015
@@ -1,6 +1,6 @@
function export.GetGlobalInfo()

return {

- Version = { 1, 0, 0, 517 },

+ Version = { 1, 0, 0, 518 },

MinFarVersion = { 3, 0, 0, 4363 },

Guid = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"),

Title = "LuaMacro",


Modified: trunk/plugins/luamacro/changelog
==============================================================================
--- trunk/plugins/luamacro/changelog [utf-8] (original)
+++ trunk/plugins/luamacro/changelog [utf-8] Tue Jun 16 11:20:37 2015
@@ -1,4 +1,9 @@
-shmuel 16.06.2015 12:37:41 +0200 - build 517

+shmuel 16.06.2015 14:16:24 +0200 - build 518

+

+1. Продолжение 516: если пользователь назначил свой хоткей, то он имеет преимущество перед

+ автоматически назначаемым.

+

+shmuel 16.06.2015 12:37:41 +0200 - build 517



1. Вместо локальной переменной 'status' использовалась глобальная.




Modified: trunk/plugins/luamacro/luamacro.rc
==============================================================================
--- trunk/plugins/luamacro/luamacro.rc (original)
+++ trunk/plugins/luamacro/luamacro.rc Tue Jun 16 11:20:37 2015
@@ -1,6 +1,6 @@
#include <farversion.hpp>



-#define PLUGIN_BUILD 517

+#define PLUGIN_BUILD 518

#define PLUGIN_DESC "Lua Macros for Far Manager"

#define PLUGIN_NAME "LuaMacro"

#define PLUGIN_FILENAME "luamacro.dll"


Modified: trunk/plugins/luamacro/utils.lua
==============================================================================
--- trunk/plugins/luamacro/utils.lua [windows-1251] (original)
+++ trunk/plugins/luamacro/utils.lua [windows-1251] Tue Jun 16 11:20:37 2015
@@ -793,10 +793,12 @@
descr = ("< No description: Id=%d >"):format(macro.id)

end

local ch = i<10 and i or i<36 and string.char(i+55)

- menuitems[i] = { text = ch and ("&"..ch..". "..descr) or descr }

- end

-

- local props, bkeys = {Title=Msg.UtExecuteMacroTitle,Bottom=Msg.UtExecuteMacroBottom}, {{BreakKey="A+F4"}}

+ menuitems[i] = { text = ch and (ch..". "..descr) or descr }

+ end

+

+ local props, bkeys =

+ { Title=Msg.UtExecuteMacroTitle, Bottom=Msg.UtExecuteMacroBottom, Flags="FMENU_AUTOHIGHLIGHT" },

+ { {BreakKey="A+F4"} }

while true do

local item, pos = far.Menu(props, menuitems, bkeys)

if not item then