liujianjun/tslediter
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

更新动态库，更新界面库，更新编辑器

Browse Source
This commit is contained in:
liujianjun
2025-04-29 11:02:16 +08:00
parent ef1986a030
commit 5a31db348a
34 changed files with 224 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
designer/teditorform.tsf
+9 -12
View File
@@ -593,6 +593,7 @@ type teditorform = class(TVCform) //
Function SearDirMenuClick(o,e);
begin
FSearchDir.SetData(FDirs);
center_popup_wnd(FSearchDir,true);
if FSearchDir.ShowModal() then
begin
ndirs :=FSearchDir.GetData();
@@ -1271,14 +1272,10 @@ type tsearchdir = class(TCustomControl)
WsSysMenu := true;
Fidx := -1;
FFolder := new TFolderChooseADlg(self);
FFolder.parent := self;
rc:=_wapi.GetScreenRect();
l:=(rc[2]-rc[0])/2-400;
t:=(rc[3]-rc[1])/2-300;
SetBoundsRect(array(l,t,545+l+5,310+t+15));
FFolder.parent := self;
FLists := array();
FBtns := array();
for i,v in array(array(2,28,120,230),array(148,2,500,230)) do
for i,v in array(array(2,28,220,430),array(248,2,700,430)) do
begin
ls := new tdirlistbox(self);
ls.SetBoundsRect(v);
@@ -1291,11 +1288,11 @@ type tsearchdir = class(TCustomControl)
if o.ItemIndex<0 then return e.skip;
end
btrecs := array(
array(124,3,144,25),
array(124,206,144,230),
array(502,3,528,25),
array(502,206,528,230),
array(400,240,500,265)
array(224,3,244,25),
array(224,406,244,430),
array(702,3,728,25),
array(702,406,728,430),
array(600,440,700,465)
);
btcolor := array(0x00c800,0x0000c8,0x00c800,0x0000c8,0);
btcolor := array();
@@ -1314,7 +1311,7 @@ type tsearchdir = class(TCustomControl)
FBtns[4].autosize := true;
/////////////////////////////////
FEdit := new tedit(self);
FEdit.SetBoundsRect(array(2,2,120,26));
FEdit.SetBoundsRect(array(2,2,220,26));
FEdit.parent := self;
FEdit.onkeyup := thisfunction(editkeyup);
FEdit.placeholder := "查找or添加";
designer/udesignerproject.tsf
+21 -29
View File
@@ -1293,17 +1293,6 @@ type %s=class(%s)
begin
inherited;
end
function Recycling();override; //回收变量
begin
inherited;
ci := self.classinfo(); //将成员变量赋值为nil避免循环引用
for i,v in ci["members"] do
begin
if v["const"] then continue;
if v["static"] then continue;
invoke(self,v["name"],nil);
end
end
end
@@ -3082,24 +3071,6 @@ r := format(%% type %s=class(tdcreateform)
begin
inherited;
end
function DoControlAlign();override;//对齐子控件
begin
//当窗口大小改变时,该函数会被调用,
//可以通过 clientrect 获取客户区大小,设置子控件的位置以及大小
//如果自己处理了子控件的对齐,就可以去掉 inherited
inherited;
end
function Recycling();override; //回收变量
begin
inherited;
ci := self.classinfo(); //将成员变量赋值为nil避免循环引用
for i,v in ci["members"] do
begin
if v["const"] then continue;
if v["static"] then continue;
invoke(self,v["name"],nil);
end
end
end
%%,n);
return r;
@@ -3351,3 +3322,24 @@ begin
end
end.
{*
function DoControlAlign();override;//对齐子控件
begin
//当窗口大小改变时,该函数会被调用,
//可以通过 clientrect 获取客户区大小,设置子控件的位置以及大小
//如果自己处理了子控件的对齐,就可以去掉 inherited
inherited;
end
function Recycling();override; //回收变量
begin
inherited;
ci := self.classinfo(); //将成员变量赋值为nil避免循环引用
for i,v in ci["members"] do
begin
if v["const"] then continue;
if v["static"] then continue;
invoke(self,v["name"],nil);
end
end
*}
designer/utslcodeeditor.tsf
+5 -5
View File
@@ -2825,7 +2825,7 @@ type TEditer=class(TCustomcontrol) //
end else
if pos("定位",cp)=1 then
begin
InitShowWndPos(FGotoLineWnd,"g",200,200);
center_popup_wnd(FGotoLineWnd,true);//InitShowWndPos(FGotoLineWnd,"g",200,200);
FGotoLineWnd.ShowGoto();
return;
end else
@@ -3106,7 +3106,7 @@ type TEditer=class(TCustomcontrol) //
begin
d := FOpenHistory.Data;
FHistoryWnd.SetData(d);
InitShowWndPos(FHistoryWnd,"history",100,100);
center_popup_wnd(FHistoryWnd,true);//InitShowWndPos(FHistoryWnd,"history",100,100);
FHistoryWnd.ShowModal();
end
end
@@ -3236,7 +3236,7 @@ type TEditer=class(TCustomcontrol) //
"快捷键说明":
begin
if not FShortCutshower.Parent then FShortCutshower.Parent := self;
InitShowWndPos(FShortCutshower,"surcut",500,150,true);
center_popup_wnd(FShortCutshower,true);//InitShowWndPos(FShortCutshower,"surcut",500,150,true);
FShortCutshower.Show();
end
"撤销":
@@ -3614,7 +3614,7 @@ type TEditer=class(TCustomcontrol) //
end
ord("J"):
begin
InitShowWndPos(ffuncfind,"ff",200,150);
center_popup_wnd(ffuncfind,true);//InitShowWndPos(ffuncfind,"ff",200,150);
ffuncfind.show_finder();
return true;
end
@@ -3642,7 +3642,7 @@ type TEditer=class(TCustomcontrol) //
end
ord("G"):
begin
InitShowWndPos(FGotoLineWnd,"g",200,200);
center_popup_wnd(FGotoLineWnd,true);//InitShowWndPos(FGotoLineWnd,"g",200,200);
FGotoLineWnd.ShowGoto();
return true;
end
designer/utslvcldcomponents.tsf
+63 -8
View File
@@ -2026,6 +2026,7 @@ type TDSaveFileADlg = class(TDRootComponent)
**}
function HitTip();override;
begin
return inherited;
return "文件保存选择";
end
function bitmapinfo();override;
@@ -2068,6 +2069,7 @@ type TDColorChoose = class(TDRootComponent)
**}
function HitTip();override;
begin
return inherited;
return "颜色选择";
end
function bitmapinfo();override;
@@ -2099,6 +2101,7 @@ type TDFontChoose = class(TDRootComponent)
**}
function HitTip();override;
begin
return inherited;
return "字体选择";
end
function classification();override;
@@ -2131,6 +2134,7 @@ type TDFolderChoose = class(TDRootComponent)
**}
function HitTip();override;
begin
return inherited;
return "目录选择";
end
function classification();override;
@@ -2163,6 +2167,7 @@ type TDToolButton = class(TDComponent)
**}
function HitTip();override;
begin
return inherited;
return "toolbutton";
end
function classification();override;
@@ -2530,6 +2535,7 @@ type TDActionList = class(TDRootComponent)
**}
function HitTip();override;
begin
return inherited;
return "actionlist";
end
function CheckChild(cd);override;
@@ -2715,6 +2721,7 @@ end
type TDtlogincontrol = class(TDRootComponent)
function HitTip();override;
begin
return inherited;
return "登陆天软";
end
function classification();override;
@@ -2801,8 +2808,47 @@ C6D53F7109130000000049454E44AE42608200";
);
end
end
//**************tgraphicsctl*****************************
type tdgraphicsctl = class(TDComponent)
{**
@explan(说明) tgraphicsctl 绘图控件 %%
**}
function HitTip();override;
begin
return inherited;
end
function bitmapinfo();override;
begin
return "9002000000000000000200000002000000010000002D0200003C0000000000000
004000000040000000400000008000000030000000B000000E601000074797065
64617461696D6789504E470D0A1A0A0000000D494844520000001800000018080
6000000E0773DF8000000017352474200AECE1CE90000000467414D410000B18F
0BFC6105000000097048597300000EC300000EC301C76FA8640000017B4944415
4484BB5953D4BC4401086F30753FA818DBD8536D676FA030405F5C04A512C4402
121434C559088A958AD8A8855A9CA068257737EE3B9B097B93CFE5CC03536C263
3CF4C12EE026A1916C4714C5114554618865E21B0000DEA708B343AD79A2008EC
131F4B80266E002D2F15B889AB27A2E1303D18741317E4740885828169BCB04FF
4F2C14746727A7A80DC451265512B481E882636884E6EF9C8B8451A2F814C0FC1
EA195F66A4C8DD40B6F012C8F488B95DBECCB8451A2FC1FC9E6D3E994A7ADF9CC
A8AF4F400391D424E80A6902C1F5B41F7915323451A9DAB15E0311DDE5841A7CB
A9ACC8DD40B67073A05280E9FB03A2FB372B583CE0D4489146E72A05981EFCF68
9663AE65D6C9A1F43F3B922E713424E80CF54583AB25BB831BD45F4FE95DE5082
F4033981CBCEA56D3ABB4D747A47B4766ECFEB497A43098D05D7CF442BE66BEAF
DD83326C70653E6B1BD7EDA6B453416E0656B307DDD168D054534D9A252304E08
A582FF222768F2A7EF13E827B0A03D88FE00082185F0F546C5F10000000049454
E44AE426082";
end
function WndClass();override;
begin
return Class(tgraphicsctl);
end
function Create(AOwner);override;
begin
inherited;
excludepropertys := array("childsizing");
fiscontainerdcmp := false;
end
end
//**************TSPinEdit*****************************
@@ -2812,7 +2858,7 @@ type TDSpinEdit = class(TDComponent)
**}
function HitTip();override;
begin
return "SpinEdit";
return inherited;
end
function bitmapinfo();override;
begin
@@ -3221,6 +3267,7 @@ end
type TDColorComboBox= class(TDComponent)
function HitTip();override;
begin
return inherited;
return "颜色下拉选择框";
end
function bitmapinfo();override;
@@ -3343,6 +3390,7 @@ end
type TDmessagebox = class(TDRootComponent)
function HitTip();override;
begin
return inherited;
return "提示框";
end
function bitmapinfo();override;
@@ -3458,7 +3506,9 @@ B42AAFB0D92EF9A97CCEA3101743140FDAF375D09D22364135D083CEE841618C7
end
end
type TDColorBox=class(TDComponent)
function HitTip();override;begin
function HitTip();override;
begin
return inherited;
return "颜色列表框";
end
function WndClass();override;begin
@@ -3525,7 +3575,8 @@ D60BA44F8013782F60023EBD3020000000049454E44AE42608200";
end
type TDProgressBar=class(TDComponent)
public
function HitTip();override;begin
function HitTip();override;
begin
return inherited;
return "进度条";
end
@@ -3562,7 +3613,8 @@ F80BE89DC603B9C603B9C603B9C603B9C603BD1EA27F2BABB3A7A95F430C00000
end
type TDCheckBtn=class(TDComponent)
public
function HitTip();override;begin
function HitTip();override;
begin
return inherited;
return "复选框";
end
@@ -3613,7 +3665,8 @@ end
type TDDateTimePicker=class(TDComponent)
private
public
function HitTip();override;begin
function HitTip();override;
begin
return inherited;
return "时间日期选择";
end
@@ -3639,7 +3692,8 @@ CC541E3100000000049454E44AE42608200";
end
type TDTimePicker=class(TDComponent)
public
function HitTip();override;begin
function HitTip();override;
begin
return inherited;
return "时间选择";
end
@@ -4042,6 +4096,7 @@ begin
class(tdworkerctl),
class(TDImageList),
class(TDClipBoard),
class(tdgraphicsctl),
class(TDMainMenu),class(TDPopUpMenu),class(TDMenu),
class(TDOpenFileADlg),class(TDSaveFileADlg),
class(TDColorChoose),class(TDFontChoose),class(TDFolderChoose),
designer/utslvcldesigner.tsf
+2
View File
@@ -1980,6 +1980,7 @@ type TPropEditGrid = class(TPropGrid) //
function Create(AOwner);
begin
inherited;
FobjProptype := p_properys;
end
end
@@ -2006,6 +2007,7 @@ type TEventEditGrid = class(TPropGrid) //
function Create(AOwner);
begin
inherited;
FobjProptype := p_evnets;
OndblClick := thisfunction(GridCellDblClick);
end
function GridCellDblClick(o,e);override;//双击处理
designer/utslvcldpropertytypes.tsf
+14 -2
View File
@@ -600,6 +600,9 @@ type TPropGrid = class(TTSLDataGrid)
@explan(说明)属性编辑器 %%
**}
protected
FobjProptype;
static const p_properys="peopery";
static const p_evnets="pevents";
FDesigner;
private
FCellEditers;
@@ -688,8 +691,17 @@ type TPropGrid = class(TTSLDataGrid)
//echo "\r\n",FComponent.name," ",pv,"===",tostn(od[index])," ",tostn(d);
end
SetValue(indexs union array(index),d);
rec := GetSubItemRect(i,j);
InvalidateRect(rec,true);
regets := array("parentfont":true,"parentcolor":true); /////////需要重新获取的属性
if regets[pv] then
begin
bkfc := FComponent;
FComponent := nil;
SetComponent(bkfc);
end else
begin
rec := GetSubItemRect(i,j);
InvalidateRect(rec,true);
end
end
currentLeave();
except