Mantis#0002905

FarGroup · Sep 8, 2015 · a6c0419 · a6c0419
1 parent 4ffd980
commit a6c0419
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/far/DlgGuid.hpp b/far/DlgGuid.hpp
@@ -170,3 +170,5 @@ DEFINE_GUID(RemoteDisconnectDriveError1Id,0xc9439386,0x9544,0x49bf,0x95,0x4b,0x6
 DEFINE_GUID(VHDDisconnectDriveErrorId,0xb890e6b0,0x5a9,0x4ed8,0xa4,0xc3,0xbb,0xc4,0xd2,0x9d,0xa3,0xbe);
 // {F3D46DC3-380B-4264-8BF8-10B05B897A5E}
 DEFINE_GUID(ChangeDriveCannotReadDiskErrorId,0xf3d46dc3,0x380b,0x4264,0x8b,0xf8,0x10,0xb0,0x5b,0x89,0x7a,0x5e);
+// {044EF83E-8146-41B2-97F0-404C2F4C7B69}
+DEFINE_GUID(ApplyCommandId,0x44ef83e,0x8146,0x41b2,0x97,0xf0,0x40,0x4c,0x2f,0x4c,0x7b,0x69);
diff --git a/far/changelog b/far/changelog
@@ -1,4 +1,12 @@
-w17 08.09.2015 16:09:18 +0300 - build 4416
+svs 08.09.2015 17:50:24 +0300 - build 4417
+
+1. Mantis#0002905: Присвоить гуид диалогу Apply command (CtrlG)
+
+    ApplyCommandId                   = {044EF83E-8146-41B2-97F0-404C2F4C7B69}  --> Dlg.Id
+    Диалог "Применить команду" (CtrlG)
+
+
+w17 08.09.2015 16:09:18 +0300 - build 4416
 
 1. Уточнение 4414 -typo
 

diff --git a/far/filelist.cpp b/far/filelist.cpp
@@ -4837,7 +4837,19 @@ bool FileList::ApplyCommand()
 	static string strPrevCommand;
 	string strCommand;
 
-	if (!GetString(MSG(MAskApplyCommandTitle),MSG(MAskApplyCommand),L"ApplyCmd",strPrevCommand.data(),strCommand,L"ApplyCmd",FIB_BUTTONS|FIB_EDITPATH|FIB_EDITPATHEXEC) || !SetCurPath())
+	if (!GetString(
+			MSG(MAskApplyCommandTitle),
+			MSG(MAskApplyCommand),
+			L"ApplyCmd",
+			strPrevCommand.data(),
+			strCommand,
+			L"ApplyCmd",
+			FIB_BUTTONS|FIB_EDITPATH|FIB_EDITPATHEXEC,
+			nullptr,
+			nullptr,
+			nullptr,
+			&ApplyCommandId) ||
+		!SetCurPath())
 		return false;
 
 	strPrevCommand = strCommand;

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4416)m4_dnl
+m4_define(BUILD,4417)m4_dnl