From 8d828d167fe5eb9887bf185d7052996c8853d405 Mon Sep 17 00:00:00 2001 From: JianjunLiu Date: Tue, 14 Mar 2023 15:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 浼樺寲 --- designer/utslcodeeditor.tsf | 3 ++- funcext/tvclib/ugtkinterface.tsf | 13 ++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/designer/utslcodeeditor.tsf b/designer/utslcodeeditor.tsf index b5ea2a6..97cb15c 100644 --- a/designer/utslcodeeditor.tsf +++ b/designer/utslcodeeditor.tsf @@ -855,8 +855,9 @@ type TExecuteEditer=class(TCustomControl) //执 begin if 13=e.charcode then begin + if o.Completion and o.Completion.Visible then return ; e.skip := true; - doSaveCurrentName(); + //doSaveCurrentName(); end end {FMemo.OnKeyDown := function(o,e) diff --git a/funcext/tvclib/ugtkinterface.tsf b/funcext/tvclib/ugtkinterface.tsf index eefcd7e..ea36917 100644 --- a/funcext/tvclib/ugtkinterface.tsf +++ b/funcext/tvclib/ugtkinterface.tsf @@ -3193,7 +3193,18 @@ type tgtkapis = class() //gtk function openresourcemanager(p); //打开资源管理器 begin if ifstring(p) then - return tsl_gtk_execsystem(format('nautilus "%s" &',p)); + begin + for i := length(p) downto 1 do + begin + if p[i]="/" then + begin + tsl_gtk_execsystem(format('caja "%s" &',p[1:i])); + break; + end + end + tsl_gtk_execsystem(format('nautilus "%s" &',p)); + return 1; + end end /////////////////////////////pipe process///////////执行程序相关///////////////////////////// //function tsl_gtk_closehandle(p:pointer):integer;cdecl;external "plugin/libTSLUIL.so";