diff --git a/designer/examples/ListBox/e_listbox.tpj b/d_examples/ListBox/e_listbox.tpj similarity index 100% rename from designer/examples/ListBox/e_listbox.tpj rename to d_examples/ListBox/e_listbox.tpj diff --git a/designer/examples/ListBox/e_listbox.tsl b/d_examples/ListBox/e_listbox.tsl similarity index 100% rename from designer/examples/ListBox/e_listbox.tsl rename to d_examples/ListBox/e_listbox.tsl diff --git a/designer/examples/ListBox/e_listboxmain.tsf b/d_examples/ListBox/e_listboxmain.tsf similarity index 100% rename from designer/examples/ListBox/e_listboxmain.tsf rename to d_examples/ListBox/e_listboxmain.tsf diff --git a/designer/examples/ListBox/resource.tfm/e_listboxmain.tfm b/d_examples/ListBox/resource.tfm/e_listboxmain.tfm similarity index 100% rename from designer/examples/ListBox/resource.tfm/e_listboxmain.tfm rename to d_examples/ListBox/resource.tfm/e_listboxmain.tfm diff --git a/designer/examples/ListView/e_listview.tpj b/d_examples/ListView/e_listview.tpj similarity index 100% rename from designer/examples/ListView/e_listview.tpj rename to d_examples/ListView/e_listview.tpj diff --git a/designer/examples/ListView/e_listview.tsl b/d_examples/ListView/e_listview.tsl similarity index 100% rename from designer/examples/ListView/e_listview.tsl rename to d_examples/ListView/e_listview.tsl diff --git a/designer/examples/ListView/e_listviewmain.tsf b/d_examples/ListView/e_listviewmain.tsf similarity index 100% rename from designer/examples/ListView/e_listviewmain.tsf rename to d_examples/ListView/e_listviewmain.tsf diff --git a/designer/examples/ListView/resource.tfm/e_listviewmain.tfm b/d_examples/ListView/resource.tfm/e_listviewmain.tfm similarity index 100% rename from designer/examples/ListView/resource.tfm/e_listviewmain.tfm rename to d_examples/ListView/resource.tfm/e_listviewmain.tfm diff --git a/designer/examples/TreeView/e_treeview.tpj b/d_examples/TreeView/e_treeview.tpj similarity index 100% rename from designer/examples/TreeView/e_treeview.tpj rename to d_examples/TreeView/e_treeview.tpj diff --git a/designer/examples/TreeView/e_treeview.tsl b/d_examples/TreeView/e_treeview.tsl similarity index 100% rename from designer/examples/TreeView/e_treeview.tsl rename to d_examples/TreeView/e_treeview.tsl diff --git a/designer/examples/TreeView/e_treeviewmain.tsf b/d_examples/TreeView/e_treeviewmain.tsf similarity index 100% rename from designer/examples/TreeView/e_treeviewmain.tsf rename to d_examples/TreeView/e_treeviewmain.tsf diff --git a/designer/examples/TreeView/resource.tfm/e_treeviewmain.tfm b/d_examples/TreeView/resource.tfm/e_treeviewmain.tfm similarity index 100% rename from designer/examples/TreeView/resource.tfm/e_treeviewmain.tfm rename to d_examples/TreeView/resource.tfm/e_treeviewmain.tfm diff --git a/designer/examples/action/atsl.tsl b/d_examples/action/atsl.tsl similarity index 100% rename from designer/examples/action/atsl.tsl rename to d_examples/action/atsl.tsl diff --git a/designer/examples/action/e_action.tpj b/d_examples/action/e_action.tpj similarity index 100% rename from designer/examples/action/e_action.tpj rename to d_examples/action/e_action.tpj diff --git a/designer/examples/action/e_action.tsl b/d_examples/action/e_action.tsl similarity index 100% rename from designer/examples/action/e_action.tsl rename to d_examples/action/e_action.tsl diff --git a/designer/examples/action/e_actionmain.tsf b/d_examples/action/e_actionmain.tsf similarity index 100% rename from designer/examples/action/e_actionmain.tsf rename to d_examples/action/e_actionmain.tsf diff --git a/designer/examples/action/resource.tfm/e_actionmain.tfm b/d_examples/action/resource.tfm/e_actionmain.tfm similarity index 100% rename from designer/examples/action/resource.tfm/e_actionmain.tfm rename to d_examples/action/resource.tfm/e_actionmain.tfm diff --git a/designer/examples/menu/e_menu.tpj b/d_examples/menu/e_menu.tpj similarity index 100% rename from designer/examples/menu/e_menu.tpj rename to d_examples/menu/e_menu.tpj diff --git a/designer/examples/menu/e_menu.tsl b/d_examples/menu/e_menu.tsl similarity index 100% rename from designer/examples/menu/e_menu.tsl rename to d_examples/menu/e_menu.tsl diff --git a/designer/examples/menu/e_menumain.tsf b/d_examples/menu/e_menumain.tsf similarity index 100% rename from designer/examples/menu/e_menumain.tsf rename to d_examples/menu/e_menumain.tsf diff --git a/designer/examples/menu/resource.tfm/e_menumain.tfm b/d_examples/menu/resource.tfm/e_menumain.tfm similarity index 100% rename from designer/examples/menu/resource.tfm/e_menumain.tfm rename to d_examples/menu/resource.tfm/e_menumain.tfm diff --git a/designer/examples/toolbar/e_toolbar.tpj b/d_examples/toolbar/e_toolbar.tpj similarity index 100% rename from designer/examples/toolbar/e_toolbar.tpj rename to d_examples/toolbar/e_toolbar.tpj diff --git a/designer/examples/toolbar/e_toolbar.tsl b/d_examples/toolbar/e_toolbar.tsl similarity index 100% rename from designer/examples/toolbar/e_toolbar.tsl rename to d_examples/toolbar/e_toolbar.tsl diff --git a/designer/examples/toolbar/e_toolbarmain.tsf b/d_examples/toolbar/e_toolbarmain.tsf similarity index 100% rename from designer/examples/toolbar/e_toolbarmain.tsf rename to d_examples/toolbar/e_toolbarmain.tsf diff --git a/designer/examples/toolbar/resource.tfm/e_toolbarmain.tfm b/d_examples/toolbar/resource.tfm/e_toolbarmain.tfm similarity index 100% rename from designer/examples/toolbar/resource.tfm/e_toolbarmain.tfm rename to d_examples/toolbar/resource.tfm/e_toolbarmain.tfm diff --git a/designer/tslediter.exe.cmd b/designer/tslediter.exe.cmd deleted file mode 100644 index 5180bdc..0000000 --- a/designer/tslediter.exe.cmd +++ /dev/null @@ -1 +0,0 @@ -"%~dp0..\tsl.exe" "%~dp0tslediter.tsl" -libpath "%~dp0;" \ No newline at end of file diff --git a/designer/tslvcldesigner.tsf b/designer/tslvcldesigner.tsf index f6cbd59..75dea60 100644 --- a/designer/tslvcldesigner.tsf +++ b/designer/tslvcldesigner.tsf @@ -366,7 +366,7 @@ type TVclDesigner = class(tvcform) begin if f[i]=fio then begin - ef := f[1:i]+"designer"+fio+"examples"; + ef := f[1:i]+"d_examples"; if filelist("",ef) then begin FProjectFileOpener.initialDir := ef; @@ -2055,9 +2055,11 @@ begin end function staticInit(); begin + global g_orig_lib_path; np := getdesignerpath()+"dcmps"+ioFileseparator(); CreateDirWithFileName(np+"1.txt"); - tsl_setlibpath_( np+";"+tsl_getlibpath_()); + g_orig_lib_path := tsl_getlibpath_(); + tsl_setlibpath_( np+";"+g_orig_lib_path); ini := static getdesginerini(); //class(TDSocketServer),class(TDSocketClient), //注册的componet diff --git a/designer/udesignerproject.tsf b/designer/udesignerproject.tsf index 21809d5..8b6436d 100644 --- a/designer/udesignerproject.tsf +++ b/designer/udesignerproject.tsf @@ -1083,7 +1083,26 @@ type TProjectView = class(TVCForm) // fgoformmenu.Enabled := false; return; end - FTslEditer.TslSearchDir := array(p,Getfuncextdir()); + ////////////////////从新构造search目录/////////////////////////////// + global g_orig_lib_path; + sdir := array(p); + idx := 1; + if ifstring(g_orig_lib_path) then + begin + for i,v in str2array(g_orig_lib_path,";") do + begin + tm := trim(v); + if tm then + begin + sdir[idx++] := tm; + end + end + end else + begin + sdir[idx++] := Getfuncextdir(); + end + ///////////////////////////////////// + FTslEditer.TslSearchDir := sdir;//array(p,Getfuncextdir()); FExecEntry := FprojName; if d["entryscript"]then begin @@ -2037,6 +2056,7 @@ BD141CA912494F502D48D224F45050274A21E03806FF2C7CA7516022D7D000000 Onclose := thisfunction(CloseHidden); exe := gettslexe(); fio := ioFileseparator(); + global g_orig_lib_path; FDefaultcmdline := format('"%s" "%s" -libpath "%s"',"$(TSL_EXE)","$(FULL_CURRENT_PATH)","$(SEARCH_PATH)"); end function getExecuteEditerSetcmdline(); diff --git a/designer/vcldesigner.exe.cmd b/designer/vcldesigner.exe.cmd deleted file mode 100644 index 9eaa9c8..0000000 --- a/designer/vcldesigner.exe.cmd +++ /dev/null @@ -1 +0,0 @@ -"%~dp0..\tsl.exe" "%~dp0vcldesigner.tsl" -libpath "%~dp0;" \ No newline at end of file diff --git a/exec_tsl/tslediter.exe.cmd b/exec_tsl/tslediter.exe.cmd new file mode 100644 index 0000000..def7d5b --- /dev/null +++ b/exec_tsl/tslediter.exe.cmd @@ -0,0 +1 @@ +"%~dp0..\tsl.exe" "%~dp0tslediter.tsl" -libpath "%~dp0;%~dp0..\designer\;" \ No newline at end of file diff --git a/designer/tslediter.tsl b/exec_tsl/tslediter.tsl similarity index 100% rename from designer/tslediter.tsl rename to exec_tsl/tslediter.tsl diff --git a/designer/tslediter.tsl.about b/exec_tsl/tslediter.tsl.about similarity index 100% rename from designer/tslediter.tsl.about rename to exec_tsl/tslediter.tsl.about diff --git a/exec_tsl/vcldesigner.exe.cmd b/exec_tsl/vcldesigner.exe.cmd new file mode 100644 index 0000000..5ac8cc8 --- /dev/null +++ b/exec_tsl/vcldesigner.exe.cmd @@ -0,0 +1 @@ +"%~dp0..\tsl.exe" "%~dp0vcldesigner.tsl" -libpath "%~dp0;%~dp0..\designer\;" \ No newline at end of file diff --git a/designer/vcldesigner.tsl b/exec_tsl/vcldesigner.tsl similarity index 100% rename from designer/vcldesigner.tsl rename to exec_tsl/vcldesigner.tsl diff --git a/designer/vcldesigner.tsl.about b/exec_tsl/vcldesigner.tsl.about similarity index 100% rename from designer/vcldesigner.tsl.about rename to exec_tsl/vcldesigner.tsl.about diff --git a/funcext/tvclib/utslvclstdctl.tsf b/funcext/tvclib/utslvclstdctl.tsf index a3d3954..a4d21df 100644 --- a/funcext/tvclib/utslvclstdctl.tsf +++ b/funcext/tvclib/utslvclstdctl.tsf @@ -6772,10 +6772,11 @@ type tcustomprocess = class(tcomponent) // **} if fprocesshandle then return 0; if fexecstr then - begin - if not(ifstring(e) and e) then return 0; + begin e := exe; + if not(ifstring(e) and e) then return 0; arg := cmd; + end else begin if not parserasexeclevparam(exe,cmd,e,arg,envp) then return 0; diff --git a/tsleditor.exe b/tsleditor.exe index b2d2126..f3ae176 100644 Binary files a/tsleditor.exe and b/tsleditor.exe differ diff --git a/tslvcltool.exe b/tslvcltool.exe index 0713af9..82f96e9 100644 Binary files a/tslvcltool.exe and b/tslvcltool.exe differ