소스 검색

FIX: View and Edit files with a space in the name

Alexander Koblov 14 년 전
부모
커밋
ad53ca4989
2개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      src/platform/unix/ushellcontextmenu.pas
  2. 4 4
      src/platform/win/ushellcontextmenu.pas

+ 2 - 2
src/platform/unix/ushellcontextmenu.pas

@@ -354,14 +354,14 @@ begin
               // now add VIEW item
               mi:=TMenuItem.Create(miActions);
               mi.Caption:= rsMnuView;
-              mi.Hint:= '{!VIEWER} ' + aFile.Path + aFile.Name;
+              mi.Hint:= '{!VIEWER} ' + QuoteStr(aFile.FullPath);
               mi.OnClick:=Self.ContextMenuSelect; // handler
               miActions.Add(mi);
 
               // now add EDITconfigure item
               mi:=TMenuItem.Create(miActions);
               mi.Caption:= rsMnuEdit;
-              mi.Hint:= '{!EDITOR} ' + aFile.Path + aFile.Name;
+              mi.Hint:= '{!EDITOR} ' + QuoteStr(aFile.FullPath);
               mi.OnClick:=Self.ContextMenuSelect; // handler
               miActions.Add(mi);
             end;

+ 4 - 4
src/platform/win/ushellcontextmenu.pas

@@ -73,7 +73,7 @@ implementation
 
 uses
   LCLProc, Dialogs, uGlobs, uLng, uMyWindows, uShellExecute,
-  fMain;
+  fMain, uDCUtils;
 
 const
   USER_CMD_ID = $1000;
@@ -343,12 +343,12 @@ begin
                   InsertMenuItemEx(hActionsSubMenu,0, nil, 0, 0, MFT_SEPARATOR);
 
                 // now add VIEW item
-                sCmd:= '{!VIEWER} ' + aFile.Path + aFile.Name;
+                sCmd:= '{!VIEWER} ' + QuoteStr(aFile.FullPath);
                 I := sl.Add(sCmd);
                 InsertMenuItemEx(hActionsSubMenu,0, PWChar(UTF8Decode(rsMnuView)), 1, I + USER_CMD_ID, MFT_STRING);
 
                 // now add EDIT item
-                sCmd:= '{!EDITOR} ' + aFile.Path + aFile.Name;
+                sCmd:= '{!EDITOR} ' + QuoteStr(aFile.FullPath);
                 I := sl.Add(sCmd);
                 InsertMenuItemEx(hActionsSubMenu,0, PWChar(UTF8Decode(rsMnuEdit)), 1, I + USER_CMD_ID, MFT_STRING);
               end;
@@ -509,4 +509,4 @@ begin
 end;
 
 end.
-
+