From 6898dc5592640a0429f0b4b0d2c691495b4bbbe2 Mon Sep 17 00:00:00 2001 From: Shmuel Zeigerman Date: Fri, 19 Feb 2016 21:41:15 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BD=D1=8E,=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D0=BC=D0=BE=D0=BC=D1=83=20=D1=84=D1=83=D0=BD?= =?UTF-8?q?=D0=BA=D1=86=D0=B8=D0=B5=D0=B9=20Panel.CustomSortMenu,=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D1=81=D0=B2=D0=BE=D0=B5=D0=BD=20GUID=20"C323FBCF-6?= =?UTF-8?q?803-4F2C-B8B4-E576E7F125DC".?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/luamacro/_globalinfo.lua | 2 +- plugins/luamacro/changelog | 6 +++++- plugins/luamacro/luamacro.rc | 2 +- plugins/luamacro/panelsort.lua | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/luamacro/_globalinfo.lua b/plugins/luamacro/_globalinfo.lua index 3cf96701fc..a6dd63209f 100644 --- a/plugins/luamacro/_globalinfo.lua +++ b/plugins/luamacro/_globalinfo.lua @@ -1,6 +1,6 @@ function export.GetGlobalInfo() return { - Version = { 1, 0, 0, 557 }, + Version = { 1, 0, 0, 558 }, MinFarVersion = { 3, 0, 0, 4450 }, Guid = win.Uuid("4EBBEFC8-2084-4B7F-94C0-692CE136894D"), Title = "LuaMacro", diff --git a/plugins/luamacro/changelog b/plugins/luamacro/changelog index eb3b943caf..10d5efae6b 100644 --- a/plugins/luamacro/changelog +++ b/plugins/luamacro/changelog @@ -1,4 +1,8 @@ -shmuel 19.02.2016 21:32:01 +0200 - build 557 +shmuel 19.02.2016 23:36:00 +0200 - build 558 + +1. Меню, выводимому функцией Panel.CustomSortMenu, присвоен GUID "C323FBCF-6803-4F2C-B8B4-E576E7F125DC". + +shmuel 19.02.2016 21:32:01 +0200 - build 557 1. M#3175: "Отключить в LuaMacro редирект WOW64 для функций работы с реестром" LuaFAR: добавлена функция win.DeleteRegKeyEx. Описание в мануале. diff --git a/plugins/luamacro/luamacro.rc b/plugins/luamacro/luamacro.rc index e0755d22d8..22208f5191 100644 --- a/plugins/luamacro/luamacro.rc +++ b/plugins/luamacro/luamacro.rc @@ -1,6 +1,6 @@ #include -#define PLUGIN_BUILD 557 +#define PLUGIN_BUILD 558 #define PLUGIN_DESC "Lua Macros for Far Manager" #define PLUGIN_NAME "LuaMacro" #define PLUGIN_FILENAME "luamacro.dll" diff --git a/plugins/luamacro/panelsort.lua b/plugins/luamacro/panelsort.lua index 9df0dac38f..b939b0ab3c 100644 --- a/plugins/luamacro/panelsort.lua +++ b/plugins/luamacro/panelsort.lua @@ -114,12 +114,13 @@ local function SetCustomSortMode (nMode, whatpanel) end local function CustomSortMenu() + local Id = win.Uuid("C323FBCF-6803-4F2C-B8B4-E576E7F125DC") local items, bkeys = {}, {{BreakKey="C+RETURN"},{BreakKey="CS+RETURN"}} for k,v in pairs(CustomSortModes) do items[#items+1] = { text=v.Description and tostring(v.Description) or Msg.PSDefaultMenuItemText..k; Mode=k; } end table.sort(items, function(a,b) return a.Mode < b.Mode end) - local r, pos = far.Menu({Title=Msg.PSMenuTitle}, items, bkeys) + local r, pos = far.Menu({Title=Msg.PSMenuTitle, Id=Id}, items, bkeys) if r then if r.BreakKey == "C+RETURN" then SetCustomSortMode(items[pos].Mode,1)