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

修改资源文件tfm位置

Browse Source
This commit is contained in:
liujianjun
2025-05-19 15:28:51 +08:00
parent 60749c0d93
commit e4d6b23680
52 changed files with 2169 additions and 1311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MathKrnl.dll
BIN
View File
Binary file not shown.
TSLInterp.dll
BIN
View File
Binary file not shown.
d_examples/ListBox/resource.tfm/e_listboxmain.tfm → d_examples/ListBox/e_listboxmain.tfm
View File
d_examples/ListView/resource.tfm/e_listviewmain.tfm → d_examples/ListView/e_listviewmain.tfm
View File
d_examples/TreeView/resource.tfm/e_treeviewmain.tfm → d_examples/TreeView/e_treeviewmain.tfm
View File
d_examples/action/resource.tfm/e_actionmain.tfm → d_examples/action/e_actionmain.tfm
View File
d_examples/desktop.ini
-4
View File
@@ -1,4 +0,0 @@
[ViewState]
Mode=
Vid=
FolderType=Generic
d_examples/menu/e_menumain.tfm
+103
View File
@@ -0,0 +1,103 @@
object e_menumain1:e_menumain
caption="²Ëµ¥·¶Àý"
height=392
left=488
mainmenu=mainmenu1
onclose=e_menumain1_close
popupmenu=popupmenu1
top=220
width=375
object mainmenu1:tmainmenu
left=58
top=73
height=30
width=30
object menu1:tmenu
caption="menu1"
object menu3:tmenu
caption="²Ëµ¥3"
onclick=menuclick
end
object menu4:tmenu
caption="menu4"
object menu5:tmenu
caption="menu5"
onclick=menuclick
end
end
end
object menu2:tmenu
caption="menu2"
onclick=menuclick
end
end
object popupmenu1:tpopupmenu
left=172
top=98
height=30
width=30
caption="popupmenu1"
object menu6:tmenu
bitmap={ 900200000000000000020000000200000001000000480300003C0000000000000
004000000040000000400000008000000030000000B0000000103000074797065
64617461696D6789504E470D0A1A0A0000000D494844520000002000000020080
6000000737A7AF4000000017352474200AECE1CE90000000467414D410000B18F
0BFC6105000000097048597300000EC300000EC301C76FA864000002964944415
45847ED964B68135114865D894BC1951BE946A42B752356505C54042D882E846A
5BA13B6B151491D295B4882B2D08E293D6422D55918AF5416AC5A22008BAD085D
45A6D9A986812E3249989B1769263FEDB7BAF379957122DA5900F0EC99C398F7F
E69E99B9CB689159FA02326F5FD3B7CE760AECAF67BFC6D8437EA634FE49803E3
A4293B5AB6862CDF2020B1F3BC423BCF114103BDF455AFF2532E331EEF9CBCCBE
EDACE174FD061687C64284F1CCC7A3DC2910F0BDA79B12B76EF0A379444158A07
127690357C94CFC60E770DBD17C76F23D3B065F5AF7B2D868F729EE71470A885F
BF201B850E37CAA210E56FA893E784059A765162A897B27A8AC509D098D5686FE
61E77A480ACA153B0A54136800895F4AB17143DDB49D33B36CA1866352B2898BF
EAE4DD01CAFD4C33C1F063494AC13203C6D347ECD6A65F8E738F15E3F918454E9
FA0CFDB6A0BC47C58B792426D0728393C48B95F191EED8EE7107A618CFBE86B47
1B4D6DAA2910F371FD6A0A1F6FA5D4C81D22738E475B910252F786D8731CE93AC
93DE5A3E7DF01688AE6AA18888348FDC903A25C8E47CF2305A80973A120F75A31
6311FECF1DDD779FC2475BD8B2A8B5B16CEA7C48017883C52F9FCBDFD251EEB1F
23BE867457035E5907A3C4CA12307D9C0223F71BB9F9F71980134FAB465ADE551
C260A20086B45250437D746D05884630153701D1331DB6F3632635CABC7BC38FA
CFC3701221E312AFEDD9B995F7D5BAA2CB80027BFA02AA02AA02A606909C8EA49
B9FF2B061B98E24D0CA848C0ECD4844CC477A152C4C70BE6F43AB6150066F66C6
589F12B3DDC533EC81502C446B6184701DACD6B32195F46AC7B39861C91EFF6F9
761400B0D6A248A5A6F55DE4D5EC711500B08ED840408C9D61176C67C829657E3
C052C348B2C80E80FBF5E212863E9B00A0000000049454E44AE426082 }
caption="menu6"
onclick=menuclick
end
object menu7:tmenu
bitmap={ 9002000000000000000200000002000000010000008C0300003C0000000000000
004000000040000000400000008000000030000000B0000004503000074797065
64617461696D6789504E470D0A1A0A0000000D494844520000002000000020080
6000000737A7AF4000000017352474200AECE1CE90000000467414D410000B18F
0BFC6105000000097048597300000EC300000EC301C76FA864000002DA4944415
45847C597BD6A54411886BD066BADD45E11BC01116C6C142F402C2CAC44112C94
947A031606B7515288918022A8202EF107D42A0988C4D5603624EBAE68B2C6282
A9FFB8CE73D993D993973768DF8C040767EDF39F3CDFB4DB6D87F66200193CDAF
76A6FEC1F6DF7C6FBBAFCDD9B6D1866DEF95BDD7E7ECE0AD79BBF0B46D77DF7DB
1C5D59FD9883449012BDF7FD995A94F6ED1AD97672B9791671DEBACA585940AB8
F8BC637B7A3BF527DE596BD8A189A69D7BDCB61BAF576C7CB66B23BD9D1FB9BD6
0BB6A6FFBFAEE1B9BB3B157CBD96C61A2022EBDF8D837D9F9276D9BEE7CCB5AE3
CCF4FA9CAEB7FAC69E7CD8CA5A37121470F4CE423E78C7D586D5E757B396EAD46
6965D7C681EE60CB141006A35E8C483A5AC76780EF78E46F371A445FA04705EEA
CCC014A71EB55C49C14662227201442C4143273E5D8A63F716F349F93B0547495
F829A9B2572015C1B4DC8F995E12FAE9212411CA92FD75A380118871A89E03242
8BABA4447093E887A7082700F7D2245CA318FEE2136FBAC1BFCB44708DD50F570
527000BA5122389515C1CF41BAA8AC0C8E883A58313808F53899B85082D0EAA13
5544E0A2B4EB189C00920995586A11DF17FCC541F53EBE88900362E1B491CCC00
99063E1EB451045E7E2E2A0858A48446843E40FDAC8A4E004F02326A08C988032
24405EE304B0432A438ACB1846808E8063072740B93E1684318611A02024F0C10
99041945DC310C308D0353C3BE95DC3974B6BF964654654645001BE1129DE9C00
3830FEC70B5256EC33A8007D694AB3FBC3D5E50248106A4C2523A1FE55F093118
94FE40248917AFF5549C7308800A56352BEFF58CD05008F054D5AE54142445352
F80F92A2D7F40980E3F7D77D7FB39F64A3539FB3DA75360800DD55CA663D4A635
F2A280050ABC194BF7996F35563440500E7A577A2CA20FF9810D4A197B04FA900
2062FDF7629582A770ADFDC7678CA4008171B05B2C141F279970C664529219F98
463C25507A1B2807F83D96FD95753C0FE2C3C9B0000000049454E44AE426082 }
caption="menu7"
onclick=menuclick
end
end
end
d_examples/menu/resource.tfm/e_menumain.tfm
-101
View File
@@ -1,101 +0,0 @@
object e_menumain1:e_menumain
caption="²Ëµ¥·¶Àý"
height=392
left=488
mainmenu=mainmenu1
onclose=e_menumain1_close
popupmenu=popupmenu1
top=220
width=375
object mainmenu1:tmainmenu
left=58
top=73
height=30
width=30
object menu1:tmenu
caption="menu1"
object menu3:tmenu
caption="²Ëµ¥3"
onclick=menuclick
end
object menu4:tmenu
caption="menu4"
object menu5:tmenu
caption="menu5"
onclick=menuclick
end
end
end
object menu2:tmenu
caption="menu2"
onclick=menuclick
end
end
object popupmenu1:tpopupmenu
left=172
top=98
height=30
width=30
caption="popupmenu1"
object menu6:tmenu
bitmap={ 0502000000060400000074797065000203000000696D670006040000006461746
100020103000089504E470D0A1A0A0000000D4948445200000020000000200806
000000737A7AF4000000017352474200AECE1CE90000000467414D410000B18F0
BFC6105000000097048597300000EC300000EC301C76FA8640000029649444154
5847ED964B68135114865D894BC1951BE946A42B752356505C54042D882E846A5
BA13B6B151491D295B4882B2D08E293D6422D55918AF5416AC5A22008BAD085D4
5A6D9A986812E3249989B1769263FEDB7BAF379957122DA5900F0EC99C398F7FE
69E99B9CB689159FA02326F5FD3B7CE760AECAF67BFC6D8437EA634FE49803E3A
4293B5AB6862CDF2020B1F3BC423BCF114103BDF455AFF2532E331EEF9CBCCBEE
DACE174FD061687C64284F1CCC7A3DC2910F0BDA79B12B76EF0A379444158A071
27690357C94CFC60E770DBD17C76F23D3B065F5AF7B2D868F729EE71470A885FB
F201B850E37CAA210E56FA893E784059A765162A897B27A8AC509D098D5686FE6
1E77A480ACA153B0A54136800895F4AB17143DDB49D33B36CA1866352B2898BFE
AE4DD01CAFD4C33C1F063494AC13203C6D347ECD6A65F8E738F15E3F918454E9F
A0CFDB6A0BC47C58B792426D0728393C48B95F191EED8EE7107A618CFBE86B471
B4D6DAA2910F371FD6A0A1F6FA5D4C81D22738E475B910252F786D8731CE93AC9
3DE5A3E7DF01688AE6AA18888348FDC903A25C8E47CF2305A80973A120F75A316
311FECF1DDD779FC2475BD8B2A8B5B16CEA7C48017883C52F9FCBDFD251EEB1F2
3BE867457035E5907A3C4CA12307D9C0223F71BB9F9F71980134FAB465ADE551C
260A20086B45250437D746D05884630153701D1331DB6F3632635CABC7BC38FAC
FC3701221E312AFEDD9B995F7D5BAA2CB80027BFA02AA02AA02A606909C8EA49B
9FF2B061B98E24D0CA848C0ECD4844CC477A152C4C70BE6F43AB6150066F66C65
89F12B3DDC533EC81502C446B6184701DACD6B32195F46AC7B39861C91EFF6F97
61400B0D6A248A5A6F55DE4D5EC711500B08ED840408C9D61176C67C829657E3C
052C348B2C80E80FBF5E212863E9B00A0000000049454E44AE42608200 }
caption="menu6"
onclick=menuclick
end
object menu7:tmenu
bitmap={ 0502000000060400000074797065000203000000696D670006040000006461746
100024503000089504E470D0A1A0A0000000D4948445200000020000000200806
000000737A7AF4000000017352474200AECE1CE90000000467414D410000B18F0
BFC6105000000097048597300000EC300000EC301C76FA864000002DA49444154
5847C597BD6A54411886BD066BADD45E11BC01116C6C142F402C2CAC44112C949
47A031606B7515288918022A8202EF107D42A0988C4D5603624EBAE68B2C6282A
9FFB8CE73D993D993973768DF8C040767EDF39F3CDFB4DB6D87F66200193CDAF7
6A6FEC1F6DF7C6FBBAFCDD9B6D1866DEF95BDD7E7ECE0AD79BBF0B46D77DF7DB1
C5D59FD9883449012BDF7FD995A94F6ED1AD97672B9791671DEBACA585940AB8F
8BC637B7A3BF527DE596BD8A189A69D7BDCB61BAF576C7CB66B23BD9D1FB9BD60
BB6A6FFBFAEE1B9BB3B157CBD96C61A2022EBDF8D837D9F9276D9BEE7CCB5AE3C
CF4FA9CAEB7FAC69E7CD8CA5A37121470F4CE423E78C7D586D5E757B396EAD466
965D7C681EE60CB141006A35E8C483A5AC76780EF78E46F371A445FA04705EEAC
CC014A71EB55C49C14662227201442C4143273E5D8A63F716F349F93B0547495F
829A9B2572015C1B4DC8F995E12FAE9212411CA92FD75A380118871A89E032428
BABA4447093E887A7082700F7D2245CA318FEE2136FBAC1BFCB44708DD50F5705
27000BA5122389515C1CF41BAA8AC0C8E883A58313808F53899B85082D0EAA135
544E0A2B4EB189C00920995586A11DF17FCC541F53EBE88900362E1B491CCC009
9063E1EB451045E7E2E2A0858A48446843E40FDAC8A4E004F02326A08C9880322
4405EE304B0432A438ACB1846808E8063072740B93E1684318611A02024F0C109
9041945DC310C308D0353C3BE95DC3974B6BF964654654645001BE1129DE9C003
830FEC70B5256EC33A8007D694AB3FBC3D5E50248106A4C2523A1FE55F0931189
4FE40248917AFF5549C7308800A56352BEFF58CD05008F054D5AE54142445352F
80F92A2D7F40980E3F7D77D7FB39F64A3539FB3DA75360800DD55CA663D4A635F
2A280050ABC194BF7996F35563440500E7A577A2CA20FF9810D4A197B04FA9002
062FDF7629582A770ADFDC7678CA4008171B05B2C141F279970C664529219F984
63C25507A1B2807F83D96FD95753C0FE2C3C9B0000000049454E44AE42608200 }
caption="menu7"
onclick=menuclick
end
end
end
d_examples/toolbar/e_toolbarmain.tfm
+167
View File
@@ -0,0 +1,167 @@
object e_toolbarmain1:e_toolbarmain
caption="묏야으렀절"
height=520.0
left=429
onclose=e_toolbarmain1_close
top=236
width=664
object toolbar1:ttoolbar
caption="toolbar1"
height=29
imagelist=controlimagelist1
width=648
object toolbutton1:ttoolbutton
caption="객큐1"
imageid=0
onclick=toolbaritemclick
end
object toolbutton2:ttoolbutton
caption="객큐2"
imageid=1
onclick=toolbaritemclick
end
object toolbutton3:ttoolbutton
caption="객큐3"
imageid=2
onclick=toolbaritemclick
end
object toolbutton4:ttoolbutton
caption="toolbutton4"
imageid=4
onclick=toolbaritemclick
end
object toolbutton5:ttoolbutton
caption="toolbutton5"
imageid=3
onclick=toolbaritemclick
end
end
object controlimagelist1:tcontrolimagelist
left=84
top=114
images={ 900200000000000000020000000000000000000000B40F00003E0000000000000
0040000000400000005000000020900000004000000050D000000690F00007479
70656974656D73626D70739005000000020000000000000002000000020000006
80F00007E00000000000000040000000400000004000000020208000000030000
000B0000009F020000AA02000003000000AD020000D3030000800600000300000
083060000DB0200005E0900000300000061090000F8020000590C000003000000
5C0C00008E0200007479706564617461696D6789504E470D0A1A0A0000000D494
8445200000020000000200806000000737A7AF4000000017352474200AECE1CE9
0000000467414D410000B18F0BFC6105000000097048597300000EC300000EC30
1C76FA86400000234494441545847ED96CDCB69511487EF5F6BC25061A048C940
9181C840182829C554664AEFC04C0C0C64A0440626C8E0DC9E75D73E6DC7E1E55
EEE3BF1D41A9CB5D6DEFB77F6C7DAFB97F3C37C047C045C08C866B34E201078DA
686768341ABE39582C1693B8CD4B056CB75BDFB8D77ABD9EE4C34B9760381CCA0
0D56A553D97CC663389472211F5BC588099C16EB7AB9E4BCEE7B3C483C1A07A3C
0268C83A91F4B7964C269DC3E1A03D5EB2DFEF25271C0EABC712C0BA783B7BD6C
AE5B233994CB4C76BD6EBB5E4C5E371F55802581782ACD3BB582C1632463A9D56
8F2520140A49F0743AA9E7F54CA753192397CBA9C712108D4625B8DBEDD4F3185
F5F5FCE6834D2AFFB8CC76319A3542AA9C712904AA524B85C2ED5F318DFED7C1B
734C6BB59A7A2C01F97C5E82F736911FABD5CA4924120F89E8F7FB92D76AB5D46
309A8542A12644A6FC1F16293FA99116157392FE6A4D9425D01CD66538283C140
3DD79829FCCE10E4077F4E9C9930B802FCD479A1D613B78D7658A15090F6C5625
1B3AF61EDC9E1470CAE00FE9C2033F12CF57A5DDAB28F8EC7A37AAF61F793C769
30B802587B82EC8567E8743AD22E93C948A9BD07E79F5CEA81C115C0EE377FF12
8F3F95CDA50FF379B8D7A6F4305249F8A68700570FE09520F9E816378EBF2F1C2
1DC018DC0906570015902015F15D700B3286BD54AE00EE0082DC09EF82770063F
02E30B802E09D37227DD2B7FD1A820B019C6B92DE69ED765B47FBC3850040C4BF
BE8AFC8C3E79B078B912F0BFF908F861018EF31BE3A64DABEA577256000000004
9454E44AE426082696D6789504E470D0A1A0A0000000D49484452000000300000
003008060000005702F987000000017352474200AECE1CE90000000467414D410
000B18F0BFC6105000000097048597300000EC300000EC301C76FA86400000368
494441546843ED98DB4B14511CC7FB837AEB35287A080A8A1E844088EA2108C94
8222822BAA0629682742122C9D0BC84B5A246E135EFBAAEAB99AD46522A5B5E48
2C5371E7F66DCECE6FDCD9F1CCECCD7194F6035FD839F33D737EDFD939672E7BB
0CB4907709B74002EBF2781BA1380AF981A9CC39900A3CF80B2BD9A825DD4E80C
D60116C781F76781E6F3407B0ED07915E8BD050CE40383F701FF03400E91D904E
BA70718794C8D26E687D4639400DE42A03F0FE8BE01745C01DAB281A6735ADBCA
2C99ADB10E507B3852044FC38FC8C8C118C0CEC74E8EF198668D9591D11AEB00B
C031AB530A2F9E687B5B3CCC48A653207304BE75369F431CD327A2D482E407D06
9954DE66F23D769A6ED6FA2E06F8FB753916C0B8BAD41CE47BEC345E499D553CC
7F81E26C702B009AE136BAEF0642CCC5BC0F7303912C0739C0CC4DF2030EB4D4C
46D8366F1C266702A87FF95632DDC21F87C99100E5FBB4FB81F9AC26A3892AE0F
511FE384C8ECD81ED523A80DB4A07705BE900B1F4EA90F640C65B22EDE4BDCB3F
9E598E07E8CB257312189F58ADE47880EEEB644E106175870460626F506CA0441
4EF2338F3C6E03F9FC44E2B1D201EB117733650228A670233316F0C520BD0758D
CC49102B04BB57C4416A01D87B41B2D8050854904943595A53975E99B6A249FD1
2B25B46F5CF2D66597D0FAADA0FCCB453012A7FD621167E4028A31CA153D5106B
E8538E819D33891B4F024B5F69700DB1C2AF156F90DC33457B35764600F6E992D
D9D09A92100B1A43BFC5B2CEE8C0A209CA98132F92BBC8FE17E005F110DA8A228
109F0E6C142B95F9A02CAC40C8AE8B0A2116755207B7034C54D3606AED3F9721D
C6E8E2A9489FD1BF2F08F4DED3AEE04A83E0004B54B84C10A14B23C9B8AD425F7
4D43F28C6D6C4BE57EEAE95680858F34885AFCBB2F51C572755ABDEE3FCF417CD
803E9C510F5D4D8FE006F8ED200EA65E30B42BCD9145E1EB9851B245CAA8732B3
443D236C7F00C34B9058EA8570B911CAE22AC47B1DDCC299C4DC56286B02F58AC
6850077680035405EAB56A05A3C96D7C361CCC54B4FFAC9CDC73A40DB457E01A9
AA258B0600421722CBA3F4D20F796C0EA1CCCA485BED2839ADB10EC0E0BD906F8
508BD505D72D77708EA9C608F0D72C73772D9631FC061E4DE2948CF072116B443
C8698090590531BF0D72609E1CB17135C056900EE036BB3C00F00FB4FD2774447
C293D0000000049454E44AE426082696D6789504E470D0A1A0A0000000D494844
5200000020000000200806000000737A7AF4000000017352474200AECE1CE9000
0000467414D410000B18F0BFC6105000000097048597300000EC300000EC301C7
6FA86400000270494441545847D596CB6A2A411086CF0BBA72A3A851541414043
722EE44111782BAF182260441B7826F6188E015DCB81111172AC4B55087BFE89E
8CE3CCD8E6C484F341914A55F7F43F5D3DD5FEA15FE6FF13301C0EA95AAD92C7E
32197CB45D1689452A914F5FB7DDA6EB762943ACA0276BB1D65B35972381CB656
2814E870388859B7511230994C281C0EF3028944823A9D0EAD562B91253A1E8FD
4EBF5C8EFF7F398582C46F3F95C64EDB92960B3D9F076E3C1E572993E3E3E44E6
1A942097CB69BBB15C2E45C69A9B02506F3CAC56AB89C86DBADD2ECF29954A226
28DAD80E974CA0F72BBDDBC13AAA024B21CEFEFEF226A8EAD80F57A4DF1789CDF
E85E702620A05EAFF3FFFBFD9E4EA713FB7A940EE13D542A150A8542D46AB5584
02693E15D808F9731F2ED02DAED362F260DE583C137DB495301AFAFAF6C5F452F
C2E974F25F7C41665C09188D46DA64F85F65301868CF49A7D3743E9F45E6922B0
1B27630F8FFC2DBDB1B6F3BBAA8155702D0DBA500F88FE642C0783CE6859F9E9E
D8E023F6482E04BCBCBCF0A2CD66930D3E62F780CF0EF3A4A121E5F37991BDE64
280BC707091C0E023760FFAC58D66862660369BF1A060302822C43E62C8A9625C
0CDD54DE0DC56251443FD1043C3F3F6B938D869C2A728E1E79A7F87C3E11F9441
3100804B4C946434E153947CF4D018BC582074422110EEA410C398C51C1280025
9017936509E489470B3522DB2AC6A820059899D9D7C002BC5E2F0F306BBDB2356
38C0AFA05AD4C0F0BC0AFDA46A3C1013392C9247FDF2A982D02ACBE06ED107E17
560280D961FC5101D805E4D01D253F26006F2F4BA03F8C0F1360677ABE5D80F13
29286BADBB6E2DFE2970510FD05E1AD4F7F1B5448FE0000000049454E44AE4260
82696D6789504E470D0A1A0A0000000D494844520000002000000020080600000
0737A7AF4000000017352474200AECE1CE90000000467414D410000B18F0BFC61
05000000097048597300000EC300000EC301C76FA8640000028D494441545847C
5973D6814411480B7B25050045B259D8595A0A5550AB5B00A626163255A5A5B28
B676E92C14091A8B84E01F88281844A208FE8128722268E7DE9D5E363197E4923
CF79B9BB7EEE6CE9DD9BDD3FD608ED937F3E6BD9B7DF3DE6C209EB456D665E273
5BC69EB464FFDDA6EC996AC8D61BA169F4919D989D9799AFCB12AD6E582D374E0
73EB43A72F679243B26EB125CFF6EDA968950764FD5E5C0BDA669F491E9F8CEC9
D0E8A0EB22D781F3AF1765FBCDAEE1C38F7ECA85370B3217AEDAD15E5E353A72F
9FD2F3912CF45075DD6C8E3AF0E1C9F6D9945F6CE34E46AAD6DA5FEA0832E6B1C
7AF0C34A7BE9EBC0C87457F14CBC8DF5F6BA9516075DFD23BB6E85569AA5C7012
6A2C0760F8B934FE7CD9AFCB1CD641C60AB9888C2B0E10FB1363B9226718060E9
376198F04AB1910E4CE300C7858825680679E72E581B1BD8D2236A1CE0CCE259D
1683FF73232AD08D8C0163621206B91388EC667B7282C442B0A3985C446760D48
9D2C32FE71C90EFB53D6818B6FBBF1466A0FC8DF3CD4A2353BEC4F5907C8A6E85
157028AC8B6B8A094A1AC0340EDC0764025EB97207C18C4010A18B603CAE9C1FB
4D2B2EC6200E5045B16D1CE0218F53CF22B34BD76AD940EDE70073988B4E1E890
36C03DB9187462DEDD2BB5416DBE400632A73D592E415100804848B2B9F9692C5
4FCFD924629F01993E33D74512847A0CB94CB8B8F36DD9242DE61F7BDCBD74A4F
B8C31C745E6186A22E226E3C38B7A47F6DD8E3DB7C6B52163CC07AD8C2611692A
E61AE5CB978535197DF86707E823F325938A119429468B9D0DF3DE69F47DE9294
6FC545E8EA1D20B8952E9954CA9F452AA3011854AAEE58A2A123445AF6A800EBA
AC51F8C3442158885816F9EF9F660AC785335BC9C7699A7FF3792EF21B1F1CB3C
87955C3470000000049454E44AE426082696D6789504E470D0A1A0A0000000D49
48445200000020000000200806000000737A7AF4000000017352474200AECE1CE
90000000467414D410000B18F0BFC6105000000097048597300000EC300000EC3
01C76FA86400000223494441545847ED972DAB024114860D824D2C7693C560103
409FA038C62B008828A3FC0EA57B268320882980D822206838A4530F80BC42236
ABC570EE3D7BE7EC9DFD9A9D5D96850BF78117768ECE996757775603204920108
0CD66C34662B2D92C9CCF673612232DF07ABD20994CB2D10FEFF71B2E970B7C3E
1F56F9A1DFEFB3237BA4059056AB05F3F91CDAED36643219E5AA6082C120A4D36
9A8D7EB50AD56E1F97CB219F6480BDCEF77A8542AEAA256894422301C0ED92C7B
A404F6FBBDE962A2148B45365B8CADC0E974825028A4344DA552301E8F0D8BF1E
16565246C054AA592DA1005ECAE06BE1E0E87D5F16432619DCC110ADC6E37F5EC
DD06A5450805F01B6FD6D4691E8F07EB684428D068344C1B3A8D6853D208D0AD8
69F2372381C6C733C1EA582E0FE81E1D108C46231D57A3A9D42A7D3D19C89DBE0
09E11D41E372B9CC56E404F4DFEE5C2E07BD5E4F53731BB33B87F04560B7DB196
A84A5403E9FF74C60BBDD1A6A842F02EBF5DA50237C11582E97861A2114E876BB
9A9ADB2C160B438DF04560B55A196A842F02FADE184228E0E546A4AF11BF47DFE
0938BDE8093BC14A8D56AEA188F098DC0F57A85D168A44C4070DFE61BB90DF6C3
E7CC6C365382C78446408F9702560805F08A98357492783CCEBA99231440D01E9
F0B187D73AAEB5FA3DA6030605DACB115E0E117C11028C9D7717159FE05FE9600
36365B04FF0BF202FADF7D221C09E0CE98482494E81769369B108D46A15028B08
A0C005F1ECEF59244AA69250000000049454E44AE426082 }
end
end
d_examples/toolbar/resource.tfm/e_toolbarmain.tfm
-168
View File
@@ -1,168 +0,0 @@
object e_toolbarmain1:e_toolbarmain
caption="묏야으렀절"
height=520.0
left=429
onclose=e_toolbarmain1_close
top=236
width=664
object toolbar1:ttoolbar
caption="toolbar1"
height=29
imagelist=controlimagelist1
width=648
object toolbutton1:ttoolbutton
caption="객큐1"
imageid=0
onclick=toolbaritemclick
end
object toolbutton2:ttoolbutton
caption="객큐2"
imageid=1
onclick=toolbaritemclick
end
object toolbutton3:ttoolbutton
caption="객큐3"
imageid=2
onclick=toolbaritemclick
end
object toolbutton4:ttoolbutton
caption="toolbutton4"
imageid=4
onclick=toolbaritemclick
end
object toolbutton5:ttoolbutton
caption="toolbutton5"
imageid=3
onclick=toolbaritemclick
end
end
object controlimagelist1:tcontrolimagelist
left=84
top=114
images={ 0502000000060400000074797065000204000000626D707300060500000069746
56D73000505000000000000000005020000000604000000747970650002030000
00696D670006040000006461746100029F02000089504E470D0A1A0A0000000D4
948445200000020000000200806000000737A7AF4000000017352474200AECE1C
E90000000467414D410000B18F0BFC6105000000097048597300000EC300000EC
301C76FA86400000234494441545847ED96CDCB69511487EF5F6BC25061A048C9
409181C840182829C554664AEFC04C0C0C64A0440626C8E0DC9E75D73E6DC7E1E
55EEE3BF1D41A9CB5D6DEFB77F6C7DAFB97F3C37C047C045C08C866B34E201078
DA686768341ABE39582C1693B8CD4B056CB75BDFB8D77ABD9EE4C34B9760381CC
A00D56A553D97CC663389472211F5BC588099C16EB7AB9E4BCEE7B3C483C1A07A
3C0268C83A91F4B7964C269DC3E1A03D5EB2DFEF25271C0EABC712C0BA783B7BD
6CAE5B233994CB4C76BD6EBB5E4C5E371F55802581782ACD3BB582C1632463A9D
568F2520140A49F0743AA9E7F54CA753192397CBA9C712108D4625B8DBEDD4F31
85F5F5FCE6834D2AFFB8CC76319A3542AA9C712904AA524B85C2ED5F318DFED7C
1B734C6BB59A7A2C01F97C5E82F736911FABD5CA4924120F89E8F7FB92D76AB5D
46309A8542A12644A6FC1F16293FA99116157392FE6A4D9425D01CD66538283C1
403DD79829FCCE10E4077F4E9C9930B802FCD479A1D613B78D7658A15090F6C56
251B3AF61EDC9E1470CAE00FE9C2033F12CF57A5DDAB28F8EC7A37AAF61F793C7
6930B802587B82EC8567E8743AD22E93C948A9BD07E79F5CEA81C115C0EE377FF
128F3F95CDA50FF379B8D7A6F4305249F8A68700570FE09520F9E816378EBF2F1
C21DC018DC0906570015902015F15D700B3286BD54AE00EE0082DC09EF8277006
3F02E30B802E09D37227DD2B7FD1A820B019C6B92DE69ED765B47FBC3850040C4
BFBE8AFC8C3E79B078B912F0BFF908F861018EF31BE3A64DABEA5772560000000
049454E44AE426082000001000000050200000006040000007479706500020300
0000696D67000604000000646174610002D303000089504E470D0A1A0A0000000
D49484452000000300000003008060000005702F987000000017352474200AECE
1CE90000000467414D410000B18F0BFC6105000000097048597300000EC300000
EC301C76FA86400000368494441546843ED98DB4B14511CC7FB837AEB35287A08
0A8A1E844088EA2108C948222822BAA0629682742122C9D0BC84B5A246E135EFB
AAEAB99AD46522A5B5E482C5371E7F66DCECE6FDCD9F1CCECCD7194F6035FD839
F33D737EDFD939672E7BB0CB4907709B74002EBF2781BA1380AF981A9CC39900A
3CF80B2BD9A825DD4E80CD60116C781F76781E6F3407B0ED07915E8BD050CE403
83F701FF03400E91D904EBA70718794C8D26E687D4639400DE42A03F0FE8BE017
45C01DAB281A6735ADBCA2C99ADB10E507B3852044FC38FC8C8C118C0CEC74E8E
F198668D9591D11AEB00BC031AB530A2F9E687B5B3CCC48A653207304BE75369F
431CD327A2D482E407D069954DE66F23D769A6ED6FA2E06F8FB753916C0B8BAD4
1CE47BEC345E499D553CC7F81E26C702B009AE136BAEF0642CCC5BC0F7303912C
0739C0CC4DF2030EB4D4C46D8366F1C266702A87FF95632DDC21F87C99100E5FB
B4FB81F9AC26A3892AE0F511FE384C8ECD81ED523A80DB4A07705BE900B1F4EA9
0F640C65B22EDE4BDCB3F9E598E07E8CB257312189F58ADE47880EEEB644E1061
75870460626F506CA04414EF2338F3C6E03F9FC44E2B1D201EB117733650228A6
70233316F0C520BD0758DCC49102B04BB57C4416A01D87B41B2D8050854904943
595A53975E99B6A249FD12B25B46F5CF2D66597D0FAADA0FCCB453012A7FD6211
67E4028A31CA153D5106BE8538E819D33891B4F024B5F69700DB1C2AF156F90DC
33457B35764600F6E992DD9D09A92100B1A43BFC5B2CEE8C0A209CA98132F92BB
C8FE17E005F110DA8A228109F0E6C142B95F9A02CAC40C8AE8B0A2116755207B7
034C54D3606AED3F9721DC6E8E2A9489FD1BF2F08F4DED3AEE04A83E0004B54B8
4C10A14B23C9B8AD425F74D43F28C6D6C4BE57EEAE95680858F34885AFCBB2F51
C572755ABDEE3FCF417CD803E9C510F5D4D8FE006F8ED200EA65E30B42BCD9145
E1EB9851B245CAA8732B3443D236C7F00C34B9058EA8570B911CAE22AC47B1DDC
C299C4DC56286B02F58AC6850077680035405EAB56A05A3C96D7C361CCC54B4FF
AC9CDC73A40DB457E01A9AA258B0600421722CBA3F4D20F796C0EA1CCCA485BED
2839ADB10EC0E0BD906F8508BD505D72D77708EA9C608F0D72C73772D9631FC06
1E4DE2948CF072116B443C8698090590531BF0D72609E1CB17135C056900EE036
BB3C00F00FB4FD2774447C293D0000000049454E44AE426082000002000000050
2000000060400000074797065000203000000696D670006040000006461746100
02DB02000089504E470D0A1A0A0000000D4948445200000020000000200806000
000737A7AF4000000017352474200AECE1CE90000000467414D410000B18F0BFC
6105000000097048597300000EC300000EC301C76FA8640000027049444154584
7D596CB6A2A411086CF0BBA72A3A851541414043722EE44111782BAF182260441
B7826F6188E015DCB81111172AC4B55087BFE89E8CE3CCD8E6C484F341914A55F
7F43F5D3DD5FEA15FE6FF13301C0EA95AAD92C7E32197CB45D1689452A914F5FB
7DDA6EB762943ACA0276BB1D65B35972381CB6562814E870388859B7511230994
C281C0EF3028944823A9D0EAD562B91253A1E8FD4EBF5C8EFF7F398582C46F3F9
5C64EDB92960B3D9F076E3C1E572993E3E3E44E61A942097CB69BBB15C2E45C69
A9B02506F3CAC56AB89C86DBADD2ECF29954A22628DAD80E974CA0F72BBDDBC13
AAA024B21CEFEFEF226A8EAD80F57A4DF1789CDFE85E702620A05EAFF3FFFBFD9
E4EA713FB7A940EE13D542A150A8542D46AB558402693E15D808F9731F2ED02DA
ED362F260DE583C137DB495301AFAFAF6C5F452FC2E974F25F7C41665C09188D4
6DA64F85F65301868CF49A7D3743E9F45E6922B01B27630F8FFC2DBDB1B6F3BBA
A8155702D0DBA500F88FE642C0783CE6859F9E9ED8E023F6482E04BCBCBCF0A2C
D66930D3E62F780CF0EF3A4A121E5F37991BDE64280BC707091C0E023760FFAC5
8D66862660369BF1A060302822C43E62C8A9625C0CDD54DE0DC56251443FD1043
C3F3F6B938D869C2A728E1E79A7F87C3E11F94413100804B4C946434E153947CF
4D018BC582074422110EEA410C398C51C12800259017936509E489470B3522DB2
AC6A820059899D9D7C002BC5E2F0F306BBDB235638C0AFA05AD4C0F0BC0AFDA46
A3C1013392C9247FDF2A982D02ACBE06ED107E17560280D961FC5101D805E4D01
D253F26006F2F4BA03F8C0F1360677ABE5D80F1329286BADBB6E2DFE2970510FD
05E1AD4F7F1B5448FE0000000049454E44AE42608200000300000005020000000
60400000074797065000203000000696D67000604000000646174610002F80200
0089504E470D0A1A0A0000000D4948445200000020000000200806000000737A7
AF4000000017352474200AECE1CE90000000467414D410000B18F0BFC61050000
00097048597300000EC300000EC301C76FA8640000028D494441545847C5973D6
814411480B7B25050045B259D8595A0A5550AB5B00A626163255A5A5B28B676E9
2C14091A8B84E01F88281844A208FE8128722268E7DE9D5E363197E4923CF79B9
BB7EEE6CE9DD9BDD3FD608ED937F3E6BD9B7DF3DE6C209EB456D665E2735BC69E
B464FFDDA6EC996AC8D61BA169F4919D989D9799AFCB12AD6E582D374E073EB43
A72F679243B26EB125CFF6EDA968950764FD5E5C0BDA669F491E9F8CEC9D0E8A0
EB22D781F3AF1765FBCDAEE1C38F7ECA85370B3217AEDAD15E5E353A72F9FD2F3
912CF45075DD6C8E3AF0E1C9F6D9945F6CE34E46AAD6DA5FEA0832E6B1C7AF0C3
4A7BE9EBC0C87457F14CBC8DF5F6BA9516075DFD23BB6E85569AA5C70126A2C07
60F8B934FE7CD9AFCB1CD641C60AB9888C2B0E10FB1363B9226718060E9376198
F04AB1910E4CE300C7858825680679E72E581B1BD8D2236A1CE0CCE259D1683FF
73232AD08D8C0163621206B91388EC667B7282C442B0A3985C446760D489D2C32
FE71C90EFB53D6818B6FBBF1466A0FC8DF3CD4A2353BEC4F5907C8A6E85157028
AC8B6B8A094A1AC0340EDC0764025EB97207C18C4010A18B603CAE9C1FB4D2B2E
C6200E5045B16D1CE0218F53CF22B34BD76AD940EDE70073988B4E1E89036C03D
B9187462DEDD2BB5416DBE400632A73D592E415100804848B2B9F9692C54FCFD9
24629F01993E33D74512847A0CB94CB8B8F36DD9242DE61F7BDCBD74A4FB8C31C
745E6186A22E226E3C38B7A47F6DD8E3DB7C6B52163CC07AD8C2611692AE61AE5
CB978535197DF86707E823F325938A119429468B9D0DF3DE69F47DE92946FC545
E8EA1D20B8952E9954CA9F452AA3011854AAEE58A2A123445AF6A800EBAAC51F8
C3442158885816F9EF9F660AC785335BC9C7699A7FF3792EF21B1F1CB3C87955C
3470000000049454E44AE42608200000400000005020000000604000000747970
65000203000000696D670006040000006461746100028E02000089504E470D0A1
A0A0000000D4948445200000020000000200806000000737A7AF4000000017352
474200AECE1CE90000000467414D410000B18F0BFC61050000000970485973000
00EC300000EC301C76FA86400000223494441545847ED972DAB024114860D824D
2C7693C560103409FA038C62B008828A3FC0EA57B268320882980D822206838A4
530F80BC42236ABC570EE3D7BE7EC9DFD9A9D5D96850BF78117768ECE99675777
56032049201080CD66C34662B2D92C9CCF673612232DF07ABD20994CB2D10FEFF
71B2E970B7C3E1F56F9A1DFEFB3237BA4059056AB05F3F91CDAED36643219E5AA
6082C120A4D369A8D7EB50AD56E1F97CB219F6480BDCEF77A8542AEAA25689442
2301C0ED92C7BA404F6FBBDE962A2148B45365B8CADC0E974825028A4344DA552
301E8F0D8BF1E16565246C054AA592DA1005ECAE06BE1E0E87D5F16432619DCC1
10ADC6E37F5ECDD06A5450805F01B6FD6D4691E8F07EB684428D068344C1B3A8D
6853D208D0AD869F2372381C6C733C1EA582E0FE81E1D108C46231D57A3A9D42A
7D3D19C89DBE009E11D41E372B9CC56E404F4DFEE5C2E07BD5E4F53731BB33B87
F04560B7DB196A84A5403E9FF74C60BBDD1A6A842F02EBF5DA50237C11582E978
61A2114E876BB9A9ADB2C160B438DF04560B55A196A842F02FADE184228E0E546
A4AF11BF47DFE0938BDE8093BC14A8D56AEA188F098DC0F57A85D168A44C4070D
FE61BB90DF6C3E7CC6C365382C78446408F9702560805F08A98357492783CCEBA
99231440D01E9F0B187D73AAEB5FA3DA6030605DACB115E0E117C11028C9D7717
159FE05FE960036365B04FF0BF202FADF7D221C09E0CE98482494E81769369B10
8D46A15028B08A0C005F1ECEF59244AA69250000000049454E44AE42608200 }
end
end
designer/ctl_mgr/resource.tfm/t_compile_config.tfm
-368
View File
@@ -1,368 +0,0 @@
object ed_script:t_compile_config
caption="编译选项设置"
height=681
left=618
minmaxbox=false
onclose=compile_config_close
top=180
width=502
wssizebox=true
object bt_ok:tbtn
caption="确定"
height=31
left=405
onclick=bt_ok_clk
parentcolor=false
top=582
width=55
end
object gp_dir:tgroupbox
caption="输入目录"
height=87
left=24
parentcolor=true
top=181
width=442
object bt_f_dir:tbtn
caption=".."
height=23
left=408
onclick=bt_f_dir_clk
top=20
width=24
end
object bt_s_dir:tbtn
caption="..."
height=23
left=408
onclick=bt_s_dir_clk
top=51
width=24
end
object label1:tlabel
left=14
top=20
width=68
height=23
caption="函数目录"
end
object ed_f_dirs:tedit
caption="edit1"
height=22
left=87
top=21
width=312
end
object label2:tlabel
left=13
top=51
width=60
height=23
caption="资源目录"
end
object ed_s_dirs:tedit
caption="edit2"
height=23
left=87
top=51
width=311
end
end
object gp_filter:tgroupbox
caption="筛选"
height=164
left=27
parentcolor=true
top=269
width=437
object lb_s_type:tlabel
left=11
top=20
width=92
height=25
caption="资源文件后缀"
end
object ed_s_type:tedit
caption="edit2"
height=27
left=112
text="*.tfm,*.ini"
top=20
width=290
end
object bt_i_f:tbtn
caption="..."
height=22
left=408
onclick=bt_i_f_clk
top=83
width=21
end
object bt_d_f:tbtn
caption="..."
height=21
left=408
onclick=bt_d_f_clk
top=136
width=21
end
object bt_i_s:tbtn
caption="..."
height=22
left=408
onclick=bt_i_s_clk
top=54
width=21
end
object label3:tlabel
left=13
top=51
width=61
height=25
caption="指定资源"
end
object ed_include_s:tedit
caption="edit1"
height=25
left=84
top=52
width=317
end
object label4:tlabel
left=11
top=83
width=63
height=25
caption="指定函数"
end
object ed_include_f:tedit
caption=""
height=23
left=84
top=83
width=317
end
object label5:tlabel
left=12
top=133
width=61
height=25
caption="排除函数"
end
object ed_exclude_f:tedit
caption=""
height=22
left=84
top=136
width=317
end
object lb_tsg:tlabel
left=11
top=106
width=63
height=25
caption="tsg库"
end
object ed_tsg:tedit
caption="edit1"
height=22
left=84
top=111
width=318
end
object bt_tsgadd:tbtn
caption="..."
height=21
left=408
onclick=bt_tsgadd_clk
top=111
width=21
end
end
object gp_out:tgroupbox
caption="输出"
height=123
left=27
parentcolor=true
top=48
width=433
object lb_ype:tlabel
left=14
top=17
width=53
height=25
caption="类型"
end
object cb_type:tcombobox
caption="combobox1"
height=23
itemindex=0
items=["执行程序" "动态库" tsg ]
left=79
onselchanged=cb_type_sel
top=18
width=131
end
object lb_output:tlabel
left=13
top=45
width=46
height=25
caption="输出"
end
object ed_output:tedit
caption="edit1"
height=25
left=79
placeholder="输出文件"
top=48
width=320
end
object bt_output:tbtn
caption="..."
enabled=false
height=23
left=404
onclick=bt_output_clk
top=86
width=22
end
object bt_outputname:tbtn
caption="..."
height=25
left=404
onclick=bt_outputname_clk
top=48
width=22
end
object lb_output_f:tlabel
left=14
top=83
width=60
height=25
caption="输出函数"
end
object ed_out_f:tedit
caption="edit1"
height=25
left=79
top=86
width=320
end
end
object bt_cancel:tbtn
caption="取消"
height=31
left=332
onclick=bt_cancel_clk
top=582
width=55
end
object gp_other:tgroupbox
caption="其他"
height=129
left=27
parentcolor=true
top=440
width=437
object ck_gui:tcheckbtn
caption="gui"
height=25
left=17
top=25
width=75
end
object ck_strong:tcheckbtn
caption="强引用函数"
height=25
left=122
onclick=checkbtn2_clk
top=25
width=98
end
object ck_s_rp:tcheckbtn
caption="资源文件保留相对路径"
enabled=false
height=25
left=253
top=25
width=173
end
object lb_ico:tlabel
left=17
top=59
width=66
height=25
caption=" 图 标:"
end
object ed_ico:tedit
caption="edit3"
height=25
left=94
top=58
width=277
end
object bt_ico:tbtn
caption="..."
height=25
left=386
onclick=bt_ico_clk
top=58
width=22
end
object l_namespace:tlabel
left=17
top=93
width=75
height=25
caption="namespace:"
end
object e_namespace:tedit
caption="edit1"
height=25
left=94
top=93
width=278
end
end
object f_op:topenfileadlg
left=15
top=575
height=30
width=30
caption="openfileadlg1"
filter=<
"ico图标"="*.ico"
>
end
object lb_input:tlabel
left=32
top=16
width=63
height=25
caption="主程序"
end
object e_script:tedit
caption="edit1"
height=25
left=98
top=16
width=331
end
object bt_script:tbtn
caption="..."
height=25
left=437
onclick=bt_script_clk
top=16
width=22
end
object bt_cmd:tbtn
caption="命令行"
height=31
left=208
onclick=bt_cmd_clk
top=582
width=92
end
end
designer/ctl_mgr/resource.tfm/t_bconfig_cmd_shower.tfm → designer/ctl_mgr/t_bconfig_cmd_shower.tfm
+9 -9
View File
@@ -1,23 +1,23 @@
object bconfig_cmd_shower:t_bconfig_cmd_shower object bconfig_cmd_shower:t_bconfig_cmd_shower
caption="ÃüÁîÐÐ" caption="ÃüÁîÐÐ"
height=250 height=263
left=610 left=610
minmaxbox=false minmaxbox=false
onclose=bconfig_cmd_shower_close onclose=bconfig_cmd_shower_close
top=406 top=406
width=508 width=546
object panel1:tpanel object panel1:tpanel
align=albottom align=albottom
caption="panel1" caption="panel1"
height=45 height=45
left=0 left=0
parentcolor=true parentcolor=true
top=166 top=179
width=492 width=530
wsdlgmodalframe=false wsdlgmodalframe=false
object bt_ok:tbtn object bt_ok:tbtn
caption="Íê³É" caption="Íê³É"
height=26 height=33
left=406 left=406
onclick=btn1_clk onclick=btn1_clk
top=8 top=8
@@ -25,8 +25,8 @@ object bconfig_cmd_shower:t_bconfig_cmd_shower
end end
object bt_copy:tbtn object bt_copy:tbtn
caption="¸´ÖÆ" caption="¸´ÖÆ"
height=26 height=33
left=291 left=253
onclick=bt_copy_clk onclick=bt_copy_clk
top=8 top=8
width=94 width=94
@@ -36,11 +36,11 @@ object bconfig_cmd_shower:t_bconfig_cmd_shower
align=alclient align=alclient
autogutterwidth=true autogutterwidth=true
caption="memo1" caption="memo1"
height=211 height=179
left=0 left=0
readonly=true readonly=true
top=0 top=0
width=492 width=530
end end
object cpbord:tclipboard object cpbord:tclipboard
left=211 left=211
designer/ctl_mgr/t_code_format_mgr.tfm
+122
View File
@@ -0,0 +1,122 @@
object codeformateditor:t_code_format_mgr
autosize=true
caption="tsl代码格式化参数"
childsizing=<
layout=1
controlsperline=2
horizontalspacing=10
verticalspacing=10
leftrightspacing=20
topbottomspacing=10
>
font=<
height=19
width=9
escapement=0
orientation=0
weight=400
italic=0
underline=0
strikeout=0
charset=134
outprecision=3
clipprecision=2
quality=1
pitchandfamily=49
facename="新宋体"
color=0
>
height=90
left=547
minmaxbox=false
onclose=tformatinfownd1_close
parentfont=false
top=277
width=449
wssizebox=false
object label1:tlabel
left=20
top=10
width=128
height=22
autosize=true
caption="多行注释对齐"
end
object faligncmt:tcheckbtn
autosize=false
caption=""
height=22
left=158
parentcolor=true
top=10
width=110
end
object label3:tlabel
left=20
top=42
width=128
height=22
autosize=true
caption="array格式化"
end
object farraytype:tcombobox
autosize=true
height=22
itemindex=1
items=["默认" "普通" "宽松" ]
left=158
top=42
width=110
end
object label4:tlabel
left=20
top=74
width=128
height=22
autosize=true
caption="语法检查"
end
object fsyncheck:tcheckbtn
caption=""
checked=true
height=22
left=158
parentcolor=true
top=74
width=110
end
object label5:tlabel
left=20
top=106
width=128
height=22
autosize=true
caption="格式化选择区域"
end
object fselectcheck:tcheckbtn
caption=""
height=22
left=158
parentcolor=true
top=106
width=110
end
object label2:tlabel
left=20
top=138
width=128
height=22
caption=""
end
object btn1:tbtn
autosize=true
caption="确定"
height=22
left=158
onclick=dookclick
top=138
width=110
end
end
designer/ctl_mgr/t_code_format_mgr.tsf
+62
View File
@@ -0,0 +1,62 @@
type t_code_format_mgr=class(tdcreateform)
uses tslvcl;
label1:tlabel;
label2:tlabel;
label3:tlabel;
label4:tlabel;
label5:tlabel;
faligncmt:tcombobox;
fcharct:tcombobox;
farraytype:tcombobox;
fsyncheck:tcheckbtn;
fselectcheck:tcheckbtn;
btn1:tbtn;
function Create(AOwner);override;//构造
begin
inherited;
end
function DoOKClick(o;e);virtual;
begin
calldatafunction(FOnOkClick,self,e);
end
function tformatinfownd1_close(o;e);virtual;
begin
e.skip := true;
o.Visible := false;
end
function Recycling();override;//回收变量
begin
inherited;
ci := self.classinfo();
//将成员变量赋值为nil避免循环引用
for i,v in ci["members"]do
begin
invoke(self,v["name"],nil);
end
end
function GetData();
begin
r := array();
r["cmt"]:= faligncmt.Checked;
r["arraytype"]:= array("普通":1,"默认":0,"宽松":3)[farraytype.getCurrentItemText()];
r["syn"]:= fsyncheck.checked;
r["sel"]:= fselectcheck.checked;
return r;
end
function SetData(d);
begin
//"50" "80" "100" "130"
// "50" "100" "130" "150" "200" "250" "300"
//"默认" "普通" "宽松"
if ifarray(d) then
begin
faligncmt.Checked := (d["cmt"]=1);
farraytype.ItemIndex := (array(0:0,1:1,3:2))[d["arraytype"]];
fsyncheck.Checked := d["syn"];
fselectcheck.Checked := d["sel"];
end
end
property OnOkClicked read FOnOkClick write FOnOkClick;
private
[weakref] FOnOkClick;
end
designer/ctl_mgr/t_compile_config.tfm
+556
View File
@@ -0,0 +1,556 @@
object ed_script:t_compile_config
autosize=true
caption="编译选项设置"
childsizing=<
layout=2
controlsperline=10
horizontalspacing=10
verticalspacing=10
leftrightspacing=10
topbottomspacing=10
>
height=560
left=638
minmaxbox=false
onclose=compile_config_close
top=208
width=484
wssizebox=true
object panel1:tpanel
autosize=true
caption="panel1"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=2
leftrightspacing=2
topbottomspacing=2
>
height=25
left=10
top=10
width=448
wsdlgmodalframe=false
object lb_input:tlabel
left=2
top=2
width=44
height=21
autosize=true
caption="主程序"
end
object e_script:tedit
autosize=true
caption="edit1"
height=21
left=48
top=2
width=331
end
object bt_script:tbtn
autosize=true
caption=".."
height=21
left=381
onclick=bt_script_clk
top=2
width=28
end
end
object gp_out:tgroupbox
autosize=true
caption="输出"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=10
leftrightspacing=2
topbottomspacing=2
>
height=94
left=10
parentcolor=true
top=45
width=448
object lb_ype:tlabel
left=6
top=21
width=58
height=21
autosize=true
caption="类型"
textalign=al9_centerright
end
object cb_type:tcombobox
autosize=true
caption="combobox1"
height=21
itemindex=0
items=["执行程序" "动态库" tsg ]
left=74
onselchanged=cb_type_sel
top=21
width=324
end
object label6:tlabel
left=408
top=21
width=28
height=21
autosize=true
caption=""
end
object lb_output:tlabel
left=6
top=44
width=58
height=21
autosize=true
caption="输出"
textalign=al9_centerright
end
object ed_output:tedit
autosize=true
caption="edit1"
height=21
left=74
placeholder="输出文件"
top=44
width=324
end
object bt_output:tbtn
autosize=true
caption=".."
enabled=false
height=21
left=408
onclick=bt_output_clk
top=44
width=28
end
object lb_output_f:tlabel
left=6
top=67
width=58
height=21
autosize=true
caption="输出函数"
textalign=al9_centerright
end
object ed_out_f:tedit
autosize=true
caption="edit1"
height=21
left=74
top=67
width=324
end
object bt_outputname:tbtn
autosize=true
caption=".."
height=21
left=408
onclick=bt_outputname_clk
top=67
width=28
end
end
object gp_dir:tgroupbox
autosize=true
caption="输入目录"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=2
leftrightspacing=2
topbottomspacing=2
>
height=71
left=10
parentcolor=true
top=149
width=448
object label1:tlabel
left=6
top=21
width=58
height=21
autosize=true
caption="函数目录"
end
object ed_f_dirs:tedit
autosize=true
caption="edit1"
height=21
left=66
top=21
width=312
end
object bt_f_dir:tbtn
autosize=true
caption=".."
height=21
left=380
onclick=bt_f_dir_clk
top=21
width=28
end
object label2:tlabel
left=6
top=44
width=58
height=21
autosize=true
caption="资源目录"
end
object ed_s_dirs:tedit
autosize=true
caption="edit2"
height=21
left=66
top=44
width=312
end
object bt_s_dir:tbtn
autosize=true
caption=".."
height=21
left=380
onclick=bt_s_dir_clk
top=44
width=28
end
end
object gp_filter:tgroupbox
autosize=true
caption="筛选"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=2
leftrightspacing=2
topbottomspacing=2
>
height=139
left=10
parentcolor=true
top=230
width=448
object lb_s_type:tlabel
left=6
top=21
width=86
height=20
autosize=true
caption="资源文件后缀"
end
object ed_s_type:tedit
autosize=true
caption="edit2"
height=20
left=94
text="*.tfm,*.ini"
top=21
width=318
end
object label7:tlabel
left=414
top=21
width=28
height=20
autosize=true
caption=""
end
object label3:tlabel
left=6
top=43
width=86
height=21
autosize=true
caption="指定资源"
textalign=al9_centerright
end
object ed_include_s:tedit
autosize=true
caption="edit1"
height=21
left=94
top=43
width=318
end
object bt_i_s:tbtn
autosize=true
caption=".."
height=21
left=414
onclick=bt_i_s_clk
top=43
width=28
end
object label4:tlabel
left=6
top=66
width=86
height=21
autosize=true
caption="指定函数"
textalign=al9_centerright
end
object ed_include_f:tedit
autosize=true
caption=""
height=21
left=94
top=66
width=318
end
object bt_i_f:tbtn
autosize=true
caption=".."
height=21
left=414
onclick=bt_i_f_clk
top=66
width=28
end
object lb_tsg:tlabel
left=6
top=89
width=86
height=21
autosize=true
caption="tsg库"
textalign=al9_centerright
end
object ed_tsg:tedit
autosize=true
caption="edit1"
height=21
left=94
top=89
width=318
end
object bt_tsgadd:tbtn
autosize=true
caption=".."
height=21
left=414
onclick=bt_tsgadd_clk
top=89
width=28
end
object label5:tlabel
left=6
top=112
width=86
height=21
autosize=true
caption="排除函数"
textalign=al9_centerright
end
object ed_exclude_f:tedit
autosize=true
caption=""
height=21
left=94
top=112
width=318
end
object bt_d_f:tbtn
autosize=true
caption=".."
height=21
left=414
onclick=bt_d_f_clk
top=112
width=28
end
end
object gp_other:tgroupbox
autosize=true
caption="其他"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=2
leftrightspacing=2
topbottomspacing=2
>
height=97
left=10
parentcolor=true
top=379
width=448
object label9:tlabel
left=6
top=21
width=65
height=25
autosize=true
caption=""
end
object panel3:tpanel
autosize=true
caption="panel3"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=2
leftrightspacing=2
topbottomspacing=2
>
height=25
left=73
top=21
width=316
wsdlgmodalframe=false
object ck_gui:tcheckbtn
autosize=true
caption="gui"
height=21
left=2
top=2
width=56
end
object ck_strong:tcheckbtn
autosize=true
caption="强引用函数"
height=21
left=60
onclick=checkbtn2_clk
top=2
width=105
end
object ck_s_rp:tcheckbtn
autosize=true
caption="资源保留相对路径"
enabled=false
height=21
left=167
top=2
visible=false
width=147
end
end
object label10:tlabel
left=391
top=21
width=28
height=25
autosize=true
caption=""
end
object lb_ico:tlabel
left=6
top=48
width=65
height=21
autosize=true
caption="图标"
textalign=al9_centerright
end
object ed_ico:tedit
autosize=true
caption="edit3"
height=21
left=73
top=48
width=316
end
object bt_ico:tbtn
autosize=true
caption=".."
height=21
left=391
onclick=bt_ico_clk
top=48
width=28
end
object l_namespace:tlabel
left=6
top=71
width=65
height=20
autosize=true
caption="namespace"
end
object e_namespace:tedit
autosize=true
caption="edit1"
height=20
left=73
top=71
width=316
end
object label8:tlabel
left=391
top=71
width=28
height=20
autosize=true
caption=""
end
end
object f_op:topenfileadlg
left=473
top=14
height=30
width=30
caption="openfileadlg1"
filter=<
"ico图标"="*.ico"
>
end
object panel2:tpanel
autosize=true
caption="panel2"
childsizing=<
layout=1
controlsperline=3
horizontalspacing=2
verticalspacing=50
leftrightspacing=50
topbottomspacing=2
>
height=25
left=10
top=486
width=448
wsdlgmodalframe=false
object bt_cmd:tbtn
autosize=true
caption="命令行"
height=21
left=50
onclick=bt_cmd_clk
top=2
width=56
end
object bt_cancel:tbtn
autosize=true
caption="取消"
height=21
left=156
onclick=bt_cancel_clk
top=2
width=42
end
object bt_ok:tbtn
autosize=true
caption="确定"
height=21
left=248
onclick=bt_ok_clk
parentcolor=false
top=2
width=42
end
end
end
designer/ctl_mgr/t_compile_config.tsf
+26 -9
View File
@@ -1,6 +1,6 @@
type t_compile_config=class(tdcreateform) type t_compile_config=class(tdcreateform)
uses tslvcl; uses tslvcl;
bt_ok:tbtn;
gp_dir:tgroupbox; gp_dir:tgroupbox;
bt_f_dir:tbtn; bt_f_dir:tbtn;
bt_s_dir:tbtn; bt_s_dir:tbtn;
@@ -14,20 +14,20 @@ type t_compile_config=class(tdcreateform)
cb_type:tcombobox; cb_type:tcombobox;
lb_output:tlabel; lb_output:tlabel;
ed_output:tedit; ed_output:tedit;
bt_cancel:tbtn;
gp_other:tgroupbox; gp_other:tgroupbox;
ck_gui:tcheckbtn;
ck_strong:tcheckbtn;
ck_s_rp:tcheckbtn;
bt_i_s:tbtn; bt_i_s:tbtn;
lb_ico:tlabel; lb_ico:tlabel;
ed_ico:tedit; ed_ico:tedit;
bt_ico:tbtn; bt_ico:tbtn;
bt_output:tbtn; bt_output:tbtn;
f_op:topenfileadlg; f_op:topenfileadlg;
lb_input:tlabel;
e_script:tedit;
bt_script:tbtn;
bt_outputname:tbtn; bt_outputname:tbtn;
lb_output_f:tlabel; lb_output_f:tlabel;
ed_out_f:tedit; ed_out_f:tedit;
@@ -44,9 +44,26 @@ type t_compile_config=class(tdcreateform)
lb_tsg:tlabel; lb_tsg:tlabel;
ed_tsg:tedit; ed_tsg:tedit;
bt_tsgadd:tbtn; bt_tsgadd:tbtn;
bt_cmd:tbtn;
l_namespace:tlabel; l_namespace:tlabel;
e_namespace:tedit; e_namespace:tedit;
panel1:tpanel;
lb_input:tlabel;
e_script:tedit;
bt_script:tbtn;
panel2:tpanel;
bt_cmd:tbtn;
bt_cancel:tbtn;
bt_ok:tbtn;
label6:tlabel;
label7:tlabel;
panel3:tpanel;
ck_gui:tcheckbtn;
ck_strong:tcheckbtn;
ck_s_rp:tcheckbtn;
label8:tlabel;
label9:tlabel;
label10:tlabel;
function Create(AOwner);override; //构造 function Create(AOwner);override; //构造
begin begin
f_sep := iofileseparator(); f_sep := iofileseparator();
designer/ctl_mgr/resource.tfm/t_dir_list.tfm → designer/ctl_mgr/t_dir_list.tfm
+6 -6
View File
@@ -1,12 +1,12 @@
object dir_list:t_dir_list object dir_list:t_dir_list
caption="Ŀ¼¹ÜÀí" caption="Ŀ¼¹ÜÀí"
height=228 height=239
left=513 left=513
minmaxbox=false minmaxbox=false
onclose=dir_list_close onclose=dir_list_close
top=475 top=475
visible=false visible=false
width=615 width=643
object lst_dir:tlistbox object lst_dir:tlistbox
caption="listbox1" caption="listbox1"
height=176 height=176
@@ -16,7 +16,7 @@ object dir_list:t_dir_list
end end
object btn_add:tbtn object btn_add:tbtn
caption="Ìí¼Ó" caption="Ìí¼Ó"
height=31 height=36
left=496 left=496
onclick=btn_add_clk onclick=btn_add_clk
top=5 top=5
@@ -24,7 +24,7 @@ object dir_list:t_dir_list
end end
object btn_del:tbtn object btn_del:tbtn
caption="ɾ³ý" caption="ɾ³ý"
height=31 height=35
left=496 left=496
onclick=btn_del_clk onclick=btn_del_clk
top=50 top=50
@@ -32,10 +32,10 @@ object dir_list:t_dir_list
end end
object btn_ok:tbtn object btn_ok:tbtn
caption="Íê³É" caption="Íê³É"
height=31 height=40
left=496 left=496
onclick=btn_ok_clk onclick=btn_ok_clk
top=146 top=137
width=86 width=86
end end
object f_d:tfolderchooseadlg object f_d:tfolderchooseadlg
designer/ctl_mgr/resource.tfm/t_editor_color_mgr.tfm → designer/ctl_mgr/t_editor_color_mgr.tfm
+7 -7
View File
@@ -19,7 +19,7 @@ object ditor_color_mgr:t_editor_color_mgr
color=0 color=0
> >
height=382 height=385
left=645 left=645
minmaxbox=false minmaxbox=false
onclose=edtcolormain1_close onclose=edtcolormain1_close
@@ -78,7 +78,7 @@ object ditor_color_mgr:t_editor_color_mgr
leftrightspacing=20 leftrightspacing=20
topbottomspacing=10 topbottomspacing=10
> >
height=39 height=42
left=5 left=5
top=304 top=304
width=352 width=352
@@ -86,7 +86,7 @@ object ditor_color_mgr:t_editor_color_mgr
object btn4:tbtn object btn4:tbtn
autosize=true autosize=true
caption="导入" caption="导入"
height=19 height=22
left=20 left=20
onclick=import_clk onclick=import_clk
top=10 top=10
@@ -95,7 +95,7 @@ object ditor_color_mgr:t_editor_color_mgr
object btn5:tbtn object btn5:tbtn
autosize=true autosize=true
caption="导出" caption="导出"
height=19 height=22
left=78 left=78
onclick=export_clk onclick=export_clk
top=10 top=10
@@ -104,7 +104,7 @@ object ditor_color_mgr:t_editor_color_mgr
object btn3:tbtn object btn3:tbtn
autosize=true autosize=true
caption="还原默认" caption="还原默认"
height=19 height=22
left=136 left=136
onclick=btn3_clk onclick=btn3_clk
top=10 top=10
@@ -113,7 +113,7 @@ object ditor_color_mgr:t_editor_color_mgr
object btn1:tbtn object btn1:tbtn
autosize=true autosize=true
caption="取消" caption="取消"
height=19 height=22
left=226 left=226
onclick=btn1_clk onclick=btn1_clk
top=10 top=10
@@ -122,7 +122,7 @@ object ditor_color_mgr:t_editor_color_mgr
object btn2:tbtn object btn2:tbtn
autosize=true autosize=true
caption="确定" caption="确定"
height=19 height=22
left=284 left=284
onclick=btn2_clk onclick=btn2_clk
top=10 top=10
designer/ctl_mgr/t_editor_color_mgr.tsf
+5 -1
View File
@@ -21,6 +21,7 @@ type t_editor_color_mgr=class(tdcreateform)
listbox1.Items := fcolorindexname; listbox1.Items := fcolorindexname;
listbox1.ItemIndex := 1; listbox1.ItemIndex := 1;
listbox1.SelBkColor := listbox1.Color; listbox1.SelBkColor := listbox1.Color;
listbox1.onfontchanged := thisfunction(lfchanged);
end end
function edtcolormain1_close(o;e);virtual; function edtcolormain1_close(o;e);virtual;
begin begin
@@ -64,7 +65,10 @@ type t_editor_color_mgr=class(tdcreateform)
listbox1.InvalidateRect(nil,false); listbox1.InvalidateRect(nil,false);
end end
end end
function lfchanged();
begin
listbox1.ItemHeight := font.Height+5;
end
function btn1_clk(o;e);virtual; function btn1_clk(o;e);virtual;
begin begin
EndModal(0); EndModal(0);
designer/ctl_mgr/resource.tfm/t_editor_config.tfm → designer/ctl_mgr/t_editor_config.tfm
+5 -5
View File
@@ -114,7 +114,7 @@ object editor_config:t_editor_config
leftrightspacing=10 leftrightspacing=10
topbottomspacing=10 topbottomspacing=10
> >
height=126 height=124
left=10 left=10
parentcolor=true parentcolor=true
top=177 top=177
@@ -176,7 +176,7 @@ object editor_config:t_editor_config
left=14 left=14
top=89 top=89
width=30 width=30
height=23 height=21
autosize=true autosize=true
caption="" caption=""
end end
@@ -184,7 +184,7 @@ object editor_config:t_editor_config
left=54 left=54
top=89 top=89
width=41 width=41
height=23 height=21
autosize=true autosize=true
caption="" caption=""
end end
@@ -192,7 +192,7 @@ object editor_config:t_editor_config
autosize=true autosize=true
caption="´ÓÍ·Æ¥Åä" caption="´ÓÍ·Æ¥Åä"
checked=true checked=true
height=23 height=21
left=105 left=105
top=89 top=89
width=105 width=105
@@ -202,7 +202,7 @@ object editor_config:t_editor_config
caption="panel1" caption="panel1"
height=39 height=39
left=10 left=10
top=313 top=311
width=285 width=285
wsdlgmodalframe=false wsdlgmodalframe=false
object bt_ok:tbtn object bt_ok:tbtn
designer/ctl_mgr/resource.tfm/t_function_finder.tfm → designer/ctl_mgr/t_function_finder.tfm
+9 -9
View File
@@ -29,7 +29,7 @@ object functionfinder:t_function_finder
align=altop align=altop
autosize=true autosize=true
caption="panel1" caption="panel1"
height=35 height=41
left=0 left=0
top=0 top=0
width=804 width=804
@@ -46,18 +46,18 @@ object functionfinder:t_function_finder
object btfind:tbtn object btfind:tbtn
autosize=true autosize=true
caption="ɸѡ" caption="ɸѡ"
height=22 height=25
left=281 left=284
onclick=btfind_clk onclick=btfind_clk
top=7 top=6
width=54 width=54
end end
object ck_prev:tcheckbtn object ck_prev:tcheckbtn
autosize=true autosize=true
caption="´ÓÍ·Æ¥Åä" caption="´ÓÍ·Æ¥Åä"
height=22 height=27
left=370 left=371
top=7 top=8
visible=true visible=true
width=111 width=111
end end
@@ -82,11 +82,11 @@ object functionfinder:t_function_finder
text="º¯Êý" text="º¯Êý"
> >
] ]
height=572 height=566
left=0 left=0
ondblclick=listfunc_ondblclick ondblclick=listfunc_ondblclick
popupmenu=popupmenu1 popupmenu=popupmenu1
top=35 top=41
width=804 width=804
end end
object popupmenu1:tpopupmenu object popupmenu1:tpopupmenu
designer/ctl_mgr/resource.tfm/t_m_list_editor.tfm → designer/ctl_mgr/t_m_list_editor.tfm
+3 -3
View File
@@ -11,14 +11,14 @@ object m_list_editor:t_m_list_editor
left=7 left=7
top=2 top=2
width=325 width=325
height=25 height=31
caption="采用换行分割" caption="采用换行分割"
end end
object m_list:tmemo object m_list:tmemo
caption="memo1" caption="memo1"
height=378 height=371
left=9 left=9
top=31 top=38
width=328 width=328
end end
object bt_cancel:tbtn object bt_cancel:tbtn
designer/ctl_mgr/resource.tfm/t_shortcut_keys_view.tfm → designer/ctl_mgr/t_shortcut_keys_view.tfm
+2 -2
View File
@@ -19,11 +19,11 @@ object shortcut_keys_view:t_shortcut_keys_view
> >
height=684 height=684
left=711 left=420
minmaxbox=false minmaxbox=false
onclose=shortcut_keys_view_close onclose=shortcut_keys_view_close
parentfont=false parentfont=false
top=459 top=217
visible=false visible=false
width=590 width=590
object panel1:tpanel object panel1:tpanel
designer/ctl_mgr/resource.tfm/textcompclassadder.tfm → designer/ctl_mgr/textcompclassadder.tfm
+16 -16
View File
@@ -10,16 +10,16 @@ object extcompclassadder:textcompclassadder
object e_classname:tedit object e_classname:tedit
caption="edit1" caption="edit1"
height=25 height=25
left=91 left=99
readonly=true readonly=true
top=28 top=28
width=255 width=247
end end
object label1:tlabel object label1:tlabel
left=20 left=20
top=28 top=21
width=50 width=72
height=25 height=32
caption="控件类" caption="控件类"
end end
object b_classfile:tbtn object b_classfile:tbtn
@@ -33,41 +33,41 @@ object extcompclassadder:textcompclassadder
object label2:tlabel object label2:tlabel
left=20 left=20
top=72 top=72
width=64 width=65
height=25 height=33
caption="图标" caption="图标"
end end
object p_imgshow:tpanel object p_imgshow:tpanel
caption="img" caption="img"
height=187 height=195
left=91 left=91
top=120 top=107
width=245 width=245
wsdlgmodalframe=false wsdlgmodalframe=false
end end
object b_img:tbtn object b_img:tbtn
caption="添加图标" caption="添加图标"
height=25 height=25
left=91 left=100
onclick=b_img_clk onclick=b_img_clk
top=73 top=72
width=94 width=176
end end
object b_ok:tbtn object b_ok:tbtn
caption="确定" caption="确定"
enabled=true enabled=true
height=31 height=31
left=133 left=134
onclick=b_ok_clk onclick=b_ok_clk
top=317 top=306
width=72 width=72
end end
object b_cancel:tbtn object b_cancel:tbtn
caption="取消" caption="取消"
height=31 height=31
left=283 left=271
onclick=b_cancel_clk onclick=b_cancel_clk
top=317 top=306
width=73 width=73
end end
object f_open:topenfileadlg object f_open:topenfileadlg
designer/ctl_mgr/resource.tfm/textcompclassmgr.tfm → designer/ctl_mgr/textcompclassmgr.tfm
+9 -9
View File
@@ -5,14 +5,14 @@ object extcompclassmgr:textcompclassmgr
minmaxbox=false minmaxbox=false
onclose=extcompclassmgr_close onclose=extcompclassmgr_close
top=272 top=272
width=477 width=484
wssizebox=true wssizebox=true
object listbox1:tlistbox object listbox1:tlistbox
caption="listbox1" caption="listbox1"
height=345 height=339
left=4 left=4
onselchanged=listbox1_sel onselchanged=listbox1_sel
top=38 top=44
width=344 width=344
end end
object b_del:tbtn object b_del:tbtn
@@ -21,7 +21,7 @@ object extcompclassmgr:textcompclassmgr
height=31 height=31
left=364 left=364
onclick=b_del_clk onclick=b_del_clk
top=248 top=224
width=88 width=88
end end
object b_add:tbtn object b_add:tbtn
@@ -29,7 +29,7 @@ object extcompclassmgr:textcompclassmgr
height=31 height=31
left=364 left=364
onclick=b_add_clk onclick=b_add_clk
top=299 top=279
width=88 width=88
end end
object b_ok:tbtn object b_ok:tbtn
@@ -52,13 +52,13 @@ object extcompclassmgr:textcompclassmgr
] ]
left=0 left=0
top=403 top=403
width=461 width=468
end end
object label1:tlabel object label1:tlabel
left=8 left=8
top=10 top=5
width=80 width=176
height=25 height=36
caption="¿Ø¼þÁбí" caption="¿Ø¼þÁбí"
end end
end end
designer/ctl_mgr/resource.tfm/tfm_inheritedwnd.tfm → designer/ctl_mgr/tfm_inheritedwnd.tfm
+15 -15
View File
@@ -1,6 +1,6 @@
object fm_inheritedwnd:tfm_inheritedwnd object fm_inheritedwnd:tfm_inheritedwnd
caption="通过继承构造窗口" caption="通过继承构造窗口"
height=543 height=550
left=526 left=526
minmaxbox=false minmaxbox=false
onclose=fm_inheritedwnd_close onclose=fm_inheritedwnd_close
@@ -11,7 +11,7 @@ object fm_inheritedwnd:tfm_inheritedwnd
caption="statusbar1" caption="statusbar1"
height=25 height=25
left=0 left=0
top=479 top=486
width=417 width=417
end end
object panel2:tpanel object panel2:tpanel
@@ -19,7 +19,7 @@ object fm_inheritedwnd:tfm_inheritedwnd
caption="panel2" caption="panel2"
height=31 height=31
left=0 left=0
top=448 top=455
width=417 width=417
wsdlgmodalframe=false wsdlgmodalframe=false
object label1:tlabel object label1:tlabel
@@ -27,8 +27,8 @@ object fm_inheritedwnd:tfm_inheritedwnd
top=0 top=0
width=18 width=18
height=31 height=31
caption=""
align=alright align=alright
caption=""
end end
object ed_ok:tbtn object ed_ok:tbtn
align=alright align=alright
@@ -45,8 +45,8 @@ object fm_inheritedwnd:tfm_inheritedwnd
top=0 top=0
width=25 width=25
height=31 height=31
caption=" "
align=alright align=alright
caption=" "
end end
object bt_cancel:tbtn object bt_cancel:tbtn
align=alright align=alright
@@ -69,21 +69,21 @@ object fm_inheritedwnd:tfm_inheritedwnd
object label3:tlabel object label3:tlabel
left=0 left=0
top=0 top=0
width=85 width=149
height=27 height=27
caption="可以继承:"
align=alleft align=alleft
caption="可以继承:"
end end
object ed_search:tedit object ed_search:tedit
align=alclient align=alclient
caption="edit1" caption="edit1"
height=27 height=27
left=85 left=149
onchanged=ed_search_onchanged onchanged=ed_search_onchanged
onkeyup=ed_search_keyup onkeyup=ed_search_keyup
placeholder="搜索" placeholder="搜索"
top=0 top=0
width=332 width=268
end end
end end
object panel3:tpanel object panel3:tpanel
@@ -91,31 +91,31 @@ object fm_inheritedwnd:tfm_inheritedwnd
caption="panel1" caption="panel1"
height=35 height=35
left=0 left=0
top=413 top=420
width=417 width=417
wsdlgmodalframe=false wsdlgmodalframe=false
object label4:tlabel object label4:tlabel
left=0 left=0
top=0 top=0
width=85 width=104
height=35 height=35
caption=" 名称:"
align=alleft align=alleft
caption="名称:"
end end
object ed_name:tedit object ed_name:tedit
align=alclient align=alclient
caption="edit1" caption="edit1"
height=35 height=35
left=85 left=104
placeholder="名称" placeholder="名称"
top=0 top=0
width=332 width=313
end end
end end
object lbx_pal:tlistbox object lbx_pal:tlistbox
align=alclient align=alclient
caption="listbox1" caption="listbox1"
height=386 height=393
left=0 left=0
onselchanged=lbx_pal_sel onselchanged=lbx_pal_sel
top=27 top=27
designer/gettsleditorstart.tsf
+1 -1
View File
@@ -1,7 +1,6 @@
//启动tsl编辑器 //启动tsl编辑器
//20230421 整理代码 //20230421 整理代码
uses tslvcl; uses tslvcl;
setprocessdpiawareness(2);
deletefuncacheini(); //清空缓存 deletefuncacheini(); //清空缓存
ops := ""; //待打开文件 ops := ""; //待打开文件
GLobal G_OpenHostory; GLobal G_OpenHostory;
@@ -92,6 +91,7 @@ begin
global g_dotsavehistory; //是否保存打开的历史记录 global g_dotsavehistory; //是否保存打开的历史记录
g_dotsavehistory := true; g_dotsavehistory := true;
end end
setprocessdpiawareness(2);
app := initializeapplication(); app := initializeapplication();
app.createform(class(TRunEditorForm),fm); app.createform(class(TRunEditorForm),fm);
fm.OpenAndGotoFileByName(ops); fm.OpenAndGotoFileByName(ops);
designer/gettslvcldesignerstart.tsf
+26 -12
View File
@@ -2,32 +2,46 @@
tsl界面设计器启动程序 tsl界面设计器启动程序
} }
uses tslvcl,utslvclDesigner; uses tslvcl,utslvclDesigner;
setprocessdpiawareness(2); oldlib := sysgettsllibpath();
deletefuncacheini();
isdebug := false; isdebug := false;
willopen := ""; willopen := "";
for i:= 0 to sysparamcount() do i := 0;
ct := sysparamcount();
while i<=ct do
begin begin
if wait_filename then if ("-tpj"=sysparamstr(i)) then //打开工程
begin
willopen := sysparamstr(i);
wait_filename := 0;
end else
if ("-tpj"=sysparamstr(i)) then
begin begin
wait_filename := true; i++;
if i<=ct then willopen := sysparamstr(i);
end else end else
if ("-DEBUGSERVER" = sysparamstr(i)) then if ("-DEBUGSERVER" = sysparamstr(i)) then
begin begin
isdebug := true; isdebug := true;
break; end else
end if ("-libpath" = sysparamstr(i)) then //设置libpahth
begin
i++;
if i<=ct then
begin
ph := sysparamstr(i);
if oldlib<>ph then
begin
try
syssettsllibpath(ph);
except
end;
end
end
end
i++;
end end
deletefuncacheini();
h := FindWindowA("tsluidesigner_a_a_1",nil); //查找唯一窗口 h := FindWindowA("tsluidesigner_a_a_1",nil); //查找唯一窗口
if not(isdebug) and h then if not(isdebug) and h then
begin begin
return PostMessageA(h,0x400,303,10); return PostMessageA(h,0x400,303,10);
end end
setprocessdpiawareness(2);
app := InitializeApplication(); app := InitializeApplication();
app.createform(class(TVclDesignerStart),Desginer); app.createform(class(TVclDesignerStart),Desginer);
Desginer.Show(); Desginer.Show();
designer/teditorform.tsf
+85 -182
View File
@@ -46,7 +46,8 @@ type teditorform = class(TVCform) //
const c_m_help = "帮助"; const c_m_help = "帮助";
const c_m_manu = "使用手册"; const c_m_manu = "使用手册";
const c_m_tsl_help = "tsl语言帮助"; const c_m_tsl_help = "tsl语言帮助";
const c_m_about = "关于"; const c_m_about = "关于";
const c_m_font = "字体图标大小";
function WMACTIVATE(o,e):WM_ACTIVATE;override; //激活 function WMACTIVATE(o,e):WM_ACTIVATE;override; //激活
begin begin
inherited; inherited;
@@ -97,6 +98,7 @@ type teditorform = class(TVCform) //
Fexefilepath := basepath+"editer"+sp+"tslfile.tsm"; Fexefilepath := basepath+"editer"+sp+"tslfile.tsm";
FOpendpaths := basepath+"editer"+sp+"openedpaths.tsm"; FOpendpaths := basepath+"editer"+sp+"openedpaths.tsm";
FTabWidthpath := basepath+"editer"+sp+"tabwidpath.tsm"; FTabWidthpath := basepath+"editer"+sp+"tabwidpath.tsm";
Fsysfontpath := basepath+"editer"+sp+"sysfont.tsm";
FexefileCmds := basepath+"editer"+sp+"cmds.tsm"; FexefileCmds := basepath+"editer"+sp+"cmds.tsm";
FHistoryPath := basepath+"editer"+sp+"HistoryPath.tsm"; FHistoryPath := basepath+"editer"+sp+"HistoryPath.tsm";
FCodeblockPath := basepath+"editer"+sp+"BlockManager.tsm"; FCodeblockPath := basepath+"editer"+sp+"BlockManager.tsm";
@@ -267,13 +269,16 @@ type teditorform = class(TVCform) //
FCodeBlockMenu.Parent := FTslLangMenu; FCodeBlockMenu.Parent := FTslLangMenu;
FTslFormatMenu.Parent := FTslLangMenu; FTslFormatMenu.Parent := FTslLangMenu;
tbwidth := 4; tbwidth := 4;
if importfile(ftstream(),"",FTabWidthpath,d)=1 and ( d>0 ) then if importfile(ftstream(),"",FTabWidthpath,d)=1 and ( d>0 ) then //tab宽度
begin begin
tbwidth := d; tbwidth := d;
end end
FMTabContain :=new TMenu(self); FMTabContain :=new TMenu(self);
fmshowhltediter :=new TMenu(self); fmshowhltediter :=new TMenu(self);
fmshowhltediter.caption := c_m_edit_color; fmshowhltediter.caption := c_m_edit_color;
fmsysfont :=new TMenu(self);
fmsysfont.caption := c_m_font;
FMTabs := array(); FMTabs := array();
FMTabContain.Caption := c_m_tab_config; FMTabContain.Caption := c_m_tab_config;
for i:= 0 to 6 do for i:= 0 to 6 do
@@ -289,9 +294,13 @@ type teditorform = class(TVCform) //
end end
FMTabContain.parent := FMenuSet; FMTabContain.parent := FMenuSet;
fmshowhltediter.Parent := FMenuSet; fmshowhltediter.Parent := FMenuSet;
fmsysfont.Parent := FMenuSet;
fmshowhltediter.OnClick := function(o,e)begin fmshowhltediter.OnClick := function(o,e)begin
FEdter.showhltcolor(); FEdter.showhltcolor();
end end
fmsysfont.OnClick := function(o,e)begin
FEdter.modifysyssize();
end
mainmenu := m; mainmenu := m;
FmTool.parent := m; FmTool.parent := m;
FEnCodeMenu.parent := m; FEnCodeMenu.parent := m;
@@ -311,8 +320,7 @@ type teditorform = class(TVCform) //
FCloseMenu := new tmenu(self); FCloseMenu := new tmenu(self);
FCloseMenu.Caption:=c_m_close_min; FCloseMenu.Caption:=c_m_close_min;
//FCloseMenu.Checked := true; //FCloseMenu.parent := FMenuSet;
FCloseMenu.parent := FMenuSet;
FCloseMenu.OnClick := function(o,e) FCloseMenu.OnClick := function(o,e)
begin begin
FCloseMenu.Checked := not(FCloseMenu.Checked); FCloseMenu.Checked := not(FCloseMenu.Checked);
@@ -415,15 +423,18 @@ type teditorform = class(TVCform) //
FEdter.OnPageItemSelChanged := thisfunction(PageItemSelChanged); FEdter.OnPageItemSelChanged := thisfunction(PageItemSelChanged);
FEdter.OnPageEditerChanged := thisfunction(PageEditerChanged); FEdter.OnPageEditerChanged := thisfunction(PageEditerChanged);
FEdter.TslExe := tslexefile; FEdter.TslExe := tslexefile;
FEdter.align := alClient; FEdter.align := alClient;
if (importfile(ftstream(),"",feditorglobalpath,ginfo)=1) and ifarray(ginfo) then if (importfile(ftstream(),"",feditorglobalpath,ginfo)=1) and ifarray(ginfo) then
begin begin
global g_editer_font_size := ginfo["font"]; global editorglobalinfo ;
//FEdter.getpage().font := ginfo["font"]; editorglobalinfo := ginfo;
//FEdter.getcodemap().font := ginfo["font"]; if ifarray(ginfo) then
begin
app := initializeapplication();
app.font := array("width":ginfo["fontsize"],"height" :ginfo["fontsize"]*2);
NotifyComponent(self,ginfo);
end
//Fdirview.addrootdirs(dirs);
end end
if importfile(ftstream(),"",fdirspath,dirs)=1 then if importfile(ftstream(),"",fdirspath,dirs)=1 then
begin begin
@@ -708,11 +719,11 @@ type teditorform = class(TVCform) //
if ifarray(d) and d then if ifarray(d) and d then
begin begin
Exportfile(ftstream(),"",Fhighlightpath,d); Exportfile(ftstream(),"",Fhighlightpath,d);
end end
global g_editer_font_size; global editorglobalinfo ;
if ifarray(g_editer_font_size) and g_editer_font_size then if ifarray(editorglobalinfo) and editorglobalinfo then
begin begin
Exportfile(ftstream(),"",feditorglobalpath,array("font":g_editer_font_size)); Exportfile(ftstream(),"",feditorglobalpath,editorglobalinfo);
end end
save_opend_file_name(); save_opend_file_name();
FEdter.CloseAllPageItems(); FEdter.CloseAllPageItems();
@@ -848,156 +859,7 @@ type teditorform = class(TVCform) //
return array(); return array();
end end
protected protected
type TSerlogerSimpleWnd=class(tdcreateform)
uses tslvcl;
label1:tlabel;
furl:tedit;
label2:tlabel;
fport:tedit;
label3:tlabel;
fusr:tedit;
label4:tlabel;
fpwd:tpassword;
flogout:tbtn;
flogin:tbtn;
[weakref]cancel_clk;
[weakref]save_clk;
function Create(AOwner);override; //构造
begin
inherited;
Loader.LoadFromTfmScript(self,getinfo());
flogout.OnClick := function(o,e)begin
calldatafunction(cancel_clk,self,e);
end
flogin.OnClick := function(o,e)begin
calldatafunction(save_clk,self,e);
end
end
function setdata(d);
begin
if not ifarray(d) then return ;
furl.text := d["addr"];
fport.text := d["port"];
fusr.text := d["usr"];
fpwd.text := d["pwd"];
end
function getdata();
begin
r := array();
r["addr"] := furl.text;
r["port"] := fport.text;
r["usr"] := fusr.text;
r["pwd"] := fpwd.text;
return r;
end
function tserlogersimplewnd1_close(o;e);virtual;
begin
Visible := false;
e.skip := true;
end
function Recycling();override; //回收变量
begin
inherited;
ci := self.classinfo(); //将成员变量赋值为nil避免循环引用
for i,v in ci["members"] do
begin
if v["static"]then continue;
invoke(self,v["name"],nil);
end
end
private
function getinfo();
begin
return %%
object tserlogersimplewnd1:tserlogersimplewnd
caption="远程连接信息"
color=0xFFFFFF
height=211
minmaxbox=false
onclose=tserlogersimplewnd1_close
width=422
wsdlgmodalframe=true
wssizebox=true
object label1:tlabel
left=4
top=3
width=80
height=25
caption="服务器地址"
end
object furl:tedit
height=25
left=88
tabstop=true
top=3
width=204
end
object label2:tlabel
left=296
top=3
width=34
height=25
caption="端口"
end
object fport:tedit
height=25
left=333
tabstop=true
top=3
width=62
end
object label3:tlabel
left=2
top=38
width=80
height=25
caption=" 用户名"
end
object fusr:tedit
height=25
left=88
tabstop=true
top=38
width=244
end
object label4:tlabel
left=2
top=72
width=80
height=25
caption=" 密 码"
end
object fpwd:tpassword
height=25
left=88
tabstop=true
top=72
width=245
end
object flogout:tbtn
anchors=[akright akbottom]
caption="取消"
height=23
left=149
tabstop=true
top=130
width=74
end
object flogin:tbtn
anchors=[akright akbottom]
caption="保存"
height=23
left=259
tabstop=true
top=130
width=74
end
end
%%;
end
end
type TBlockEditer = class(TPanel) type TBlockEditer = class(TPanel)
uses TSLVCL,UtslCodeEditor; uses TSLVCL,UtslCodeEditor;
function Create(AOwner);override; function Create(AOwner);override;
@@ -1010,6 +872,7 @@ end
li := new TLabel(self); li := new TLabel(self);
li.caption := v; li.caption := v;
FLabels[i] := li; FLabels[i] := li;
li.TextAlign := AL9_CENTERRIGHT;
li.parent := self; li.parent := self;
end end
FEditers := array(); FEditers := array();
@@ -1046,27 +909,31 @@ end
begin begin
if FLabels and FEditers and FBtn and FCoder and FChecked then if FLabels and FEditers and FBtn and FCoder and FChecked then
begin begin
ft := font;
fh := ft.height+5;
fw := ft.width;
r := ClientRect; r := ClientRect;
lr := array(5,10,45,35); nx := 5+5+fw*7; //标签截止位置
FChecked.SetBoundsRect(array(52,10,72,30)); lr := array(5,10,nx,10+fh);
FChecked.SetBoundsRect(array(nx+5,10,nx+25,30));
for i,v in FLabels do for i,v in FLabels do
begin begin
v.SetBoundsRect(lr); v.SetBoundsRect(lr);
lr[1]+=25; lr[1]+=fh;
lr[3]+=25; lr[3]+=fh;
end end
w := r[2]-r[0]; w := r[2]-r[0];
lr := array(52,10+25,w-48,35+25); lr := array(nx+5,10+fh+1,w-5,10+fh+fh-1);
for i,v in FEditers do for i,v in FEditers do
begin begin
v.SetBoundsRect(lr); v.SetBoundsRect(lr);
lr[1]+=25; lr[1]+=fh+1;
lr[3]+=25; lr[3]+=fh-1;
end end
lr[3] := r[3]-35; lr[3] := r[3]-fh-10;
FCoder.SetBoundsRect(lr); FCoder.SetBoundsRect(lr);
lr := array(lr[2]-100,lr[3]+5,lr[2],r[3]-5); lr := array(lr[2]-fw*6,lr[3]+5,lr[2],r[3]-5);
FBtn.SetBoundsRect(lr); FBtn.SetBoundsRect(lr);
end end
end end
@@ -1099,6 +966,18 @@ end
end end
type TBlockManager=class(TVCForm) type TBlockManager=class(TVCForm)
uses TSLVCL; uses TSLVCL;
function ftchanged(o,e);
begin
if not flist then return ;
ft := font;
if not ft then return ;
fh := ft.height;
fw := ft.width;
FList.ItemHeight := fh+5;
flist.ColumnWidth(0) := fw*6;
flist.ColumnWidth(1) := fw*6;
flist.ColumnWidth(2) := fw*11;
end
function Create(AOwner);override; function Create(AOwner);override;
begin begin
inherited; inherited;
@@ -1154,25 +1033,28 @@ type TBlockManager=class(TVCForm)
class(UtslCodeEditor).move_popwnd_to_center2(FEditer); class(UtslCodeEditor).move_popwnd_to_center2(FEditer);
FEditer.showmodal(); FEditer.showmodal();
end end
OnFontChanged := thisfunction(ftchanged);
end end
function DoControlAlign();override; function DoControlAlign();override;
begin begin
if FList and FBtns then if FList and FBtns then
begin begin
ft := font;
fw := ft.width;
fh := ft.height;
R := ClientRect; R := ClientRect;
R1 := R; R1 := R;
R1[3]-=30; R1[3]-=(fh+10);
FList.SetBoundsRect(R1); FList.SetBoundsRect(R1);
rc := R; rc := R;
RC[1] := R[3]-28; RC[1] := R[3]-(fh+5);
RC[3] := R[3]-2; RC[3] := R[3]-2;
for i,v in Fbtns do for i,v in Fbtns do
begin begin
rc1 := RC; rc1 := RC;
rc1[0] := R[2]-(I+1)*130; rc1[0] := R[2]-(I+1)*(fw*8);
rc1[2] := RC1[0]+95; rc1[2] := RC1[0]+fw*6;
V.SetBoundsRect(rc1); V.SetBoundsRect(rc1);
end end
end end
@@ -1256,8 +1138,8 @@ type tsearchdir = class(TCustomControl)
function Create(AOwner);override; function Create(AOwner);override;
begin begin
inherited; inherited;
ParentFont := false; //ParentFont := false;
font := array("width":10,"height":20); //font := array("width":10,"height":20);
fcopyer := new TClipBoard(self); fcopyer := new TClipBoard(self);
caption := "函数搜索目录:左侧为别名,右侧为-libpath目录...."; caption := "函数搜索目录:左侧为别名,右侧为-libpath目录....";
fcpmenu := new TPopupmenu(self); fcpmenu := new TPopupmenu(self);
@@ -1275,7 +1157,7 @@ type tsearchdir = class(TCustomControl)
FFolder.parent := self; FFolder.parent := self;
FLists := array(); FLists := array();
FBtns := array(); FBtns := array();
for i,v in array(array(2,28,220,430),array(248,2,700,430)) do for i,v in array(array(2,38,220,430),array(248,2,700,430)) do
begin begin
ls := new tdirlistbox(self); ls := new tdirlistbox(self);
ls.SetBoundsRect(v); ls.SetBoundsRect(v);
@@ -1299,6 +1181,7 @@ type tsearchdir = class(TCustomControl)
for i,v in array("+","-","+","-","确定") do for i,v in array("+","-","+","-","确定") do
begin begin
bt := new tbtn(self); bt := new tbtn(self);
if i<4 then bt.ParentFont := false;
bt.caption := v; bt.caption := v;
bt.SetBoundsRect(btrecs[i]); bt.SetBoundsRect(btrecs[i]);
bt.parent := self; bt.parent := self;
@@ -1311,7 +1194,8 @@ type tsearchdir = class(TCustomControl)
FBtns[4].autosize := true; FBtns[4].autosize := true;
///////////////////////////////// /////////////////////////////////
FEdit := new tedit(self); FEdit := new tedit(self);
FEdit.SetBoundsRect(array(2,2,220,26)); FEdit.SetBoundsRect(array(2,2,220,26));
FEdit.autosize := true;
FEdit.parent := self; FEdit.parent := self;
FEdit.onkeyup := thisfunction(editkeyup); FEdit.onkeyup := thisfunction(editkeyup);
FEdit.placeholder := "查找or添加"; FEdit.placeholder := "查找or添加";
@@ -1535,6 +1419,7 @@ end
flastopend; flastopend;
FOpendpaths; FOpendpaths;
FTabWidthpath; FTabWidthpath;
Fsysfontpath;
FFileopen; FFileopen;
FexefileCmds; FexefileCmds;
FCodeblockPath; FCodeblockPath;
@@ -1659,6 +1544,13 @@ type tdirviewer = class(tcustomcontrol)
end end
end end
selnowork(); selnowork();
ftree.OnFontChanged := function(o,e)begin
ft := font;
if ft then
begin
ftree.ItemHeight := ft.height+6;
end
end
end end
function treenodeselchanged(o,e); function treenodeselchanged(o,e);
begin begin
@@ -1716,6 +1608,17 @@ type tdirviewer = class(tcustomcontrol)
end end
ftb.ImageList := fimgs; ftb.ImageList := fimgs;
ftb.parent := self; ftb.parent := self;
ftb.autosize := true;
onnotification := thisfunction(wftchanged);
end
function wftchanged(o,e);
begin
if not fimgs then return ;
d := e.msg;
if ifarray(d) and d["imgsize"]>0 then
begin
fimgs.imgsize := d["imgsize"];
end
end end
function toolclick(o,e); //工具栏事件 function toolclick(o,e); //工具栏事件
begin begin
designer/udesignerproject.tsf
+130 -32
View File
@@ -144,10 +144,10 @@ type TProjectManagerForm = class(TVCForm) //
if findfunction(n)or findclass(n)then return "和现有的函数重名"; if findfunction(n)or findclass(n)then return "和现有的函数重名";
cprojpath := p+fio; cprojpath := p+fio;
fn := f; fn := f;
CreateDirWithFileName(cprojpath+"resource.tfm"+fio+"abc.tfm"); //构建窗口信息文件 //CreateDirWithFileName(cprojpath+"resource.tfm"+fio+"abc.tfm"); //构建窗口信息文件
info := array(); info := array();
info["name"]:= n; info["name"]:= n;
info["version"]:= "1.2.0"; info["version"]:= "1.1.0";
info["dir"]:= array(); info["dir"]:= array();
mfn := n+"main"; mfn := n+"main";
info["files"]:= array( info["files"]:= array(
@@ -175,7 +175,8 @@ end
%%,n,n+"main"); %%,n,n+"main");
ReWriteString(cprojpath+n+".tsl",r); ReWriteString(cprojpath+n+".tsl",r);
ReWriteString(cprojpath+n+"main.tsf",CreateAForm(n+"main")); ReWriteString(cprojpath+n+"main.tsf",CreateAForm(n+"main"));
ReWriteString(cprojpath+"resource.tfm"+fio+format("%smain.tfm",n),CreateAtfm(n+"main",n+"main")); ReWriteString(cprojpath+n+format("%smain.tfm",n),CreateAtfm(n+"main",n+"main"));
//ReWriteString(cprojpath+"resource.tfm"+fio+format("%smain.tfm",n),CreateAtfm(n+"main",n+"main"));
//写入缓存 //写入缓存
FProjectCoder.AddProject(n,f); FProjectCoder.AddProject(n,f);
//添加到list 中 //添加到list 中
@@ -206,6 +207,7 @@ type TProjectView = class(TVCForm) //
FFilterList; FFilterList;
FFilterNodes; FFilterNodes;
Fhighlightpath; Fhighlightpath;
feditorglobalpath;
function ShowFilterList(d); function ShowFilterList(d);
begin begin
if not FFilterList.visible then if not FFilterList.visible then
@@ -342,7 +344,7 @@ type TProjectView = class(TVCForm) //
rc := _wapi.GetScreenRect(); rc := _wapi.GetScreenRect();
left := 20; left := 20;
top := 150; top := 150;
width := 360; //350 width := 330; //350
height := max(400,rc[3]-200); height := max(400,rc[3]-200);
FInput := new TNameInput(self); FInput := new TNameInput(self);
finheritedinput := new tfm_inheritedwnd(self); finheritedinput := new tfm_inheritedwnd(self);
@@ -350,6 +352,7 @@ type TProjectView = class(TVCForm) //
FInput.visible := false; FInput.visible := false;
FInput.parent := self; FInput.parent := self;
FTslEditer := new TTslEditer(AOwner); FTslEditer := new TTslEditer(AOwner);
FTslEditer.Notification(FTslEditer,"change_editor_keys");
FTslEditer.FExecuteEditer.cannotadd := true; FTslEditer.FExecuteEditer.cannotadd := true;
FTslEditer.FExecuteEditer.onsaveclk := function(o,e) FTslEditer.FExecuteEditer.onsaveclk := function(o,e)
begin begin
@@ -361,6 +364,7 @@ type TProjectView = class(TVCForm) //
FTslEditer.TslCacheDir := bpath+"designer"+fio+"cmpCaches"; FTslEditer.TslCacheDir := bpath+"designer"+fio+"cmpCaches";
FCodeblockPath := bpath+"editer"+fio+"BlockManager.tsm"; FCodeblockPath := bpath+"editer"+fio+"BlockManager.tsm";
Fhighlightpath := bpath+"editer"+fio+"highlight.tsm"; Fhighlightpath := bpath+"editer"+fio+"highlight.tsm";
feditorglobalpath := bpath+"editer"+fio+"feditorglobalpath.tsm";
if 1=importfile(ftstream(),"",FCodeblockPath,blockd)and blockd and ifarray(blockd)then if 1=importfile(ftstream(),"",FCodeblockPath,blockd)and blockd and ifarray(blockd)then
begin begin
class(TTSLCompletion).FCodeBlocks := blockd; class(TTSLCompletion).FCodeBlocks := blockd;
@@ -382,14 +386,32 @@ type TProjectView = class(TVCForm) //
nd := FTree.CurrentNode; nd := FTree.CurrentNode;
if nd and (nd["type"] in array("panel","form")) then FDesigner.EditerCodeChanged(nd); if nd and (nd["type"] in array("panel","form")) then FDesigner.EditerCodeChanged(nd);
end end
//FTslEditer.Parent := AOwner; imgs := New TControlImageList(self);
imgs.onnotification := function(o,e)begin
d := e.msg;
if ifarray(d) and d["imgsize"]>0 then
begin
o.imgsize := d["imgsize"];
end
end
if (importfile(ftstream(),"",feditorglobalpath,ginfo)=1) and ifarray(ginfo) then
begin
global editorglobalinfo ;
editorglobalinfo := ginfo;
if ifarray(ginfo) then
begin
app := initializeapplication();
app.font := array("width":ginfo["fontsize"],"height" :ginfo["fontsize"]*2);
NotifyComponent(self,ginfo);
end
end
FTslEditer.Parent := AOwner;
FTmfParser := new TTmfParser(); FTmfParser := new TTmfParser();
FTslParser := new ttslscripparser(); FTslParser := new ttslscripparser();
FTreeTool := new TToolBar(self); FTreeTool := new TToolBar(self);
FTreeTool.autosize := true;
FTreeTool.parent := self; FTreeTool.parent := self;
imgs := New TControlImageList(self);
imgs.width := 24;
imgs.height := 24;
imgs.DrawBmpFirst := true; imgs.DrawBmpFirst := true;
EditToolBmps := array(); EditToolBmps := array();
for i,v in GetToolBtns() do for i,v in GetToolBtns() do
@@ -411,6 +433,7 @@ type TProjectView = class(TVCForm) //
FTreeTool.ImageList := imgs; FTreeTool.ImageList := imgs;
//**************目录树筛选功能*********************************** //**************目录树筛选功能***********************************
FFilter := new TEdit(self); FFilter := new TEdit(self);
FFilter.autosize := true;
FFilterList := new TListBox(self); FFilterList := new TListBox(self);
FFilterList.color := 0xdcF8ff; FFilterList.color := 0xdcF8ff;
FFilterList.visible := false; FFilterList.visible := false;
@@ -522,6 +545,7 @@ type TProjectView = class(TVCForm) //
it.parent := fnewmenu; it.parent := fnewmenu;
it.OnClick := thisfunction(newadd); it.OnClick := thisfunction(newadd);
end end
return; return;
end end
function setnodesel(nd); function setnodesel(nd);
@@ -891,6 +915,10 @@ type TProjectView = class(TVCForm) //
if r then FTslEditer.OpenAndGotoFileByName(r); if r then FTslEditer.OpenAndGotoFileByName(r);
ShowEditor(); ShowEditor();
end end
function opensysfontmgr();
begin
FTslEditer.modifysyssize();
end
function ShowCurrenttfm(); function ShowCurrenttfm();
begin begin
if FCurrentOpend then r := FCurrentOpend.gettmfname(); if FCurrentOpend then r := FCurrentOpend.gettmfname();
@@ -1002,7 +1030,6 @@ type TProjectView = class(TVCForm) //
it := FTslEditer.OpenAndGoLineByName(tfm); it := FTslEditer.OpenAndGoLineByName(tfm);
if it then if it then
begin begin
//FTmfParser.ScriptPath := FCurrentOpend.gettmfname();
sc := it.FEditer.text; sc := it.FEditer.text;
FTmfParser.Script := sc; FTmfParser.Script := sc;
FCurrentOpend.ftfmscript := sc; FCurrentOpend.ftfmscript := sc;
@@ -1135,6 +1162,7 @@ type TProjectView = class(TVCForm) //
FExecEntry := d["entryscript"]; FExecEntry := d["entryscript"];
end end
FTslEditer.setExecuteEditerSetcmdline(d["commandline"]); FTslEditer.setExecuteEditerSetcmdline(d["commandline"]);
move_tfm_to_tsf(p);
OpenMainForm(); //打开主窗口 OpenMainForm(); //打开主窗口
end end
@@ -1285,6 +1313,8 @@ end %%,fn);
if ph then ph += fio; if ph then ph += fio;
else ph := ""; else ph := "";
ph := cprojpath+ph+n+".tsf"; ph := cprojpath+ph+n+".tsf";
tfm := ph;
tfm[(length(tfm)-3):length(tfm)] := ".tfm";
if not(FileExists("",ph))then if not(FileExists("",ph))then
begin begin
r := format(%% r := format(%%
@@ -1301,7 +1331,8 @@ end
ReWriteString(ph,r); ReWriteString(ph,r);
FTmfParser.ScriptPath := nd.gettmfname(); FTmfParser.ScriptPath := nd.gettmfname();
r := FTmfParser.inheritedcoy(n+"1",n,nd.Fname); r := FTmfParser.inheritedcoy(n+"1",n,nd.Fname);
ReWriteString((FCProjectPath+"resource.tfm"+fio+n+".tfm"),r); ReWriteString(tfm,r);
//ReWriteString((FCProjectPath+"resource.tfm"+fio+n+".tfm"),r);
end else end else
begin begin
FTslParser.ScriptPath := ph; FTslParser.ScriptPath := ph;
@@ -1332,7 +1363,8 @@ end
if ph then ph += fio; if ph then ph += fio;
else ph := ""; else ph := "";
ph := cprojpath+ph+n+".tsf"; ph := cprojpath+ph+n+".tsf";
tfm := FCProjectPath+"resource.tfm"+fio+n+".tfm"; tfm := ph;
tfm[(length(tfm)-3):length(tfm)] := ".tfm";
if not(FileExists("",ph))then if not(FileExists("",ph))then
begin begin
r := CreateAForm(n); r := CreateAForm(n);
@@ -1378,7 +1410,9 @@ end
if ph then ph += fio; if ph then ph += fio;
else ph := ""; else ph := "";
ph := cprojpath+ph+n+".tsf"; ph := cprojpath+ph+n+".tsf";
tfm := (FCProjectPath+"resource.tfm"+fio+n+".tfm"); //tfm := (FCProjectPath+"resource.tfm"+fio+n+".tfm");
tfm := ph;
tfm[(length(tfm)-3):length(tfm)] := ".tfm";
if not FileExists("",ph)then if not FileExists("",ph)then
begin begin
r := CreateAPanel(n); r := CreateAPanel(n);
@@ -1763,6 +1797,11 @@ end
begin begin
exportfile(ftstream(),"",Fhighlightpath,d); exportfile(ftstream(),"",Fhighlightpath,d);
end end
global editorglobalinfo ;
if ifarray(editorglobalinfo) and editorglobalinfo then
begin
Exportfile(ftstream(),"",feditorglobalpath,editorglobalinfo);
end
end end
private private
FMoveMnus; FMoveMnus;
@@ -1833,6 +1872,10 @@ end
CreateDirWithFileName(FCProjectPath+ndr+fio+d["name"]+"."+ft); CreateDirWithFileName(FCProjectPath+ndr+fio+d["name"]+"."+ft);
if 1=filerename("",FCProjectPath+ml+d["name"]+"."+ft,FCProjectPath+ndr+d["name"]+"."+ft) then if 1=filerename("",FCProjectPath+ml+d["name"]+"."+ft,FCProjectPath+ndr+d["name"]+"."+ft) then
begin begin
if FileExists("",(FCProjectPath+ml+d["name"]+".tfm")) then
begin
filerename("",FCProjectPath+ml+d["name"]+".tfm",FCProjectPath+ndr+d["name"]+".tfm");
end
nd.Recycling(); nd.Recycling();
SaveProjInfo(); SaveProjInfo();
//移动成功 //移动成功
@@ -2338,16 +2381,34 @@ type TFileTree = class(TTreeCtl)
if FFType in array( "form","panel") then if FFType in array( "form","panel") then
begin begin
if not(ifstring(nn) and nn) then nn := Fname; if not(ifstring(nn) and nn) then nn := Fname;
return Owner.fprojectpath+"resource.tfm"+fio+nn+".tfm"; return Owner.fprojectpath+FPath2()+nn+".tfm";
//return Owner.fprojectpath+"resource.tfm"+fio+nn+".tfm";
end end
end end
function gettmfdirs();//获得tmfdir function gettmfdirs();//获得tmfdir
begin begin
if FFType in array( "form","panel") then if FFType in array( "form","panel") then
begin begin
return array( Owner.fprojectpath+"resource.tfm"+fio); //return array( Owner.fprojectpath+"resource.tfm"+fio);
return listdirs(Owner.fprojectpath);
end end
end end
function listdirs(dir);
begin
r := array();
fio := dir[length(dir)];
r[0] := dir;
for i,v in FileList("",dir+"*") do
begin
vn := v["FileName"];
if vn="." or vn=".." then continue;
if pos("D",v["Attr"]) then
begin
r union=listdirs(dir+vn+fio);
end
end
return r;
end
property FFileInfo read FFFileInfo write setfileinfo; property FFileInfo read FFFileInfo write setfileinfo;
fio; fio;
fdtree; fdtree;
@@ -2957,6 +3018,11 @@ type TNameInput=class(TCustomControl) //
FBtn.Click(); FBtn.Click();
end end
end end
autosize := true;
FEidt.autosize := true;
FLabel.autosize := true;
FBtn.autosize := true;
childsizing := array("layout":1);
end end
function sellAllText(); function sellAllText();
begin begin
@@ -3048,6 +3114,56 @@ type TProjectAddDlg=class(TCustomControl) //
FBtn; FBtn;
FOnBtnClk; FOnBtnClk;
end end
////////////////////////////////////////////////////////////////
function move_tfm_to_tsf(dir);
begin
tsfs := array();
tfms := array();
find_tsf_tfm(dir,tsfs,tfms);
fs := iofileseparator();
for i,v in tsfs do
begin
tfmi := tfms[i];
if tfmi then
begin
sf := tfmi[0];
df := v+fs+tfmi[1];
if sf<>df then
begin
if filecopy("",sf,"",df) then
begin
filedelete("",sf);
end
end
end
end
if not(FileList("",dir+iofileseparator()+"resource.tfm"+iofileseparator()+"*.tfm")) then removedir("",dir+iofileseparator()+"resource.tfm");
end
function find_tsf_tfm(dir,tsfs,tfms);
begin
fs := iofileseparator();
for i,v in filelist("",dir+fs+"*") do
begin
vn := v["FileName"];
if vn="." or vn=".." then continue;
if pos("D",v["Attr"]) then //??
begin
find_tsf_tfm(dir+fs+vn,tsfs,tfms) ;
end else
begin
if parseregexpr("(.+)\\.tsf",vn,"i",mr,mp,ml)=1 then
begin
tsfs[lowercase(mr[0,1])] := dir;
end else
if parseregexpr("(.+)\\.tfm",vn,"i",mr,mp,ml)=1 then
begin
fn := dir+fs+vn;
tfms[lowercase(mr[0,1])] := array(fn,vn);
end
end
end
end
/////////////////////////////////////////////////////////////////
function ReWriteString(fn,d); function ReWriteString(fn,d);
begin begin
if not ifstring(d)then return 0; if not ifstring(d)then return 0;
@@ -3084,24 +3200,6 @@ r := format(%% type %s=class(tdcreatepanel)
begin begin
inherited; inherited;
end end
function DoControlAlign();override;//对齐子控件
begin
//当窗口大小改变时,该函数会被调用,
//可以通过 clientrect 获取客户区大小,设置子控件的位置以及大小
//如果自己处理了子控件的对齐,就可以去掉 inherited
inherited;
end
function Recycling();override;
begin
inherited;
ci := self.classinfo();
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 end
%%,n); %%,n);
return r; return r;
designer/utslcodeeditor.tsf
+325 -128
View File
@@ -72,7 +72,7 @@ type TPage=class(TCustomControl) //
function Create(AOwner) function Create(AOwner)
begin begin
Inherited; Inherited;
ParentFont := false; //ParentFont := false;
FCloseBtn := false; FCloseBtn := false;
FPageItems := new TMyarrayB(); FPageItems := new TMyarrayB();
FMultiLine := 1; FMultiLine := 1;
@@ -125,9 +125,10 @@ type TPage=class(TCustomControl) //
begin begin
if GetItemIndex(it)>= 0 then InValidateRect(it.Rect,false); if GetItemIndex(it)>= 0 then InValidateRect(it.Rect,false);
end end
function FontChanged();override;//字体改变 function FontChanged(o);override;//字体改变
begin begin
FLineHeight := font.Height+6; FLineHeight := font.Height+6;
inherited;
DoControlAlign(); DoControlAlign();
end end
function IncPaintLock(); function IncPaintLock();
@@ -636,14 +637,6 @@ type TEditerAuxiliary=class(TPage) //
//FFileFindeItem := CreateApageItem(); //FFileFindeItem := CreateApageItem();
OnSelChanged := thisfunction(OnSelChangedCall); OnSelChanged := thisfunction(OnSelChangedCall);
CloseBtn := true; CloseBtn := true;
onnotification := function(o,e)begin
ms := e.message;
if ifarray(ms) and ms[0] ="font" then
begin
font := ms[1];
InValidateRect(nil,false);
end
end
end end
function WMNCLBUTTONDOWN(o,e):WM_NCLBUTTONDOWN;override; function WMNCLBUTTONDOWN(o,e):WM_NCLBUTTONDOWN;override;
begin begin
@@ -677,6 +670,7 @@ type TEditerAuxiliary=class(TPage) //
{$endif} {$endif}
if CurrentItem then wnd := CurrentItem.Tag; if CurrentItem then wnd := CurrentItem.Tag;
if wnd then wnd.SetBoundsRect(Rc); if wnd then wnd.SetBoundsRect(Rc);
InValidateRect(nil,false);
end end
function ShowPopUp();//弹出 function ShowPopUp();//弹出
begin begin
@@ -873,7 +867,7 @@ type TExecuteEditer=class(TCustomControl) //ִ
WSpOPUp := true; WSpOPUp := true;
FItems := new TMyArrayB(); FItems := new TMyArrayB();
caption := "编辑 Execute....."; caption := "编辑 Execute.....";
SetBoundsRect(array(50,50,930,201)); //SetBoundsRect(array(50,50,930,301));
FMemo := new TSynMemoNorm(self); FMemo := new TSynMemoNorm(self);
FMemo.OnKeyPress := function(o,e) FMemo.OnKeyPress := function(o,e)
begin begin
@@ -901,13 +895,21 @@ type TExecuteEditer=class(TCustomControl) //ִ
end} end}
FMemo.Border := true; FMemo.Border := true;
FMemo.parent := self;
FChooser := new TComboBoxb(self); //new TEditList(self); FChooser := new TComboBoxb(self); //new TEditList(self);
FChooser.ongetpreferredsize := function(o,e)begin
e.Width := 200;
e.Height := font.Height+5;
end ;
FChooser.autosize := true;
FChooser.ReadOnly := false; FChooser.ReadOnly := false;
FChooser.parent := self;
FOkBtn := new TBtn(self); FOkBtn := new TBtn(self);
FOkBtn.autosize := true;
FCancelBtn := new TBtn(self); FCancelBtn := new TBtn(self);
FCancelBtn.autosize := true;
FEgnorBtn := new TBtn(self); FEgnorBtn := new TBtn(self);
FEgnorBtn.autosize := true;
cp := new TExecuteMemoComp(self); cp := new TExecuteMemoComp(self);
FMemo.Completion := cp; FMemo.Completion := cp;
cp.PrepareCompletion(); cp.PrepareCompletion();
@@ -919,14 +921,31 @@ type TExecuteEditer=class(TCustomControl) //ִ
FOkBtn.Caption := "保存/添加"; FOkBtn.Caption := "保存/添加";
FCancelBtn.Caption := "删除当前"; FCancelBtn.Caption := "删除当前";
FEgnorBtn.caption := "取消"; FEgnorBtn.caption := "取消";
FOkBtn.parent := self;
FCancelBtn.parent := self; FMemo.font := array("width":10,"height":20);
FEgnorBtn.parent := self;
FMemo.parent := self;
FChooser.OnSelChanged := thisfunction(OnChooserChanged); FChooser.OnSelChanged := thisfunction(OnChooserChanged);
FCancelBtn.OnClick := thisfunction(DeleteCurrent); FCancelBtn.OnClick := thisfunction(DeleteCurrent);
FOkBtn.OnClick := thisfunction(doSaveCurrentName); FOkBtn.OnClick := thisfunction(doSaveCurrentName);
FEGnorBtn.OnClick := thisfunction(OnIgnore); FEGnorBtn.OnClick := thisfunction(OnIgnore);
//
FMemo.parent := self;
FMemo.ongetpreferredsize:=function(o,e)begin
e.Width := 800;
e.Height := 150;
end
pal := new TPanel(self);
pal.WsDlgModalFrame := false;
fpal := pal;
pal.childsizing := array("controlsperline":10,"layout":1,"verticalspacing":50,"horizontalspacing":3,"topbottomspacing":2);
FChooser.parent := pal;
FCancelBtn.parent := pal;
FOkBtn.parent := pal;
FEgnorBtn.parent := pal;
autosize := true;
childsizing := array("layout":2,"controlsperline":3,"horizontalspacing":3,"topbottomspacing":2);
pal.autosize := true;
pal.Parent := self;
end end
function Recycling();override; function Recycling();override;
begin begin
@@ -943,7 +962,7 @@ type TExecuteEditer=class(TCustomControl) //ִ
if length(FChooser.Items)<2 then return ; if length(FChooser.Items)<2 then return ;
FChooser.DeleteItem(FChooser.ItemIndex); FChooser.DeleteItem(FChooser.ItemIndex);
end end
function DoControlAlign();override; {function DoControlAlign();override;
begin begin
if FMemo and FChooser and FCancelBtn and FOkBtn and FEgnorBtn then if FMemo and FChooser and FCancelBtn and FOkBtn and FEgnorBtn then
begin begin
@@ -954,16 +973,15 @@ type TExecuteEditer=class(TCustomControl) //ִ
tp := r1[3]+2; tp := r1[3]+2;
wd := 200; wd := 200;
x := 50; x := 50;
FChooser.SetBoundsRect(array(x,tp,x+200,tp+26)); FChooser.SetBoundsRect(array(x,tp,x+200,tp+28));
x += 230;
FCancelBtn.SetBoundsRect(array(x,tp,x+180,tp+28));
x += 200;
FOkBtn.SetBoundsRect(array(x,tp,x+180,tp+28));
x += 200; x += 200;
FCancelBtn.SetBoundsRect(array(x+20,tp,x+20+100,tp+26)); FEgnorBtn.SetBoundsRect(array(x,tp,x+180,tp+28));
x += 120;
FOkBtn.SetBoundsRect(array(x+20,tp,x+100,tp+26));
x += 120;
FEgnorBtn.SetBoundsRect(array(x+20,tp,x+100,tp+26));
x += 120;
end end
end end}
function OnIgnore(); function OnIgnore();
begin begin
idx := FChooser.ItemIndex; idx := FChooser.ItemIndex;
@@ -1039,8 +1057,9 @@ type TExecuteEditer=class(TCustomControl) //ִ
it := O.GetItem(idx); it := O.GetItem(idx);
FMemo.Text := it.fexe; FMemo.Text := it.fexe;
end else end else
FMemo.Text := ""; FMemo.Text := "";
FMemo.ClearUndo(); FMemo.ClearUndo();
FMemo.ExecuteCommand(FMemo.ecGotoXY,array(1,1));
end end
function GetData(); //获得数据 function GetData(); //获得数据
begin begin
@@ -1074,6 +1093,7 @@ type TExecuteEditer=class(TCustomControl) //ִ
FOkBtn; FOkBtn;
FItems; FItems;
FEgnorBtn; FEgnorBtn;
fpal;
private private
function GetItemIndex(); function GetItemIndex();
begin begin
@@ -1685,41 +1705,44 @@ type TPageEditer=class(TPage) //
FMenu := nil; FMenu := nil;
FPageItemOnRClick := nil; FPageItemOnRClick := nil;
end end
fscroling;
function DoMouseWheel(o,e);override; function DoMouseWheel(o,e);override;
begin begin
IF ssCtrl in e.shiftstate then IF ssCtrl in e.shiftstate then
begin begin
fw := font.Width; if fscroling then return ;
hw := font.height; fscroling := true;
ft := o.font;
fw := ft.Width;
hw := ft.height;
if e.delta<0 then if e.delta<0 then
begin begin
if fw>6 then if fw>6 then
begin begin
if fw=18 then
begin
fw :=17;
hw :=34;
end
finfo := array("width":fw-1,"height":hw-2); finfo := array("width":fw-1,"height":hw-2);
end end
end else end else
begin begin
if fw<24 then if fw<44 then
begin begin
if fw=16 then
begin
fw := 17;
hw := 34;
end
finfo := array("width":fw+1,"height":hw+2); finfo := array("width":fw+1,"height":hw+2);
end end
end end
if finfo then if finfo then
begin begin
font := finfo; //font := finfo;
callMessgeFunction(onscrollfont,o,finfo); //callMessgeFunction(onscrollfont,o,finfo);
a := InitializeApplication();
if a then
begin
a.font := finfo;
end
global editorglobalinfo;
if not ifarray(editorglobalinfo) then editorglobalinfo := array();
editorglobalinfo["fontsize"] := finfo["width"];
InValidateRect(nil,false); InValidateRect(nil,false);
end end
fscroling := false;
return; return;
end end
end end
@@ -1777,8 +1800,7 @@ type TEditer=class(TCustomcontrol) //
begin begin
inherited; inherited;
if not Fhightercolor then if not Fhightercolor then
Fhightercolor := new thighlitcolor(self); Fhightercolor := new thighlitcolor(self);
FOpenHistory := new TMyarrayb(); FOpenHistory := new TMyarrayb();
FFistShows := array(); FFistShows := array();
FSynHCS := New TMyArrayA(); FSynHCS := New TMyArrayA();
@@ -1790,52 +1812,25 @@ type TEditer=class(TCustomcontrol) //
FCurrentItemCode := array(); FCurrentItemCode := array();
FGoBackA := new TMyarrayB(); FGoBackA := new TMyarrayB();
FGoBackB := new TMyarrayB(); FGoBackB := new TMyarrayB();
//FToolbar := new TToolBar(self); //工具栏
ftoolbara := new TToolBar(self); //工具栏 ftoolbara := new TToolBar(self); //工具栏
ftoolbarb := new TToolBar(self); //工具栏 ftoolbarb := new TToolBar(self); //工具栏
FStatus := new TStatusBar(self); //状态栏 FStatus := new TStatusBar(self); //状态栏
fcoolbar := new tcoolbar(self); fcoolbar := new tcoolbar(self);
fcoolbar.ParentFont := false;
ftoolbara.Align := alNone; ftoolbara.Align := alNone;
ftoolbarb.Align := alNone; ftoolbarb.Align := alNone;
//ftoolbara.Width := 430;
//ftoolbarb.Width := 250;
fcoolbar.autosize := true; fcoolbar.autosize := true;
FInfoShowWnd := new TEditerAuxiliary(self); FInfoShowWnd := new TEditerAuxiliary(self);
FPageEditer := new TPageEditer(self); FPageEditer := new TPageEditer(self);
FPageEditer.onscrollfont := function(o,ft)begin onnotification := function(o,e)begin
fh := ft["height"]; d := e.msg;
if fh>34 then return ; if ifarray(d) and d["imgsize"]>0 then
global g_editer_font_size := ft;
self.Notification(self,array("font",ft));
FinCodemap.FTree.font := ft;
FinCodemap.FTree.ItemHeight := fh+6;
if fh<20 then
begin begin
isz := array(24,24); FImages.imgsize := d["imgsize"];
end else end
if fh>=20 and fh<24 then end
begin
isz := array(28,28);
end else
if fh>=24 and fh<28 then
begin
isz := array(32,32);
end else
if fh>=28 and fh<31 then
begin
isz := array(36,36);
end else
begin
isz := array(40,40);
end
FImages.imgsize := isz;
fcoolbar.font := ft;
end
//FPageEditer.CloseBtn := true; //FPageEditer.CloseBtn := true;
FPageEditer.Onbmpbclick := function(o,e) FPageEditer.Onbmpbclick := function(o,e)
begin begin
it := e._Tag; it := e._Tag;
if not it then return ; if not it then return ;
if it.fisnewfile then //单独处理新建关闭 if it.fisnewfile then //单独处理新建关闭
@@ -1887,8 +1882,8 @@ type TEditer=class(TCustomcontrol) //
end; end;
FFindWnd := new TFindWnd(self); //查找 FFindWnd := new TFindWnd(self); //查找
FFindWnd.ParentFont := false; //FFindWnd.ParentFont := false;
FFindWnd.font := array("height":20,"width":10); //FFindWnd.font := array("height":20,"width":10);
FGotoLineWnd := new TGoToLineWnd(self); //共同 FGotoLineWnd := new TGoToLineWnd(self); //共同
FListPages := new TListPages(self); //tab 跳转页面 FListPages := new TListPages(self); //tab 跳转页面
FEchoWnd := new TEditerEchoWnd(self); FEchoWnd := new TEditerEchoWnd(self);
@@ -1911,9 +1906,9 @@ type TEditer=class(TCustomcontrol) //
FGotoLineWnd.Visible := false; FGotoLineWnd.Visible := false;
///////////////////////// /////////////////////////
FFindWnd.Visible := false; FFindWnd.Visible := false;
FFileSave.Filter := array("any":"*.*","tsl文件":"*.tsl;*.tsf"); FFileSave.Filter := array("tsl函数":"*.tsf","tsl脚本":"*.tsl","any":"*.*");
FFileSave.Caption := "另存为"; FFileSave.Caption := "另存为";
FFileopen.Filter := array("any":"*.*","tsl文件":"*.tsl;*.tsf"); FFileopen.Filter := array("tsl文件":"*.tsl;*.tsf","any":"*.*");
FPageEditer.OnSelChanged := thisfunction(PageItemSelChanged); FPageEditer.OnSelChanged := thisfunction(PageItemSelChanged);
//////// ////////
FListPages.Visible := false; FListPages.Visible := false;
@@ -1931,9 +1926,6 @@ type TEditer=class(TCustomcontrol) //
//////////// ////////////
FPageEditer.PageItemOnRClick := thisfunction(PageItemOnRClick); FPageEditer.PageItemOnRClick := thisfunction(PageItemOnRClick);
FImages := new TControlImageList(self); FImages := new TControlImageList(self);
//FImages.Width := 24;
//FImages.Height := 24;
FImages.imgsize := array(24,24);
imgs := GetEditIcons(); imgs := GetEditIcons();
id := 0; id := 0;
FToolbtns := array(); FToolbtns := array();
@@ -1970,7 +1962,6 @@ type TEditer=class(TCustomcontrol) //
FImages.DrawBmpFirst := true; FImages.DrawBmpFirst := true;
Fdbgbtns := dbgbtns; Fdbgbtns := dbgbtns;
FTslDebug.addbtns(dbgbtns); FTslDebug.addbtns(dbgbtns);
//FToolbar.ImageList := FImages;
ftoolbara.autosize := true; ftoolbara.autosize := true;
ftoolbara.ParentFont := true; ftoolbara.ParentFont := true;
ftoolbarb.autosize := true; ftoolbarb.autosize := true;
@@ -1980,10 +1971,8 @@ type TEditer=class(TCustomcontrol) //
ftoolbara.Parent := fcoolbar; ftoolbara.Parent := fcoolbar;
ftoolbarb.Parent := fcoolbar; ftoolbarb.Parent := fcoolbar;
FInfoShowWnd.Visible := false; FInfoShowWnd.Visible := false;
//FInfoShowWnd.WsSysMenu := true;
FInfoShowWnd.WSsizebox := true; FInfoShowWnd.WSsizebox := true;
FInfoShowWnd.height := 200; FInfoShowWnd.height := 200;
//FInfoShowWnd.OnSize := thisfunction(DoControlAlign);
FInfoShowWnd.OnCloseClick := function(o,e) FInfoShowWnd.OnCloseClick := function(o,e)
begin begin
o.visible := false; o.visible := false;
@@ -2037,7 +2026,24 @@ type TEditer=class(TCustomcontrol) //
end end
ffuncfind := new t_function_finder(self); ffuncfind := new t_function_finder(self);
FShortCutshower := new t_shortcut_keys_view(self); FShortCutshower := new t_shortcut_keys_view(self);
fsyssizemgr := new tsyssizemgr(self);
fsyssizemgr.Parent := self;
end end
function modifysyssize();
begin
global editorglobalinfo;
if fsyssizemgr.show_syssize() then
begin
r := editorglobalinfo;
editorglobalinfo := fsyssizemgr.GetInfo();
editorglobalinfo["syssize"] := true;
app := InitializeApplication();
sz := editorglobalinfo["fontsize"];
sz2 := sz*2;
app.font := array("width":sz,"height":sz2);
if not(r) or (ifarray( r ) and r["imgsize"]<>editorglobalinfo["imgsize"]) then NotifyComponent(fsyssizemgr,editorglobalinfo);
end
end
function PopUpAuxiliary(); function PopUpAuxiliary();
begin begin
FInfoShowWnd.ShowPopUp(); FInfoShowWnd.ShowPopUp();
@@ -2262,6 +2268,7 @@ type TEditer=class(TCustomcontrol) //
s := FExecuteEditer.GetCurrentExuteString(it.Scriptpath); s := FExecuteEditer.GetCurrentExuteString(it.Scriptpath);
FEchoWnd.Exec("",s,h); FEchoWnd.Exec("",s,h);
end end
fsyssizemgr;
compile_config; compile_config;
fpg_config_infos; fpg_config_infos;
function buildpageitem(it); function buildpageitem(it);
@@ -3073,7 +3080,7 @@ type TEditer=class(TCustomcontrol) //
FHistoryWnd.Caption := "打开历史...."; FHistoryWnd.Caption := "打开历史....";
FHistoryWnd.WSsysMenu := true; FHistoryWnd.WSsysMenu := true;
FHistoryWnd.WsSizeBox := true; FHistoryWnd.WsSizeBox := true;
FHistoryWnd.Width := 400; FHistoryWnd.Width := 700;
FHistoryWnd.Height := 600; FHistoryWnd.Height := 600;
{FHistoryClearMenuPop := new TPopUpMenu(self); {FHistoryClearMenuPop := new TPopUpMenu(self);
FHistoryClearMenu := new TMenu(self); FHistoryClearMenu := new TMenu(self);
@@ -3372,7 +3379,8 @@ type TEditer=class(TCustomcontrol) //
fcoolbar.SetBoundsRect(r); fcoolbar.SetBoundsRect(r);
end end
r := rr; r := rr;
r[1]:= r[3]-FStatus.Height; ft := font;
r[1]:= r[3]-ft.Height-5;//FStatus.Height;
FStatus.SetBoundsRect(r); FStatus.SetBoundsRect(r);
rr := rr; rr := rr;
if htoolbar then if htoolbar then
@@ -3883,7 +3891,7 @@ type TEditer=class(TCustomcontrol) //
if not fhltediter then if not fhltediter then
begin begin
fhltediter := new t_editor_color_mgr(self); fhltediter := new t_editor_color_mgr(self);
fhltediter.ParentFont := false; //fhltediter.ParentFont := false;
fhltediter.Parent := self; fhltediter.Parent := self;
fhltediter.colorinfo := fhltediterdata; fhltediter.colorinfo := fhltediterdata;
end end
@@ -4601,7 +4609,7 @@ type TEditList=class(TComboBox)
inherited; inherited;
width := 280; width := 280;
Height := 26; Height := 26;
dropdowncount := 30; dropdowncount := 15;
FMaxCoder := 20; FMaxCoder := 20;
ReadONly := false; ReadONly := false;
Editer.OnKeyDown := function(o,e) Editer.OnKeyDown := function(o,e)
@@ -4637,6 +4645,7 @@ type TEditList=class(TComboBox)
end end
end; end;
end end
text := "";
end end
function Recycling();override; function Recycling();override;
begin begin
@@ -4894,18 +4903,9 @@ type tfincodemap = class(tcustomcontrol)
Ftimer.Interval := 200; Ftimer.Interval := 200;
Ftimer.Ontimer := thisfunction(BdownTimeOut); Ftimer.Ontimer := thisfunction(BdownTimeOut);
Ftimer.Enabled := false; Ftimer.Enabled := false;
FList := new TCombobox(self);
flist.Width := 180;
ar := array("Class","Function","Statements","If","Else","SubCase","Goto","Try","Empty_Begin_End","NeedSql","Unit","property","Member");
flist.Multisel := true;
FList.AppendItems(ar);
flist.ItemIndex := 0->(length(ar)-1);
FList.Parent := self;
initbtn(); initbtn();
FTree := new TTreeView(self); FTree := new TTreeView(self);
FTree.ParentFont := false;
FTree.font := array("width":11,"height":22);
ftree.ItemHeight := 28; ftree.ItemHeight := 28;
FTree.OnSelChanged := thisfunction(SynNodeSelected); FTree.OnSelChanged := thisfunction(SynNodeSelected);
FTree.Parent := self; FTree.Parent := self;
@@ -4944,7 +4944,7 @@ type tfincodemap = class(tcustomcontrol)
FList.SetBoundsRect(r); FList.SetBoundsRect(r);
fcbtn.left := rr[2]-25; fcbtn.left := rr[2]-25;
r := rr; r := rr;
r[1]:= 27; r[1]:= FList.Height+2;
r[0]:=1; r[0]:=1;
r[2]:=r[2]-3; r[2]:=r[2]-3;
FTree.SetBoundsRect(r); FTree.SetBoundsRect(r);
@@ -5161,11 +5161,20 @@ EA5E0BB7C5850E4063EDA83420076B5E10000000049454E44AE42608200";
bmp := new TBitmap(); bmp := new TBitmap();
bmp.ReadVcon(HexformatStrToTsl(s)); bmp.ReadVcon(HexformatStrToTsl(s));
ffbtn.BKBitmap := bmp; ffbtn.BKBitmap := bmp;
FList := new TCombobox(self);
FList.autosize := true;
flist.Width := 180;
ar := array("Class","Function","Statements","If","Else","SubCase","Goto","Try","Empty_Begin_End","NeedSql","Unit","property","Member");
flist.Multisel := true;
FList.AppendItems(ar);
flist.ItemIndex := 0->(length(ar)-1);
FList.Parent := self;
end end
function geteditor(); function geteditor();
begin begin
if not owner then return 0; if not owner then return 0;
it := Owner.GetCurrentItem(); it := Owner.GetCurrentItem();
if not it then return 0;
edit := it.FEditer; edit := it.FEditer;
if not edit then return 0; if not edit then return 0;
m := edit.HighLighter ; m := edit.HighLighter ;
@@ -5272,15 +5281,15 @@ type TFindListWnd=class(TListBox) //
function Create(AOwner); function Create(AOwner);
begin begin
inherited; inherited;
font := array("width":11,"height":22); //font := array("width":11,"height":22);
ParentFont := false; //ParentFont := false;
onnotification := function(o,e)begin {onnotification := function(o,e)begin
ms := e.message; ms := e.message;
if ifarray(ms) and ms[0] ="font" then if ifarray(ms) and ms[0] ="font" then
begin begin
font := ms[1]; font := ms[1];
end end
end end }
end end
function CheckListItem(s);override; function CheckListItem(s);override;
begin begin
@@ -5319,9 +5328,26 @@ type TFindWnd=class(TPage)
if sec then r["section"]:= sec; if sec then r["section"]:= sec;
r["btn"]:= btn; r["btn"]:= btn;
end end
function ftchanged(o,e); //字体改变
begin
//设置大小
ft := font;
if not ft then return ;
fh := ft.Height;
fw := ft.Width;
h := 14*(fh+10);
fbtnheight := fh+10;
ffontwidth := fw;
fbtnwidth := fw*11+20;
feditwidth := 300;
Width := fbtnwidth*2+80+300;
Height := h;
//DoControlAlign();
end
function Create(AOwner);override; function Create(AOwner);override;
begin begin
inherited; inherited;
OnClose := function(o,e) OnClose := function(o,e)
begin begin
Parent.EndFind(); Parent.EndFind();
@@ -5335,7 +5361,7 @@ type TFindWnd=class(TPage)
WSsYSMenu := true; WSsYSMenu := true;
//WsSizeBox := true; //WsSizeBox := true;
caption := "查找"; caption := "查找";
SetBoundsRect(array(300,300,920,680)); //SetBoundsRect(array(300,300,920,680));
IncPaintLock(); IncPaintLock();
for i,v in array("查找","替换","文件查找") do for i,v in array("查找","替换","文件查找") do
begin begin
@@ -5352,7 +5378,7 @@ type TFindWnd=class(TPage)
FDirChooser := new TFolderChooseADlg(self); FDirChooser := new TFolderChooseADlg(self);
FEdit_dir_btn := new TBtn(self); FEdit_dir_btn := new TBtn(self);
flabels := array(); flabels := array();
for i,v in array("查找目标:"," 替换为:","文件类型:"," 目录:") do for i,v in array("查找目标"," 替换为","文件类型"," 目录") do
begin begin
lb := new TLabel(self); lb := new TLabel(self);
lb.TextAlign := AL9_CENTERRIGHT; lb.TextAlign := AL9_CENTERRIGHT;
@@ -5397,6 +5423,7 @@ type TFindWnd=class(TPage)
FBtn_Count := new TFindBtn(self); // 计数 FBtn_Count := new TFindBtn(self); // 计数
FBtn_Count_a := new TFindBtn(self); // 计数 FBtn_Count_a := new TFindBtn(self); // 计数
FBtn_replaceall := new TFindBtn(self); FBtn_replaceall := new TFindBtn(self);
FCheck_subdir := new TFindCheck(self); //保护子目录
FBtn_Find.caption := "查找"; FBtn_Find.caption := "查找";
FBtn_replace.caption := "替换"; FBtn_replace.caption := "替换";
FBtn_Count_a.Caption := "计数"; FBtn_Count_a.Caption := "计数";
@@ -5423,7 +5450,6 @@ type TFindWnd=class(TPage)
FCheck_case := new TFindCheck(self); FCheck_case := new TFindCheck(self);
FCheck_cycle := new TFindCheck(self); FCheck_cycle := new TFindCheck(self);
FCheck_reg := new TFindCheck(self); FCheck_reg := new TFindCheck(self);
FCheck_subdir := new TFindCheck(self);
FCheck_gt := new TFindCheck(self); FCheck_gt := new TFindCheck(self);
FCheck_subdir.checked := true; FCheck_subdir.checked := true;
FCheck_subdir.Left := 425; FCheck_subdir.Left := 425;
@@ -5457,10 +5483,23 @@ type TFindWnd=class(TPage)
FCheck_subdir.parent := self; FCheck_subdir.parent := self;
FStatus := new TStatusBar(self); FStatus := new TStatusBar(self);
//FStatus.Align := alNone; //FStatus.Align := alNone;
FStatus.Items := array(("text":"","width":700)); FStatus.Items := array(("text":"","width":1000));
FStatus.Parent := self; FStatus.Parent := self;
OnSelChanged := thisfunction(DoSelChanged); OnSelChanged := thisfunction(DoSelChanged);
ItemIndex := 0; ItemIndex := 0;
ft := font;
fh := ft.Height;
fw := ft.Width;
h := 14*(fh+10);
fbtnheight := fh+10;
ffontwidth := fw;
fbtnwidth := fw*11+20;
feditwidth := 300;
Width := fbtnwidth*2+80+300;
fsatusok := true;
Height := h;
onfontchanged := thisfunction(ftchanged);
//SetStatusText("查找"); //SetStatusText("查找");
end end
function FindBtnClick(o,e); function FindBtnClick(o,e);
@@ -5539,7 +5578,6 @@ type TFindWnd=class(TPage)
begin begin
v.PushItem(v.Editer.Text); v.PushItem(v.Editer.Text);
end end
//if e then e.PushItem(e.Editer.Text);
end end
function DoSelChanged(o,e); function DoSelChanged(o,e);
begin begin
@@ -5593,16 +5631,76 @@ type TFindWnd=class(TPage)
end end
end end
end end
function DoControlAlign();override; function docontrolalign();override;
begin begin
inherited; inherited;
if not FStatus then return; if not fsatusok then return ;
lf := 0;
tp := fbtnheight;
bw := fbtnwidth;
lh := fbtnheight-4;
fw := ffontwidth;
intv := 20;
lintv := 10;
lrec := array(lf,tp,lf+bw,tp+lh);
for i,v in flabels do
begin
if not v then return ;
v.setboundsrect(lrec);
lrec[1]+=lh+lintv;
lrec[3]+=lh+lintv;
end
lrec[0]+=intv;
lrec[2]+=intv;
for i,v in array(FCheck_revers,FCheck_wrap,FCheck_case,FCheck_cycle,FCheck_reg) do
begin
if not v then return ;
v.setboundsrect(lrec);
lrec[1]+=lh+lintv;
lrec[3]+=lh+lintv;
end
lrec := array(lf+bw+intv,tp,lf+bw+feditwidth+intv,tp+lh);
for i,v in array(FEdit_Target,FEdit_repace) do
begin
if not v then return ;
v.setboundsrect(lrec);
lrec[1]+=lh+lintv;
lrec[3]+=lh+lintv;
end
FEdit_Type.setboundsrect(lrec);
lrec[1]+=lh+lintv;
lrec[3]+=lh+lintv;
FEdit_dir.setboundsrect(lrec);
r := lrec;
r[2]-=fw*3;
lrec[0] := r[2]+1;
FEdit_dir_btn.setboundsrect(lrec);
lrec := array(lrec[2]+intv,tp,lrec[2]+bw+intv,tp+lh);
for i,v in array(FBtn_Find,array(FBtn_Count_a,FBtn_replace),FBtn_replaceall,array(FCheck_subdir,FBtn_Count)) do
begin
if ifarray(v) then
begin
for j,vj in v do
begin
if not vj then return ;
vj.setboundsrect(lrec);
end
end else
begin
if not v then return ;
v.setboundsrect(lrec);
end
lrec[1]+=lh+lintv;
lrec[3]+=lh+lintv;
end
if not FStatus then return;
rc := ClientRect; rc := ClientRect;
rc[1]:= rc[3]-30; rc[1]:= rc[3]-ffontwidth*2-5;
FStatus.SetBoundsRect(rc); FStatus.SetBoundsRect(rc);
end end
function recycling();override; function recycling();override;
begin begin
fsatusok := false;
inherited; inherited;
FStatus := nil; FStatus := nil;
end end
@@ -5619,27 +5717,35 @@ type TFindWnd=class(TPage)
begin begin
if not ifarray(d)then return; if not ifarray(d)then return;
fds := d["finds"]; fds := d["finds"];
if ifarray(fds)then if ifarray(fds) and fds then
begin begin
FEdit_Target.Items := fds; FEdit_Target.Items := fds;
FEdit_Target.ItemIndex := -1;
end end
rps := d["repalces"]; rps := d["repalces"];
if ifarray(rps)then if ifarray(rps) and rps then
begin begin
FEdit_repace.Items := rps; FEdit_repace.Items := rps;
end end
dirs := d["dirs"]; dirs := d["dirs"];
if ifarray(dirs)then if ifarray(dirs) and dirs then
begin begin
FEdit_dir.items := dirs; FEdit_dir.items := dirs;
FEdit_dir.ItemIndex := 0;
end end
dirs := d["findfiletyps"]; dirs := d["findfiletyps"];
if ifarray(dirs)then if ifarray(dirs) and dirs then
begin begin
FEdit_Type.items := dirs; FEdit_Type.items := dirs;
FEdit_Type.ItemIndex := 0;
end end
end end
private private
fsatusok;
fbtnheight;
fbtnwidth;
feditwidth;
ffontwidth;
weakref weakref
FStatus; FStatus;
FDirChooser; FDirChooser;
@@ -5669,8 +5775,8 @@ type TGoToLineWnd=class(TVCForm) //
function Create(AOwner);override; function Create(AOwner);override;
begin begin
inherited; inherited;
ParentFont := false; //ParentFont := false;
font := array("width":10,"height":20); //font := array("width":10,"height":20);
wssizebox := false; wssizebox := false;
minmaxbox := false; minmaxbox := false;
WsDlgModalFrame := true; WsDlgModalFrame := true;
@@ -5786,9 +5892,100 @@ type TMouseMoveList=class(TListBox)
private private
FCurrentIndex; FCurrentIndex;
end end
type tsyssizemgr = class(TVCForm)
uses tslvcl;
function create(AOwner);
begin
inherited;
Caption := "字体图标大小";
Visible := false;
WSSizebox := false;
minmaxbox := false;
WsCaption := "sys size";
lb1 := new TLabel(self);
lb1.Caption := "系统字体大小:";
lb1.autosize := true;
lb2 := new TLabel(self);
lb2.Caption := "系统图标大小:";
lb2.autosize := true;
fsysimg := new TCombobox(self);
fsysimg.autosize := true;
fsysimg.Items := inttostr(array(24,8)->64);
fsysimg.ItemIndex := 0;
fsysfont := new TCombobox(self);
fsysfont.autosize := true;
fsysfont.Items := inttostr(array(8,2)->36);
fsysfont.ItemIndex := 0;
lb3 := new TLabel(self);
lb3.Caption := "";
pal := new tcustomcontrol(self);
pal.autosize := true;
fok := new tbtn(self);
fok.caption := "确定";
fok.autosize := true;
fcancel := new tbtn(self);
fcancel.caption := "取消";
fcancel.autosize := true;
fcancel.Parent := pal;
fok.Parent := pal;
fcancel.Parent := pal;
lb1.Parent := self;
fsysfont.Parent := self;
lb2.Parent := self;
fsysimg.Parent := self;
lb3.Parent := self;
pal.Parent := self;
childsizing := array("layout":1,"controlsperline":2);
pal.childsizing := array("layout":1,"controlsperline":2,"topbottomspacing":3);
autosize := true;
fok.onclick := thisfunction(okclk);
fcancel.onclick := thisfunction(cancelclk);
fsysimg.ongetpreferredsize := thisfunction(egetpsize);
fsysfont.ongetpreferredsize := thisfunction(egetpsize);
end
function egetpsize(o,e);
begin
ft := font;
e.Height := ft.Height+5;
e.Width := ft.Width*7;
end
function okclk(o,e);
begin
EndModal(1);
end
function cancelclk(o,e);
begin
EndModal(0);
end
function setinfo(r); //设置数据
begin
isz := r["imgsize"];
if isz>0 then fsysimg.Text := inttostr(isz);
fsz := r["fontsize"];
if fsz>0 then fsysfont.Text := inttostr(fsz);
end
function getinfo();
begin
r := array();
r["imgsize"] := StrToIntDef(fsysimg.Text,24);
r["fontsize"] := StrToIntDef(fsysfont.Text,10);
return r;
end
function DoWMCLOSE(o,e);override;
begin
e.skip := true;
EndModal(0);
end
function show_syssize();
begin
global editorglobalinfo;
setinfo(editorglobalinfo?:array());
center_popup_wnd(self);
return ShowModal();
end
fsysimg;
fsysfont;
end
function GetEditIcons(); function GetEditIcons();
begin begin
r := array(); r := array();
designer/utslvcldebuger.tsf
+316 -160
View File
@@ -686,7 +686,7 @@ type TTslDebuga=class(TCustomControl)
function Create(AOwner); function Create(AOwner);
begin begin
inherited; inherited;
init_item_height := 30; //init_item_height := 30;
fscriptbrks := array(); fscriptbrks := array();
//Frundirect := false; //Frundirect := false;
FCmdHistory := array(); FCmdHistory := array();
@@ -698,14 +698,15 @@ type TTslDebuga=class(TCustomControl)
dbwnd.Align := alClient; dbwnd.Align := alClient;
dbwnd.Parent := self; dbwnd.Parent := self;
FStackList := new TListView(self); // new TListBox(self); //new tmemo(self);// FStackList := new TListView(self); // new TListBox(self); //new tmemo(self);//
FStackList.ItemHeight := init_item_height;
//FStackList.ItemHeight := init_item_height;
FStackList.Columns := array(("text":"line","width":80), FStackList.Columns := array(("text":"line","width":80),
("text":"function","width":250) //,("text":"type","width":70) ("text":"function","width":250) //,("text":"type","width":70)
); );
FStackList.Border := true; FStackList.Border := true;
FVaraiblesList := new TGroupGridA(self); FVaraiblesList := new TGroupGridA(self);
FVaraiblesList.Border := false; FVaraiblesList.Border := false;
FVaraiblesList.ItemHeight := init_item_height; //FVaraiblesList.ItemHeight := init_item_height;
FVaraiblesList.Columns := array(("text":"name","width":105), FVaraiblesList.Columns := array(("text":"name","width":105),
("text":"value","width":135), ("text":"value","width":135),
("text":"type","width":80) ("text":"type","width":80)
@@ -713,7 +714,7 @@ type TTslDebuga=class(TCustomControl)
FCommandtext := new TEdit(self); FCommandtext := new TEdit(self);
FCommandtext.autosize := true; FCommandtext.autosize := true;
FCommandtext.placeholder := "命令输入框"; FCommandtext.placeholder := "命令输入框";
FCommandtext.Height := init_item_height; //FCommandtext.Height := init_item_height;
FCommandtext.onkeyup := thisfunction(cmdkeyup); FCommandtext.onkeyup := thisfunction(cmdkeyup);
FShowText := new tmemo(self); FShowText := new tmemo(self);
FShowText.ReadOnly := true; FShowText.ReadOnly := true;
@@ -754,20 +755,18 @@ type TTslDebuga=class(TCustomControl)
begin begin
return 1; return 1;
end end
onnotification := function(o,e)begin self.onfontchanged := function(o,e)begin
if not (FStackList and FVaraiblesList) then return ; if (FVaraiblesList and FStackList) then
ms := e.message; begin
if ifarray(ms) and ms[0] ="font" then ft := o.font;
begin if ft then
ft := ms[1]; begin
FStackList.font := ft; ht := ft.Height;
FStackList.ItemHeight := ft["height"]+6; FVaraiblesList.ItemHeight := ht+6;
FVaraiblesList.font := ft; FStackList.ItemHeight := ht+6;
FVaraiblesList.ItemHeight := ft["height"]+6; end
//font := ms[1]; end
end end
end
end end
function addbreak(item,idx,n); //添加断点 function addbreak(item,idx,n); //添加断点
begin begin
@@ -1944,38 +1943,43 @@ type ttempclass = class()
end end
type tdbgselwnd=class(tdcreateform) type tdbgselwnd=class(tdcreateform)
uses tslvcl; uses tslvcl;
fdiag:tfolderchooseadlg;
flist:tlistview;
cancel_clk;
save_clk;
dbg_clk;
fhistorydir;
panel3:tpanel;
label1:tlabel; label1:tlabel;
portpal:tpanel;
furl:tedit; furl:tedit;
label2:tlabel; label2:tlabel;
fport:tedit; fport:tedit;
label3:tlabel; label3:tlabel;
fusr:tedit; fusr:tedit;
label4:tlabel; label4:tlabel;
label5:tlabel;
fpwd:tpassword; fpwd:tpassword;
fdir:tedit; label6:tlabel;
fdiag:tfolderchooseadlg; panel2:tpanel;
flist:tlistview;
fcbtn:tbtn;
flogout:tbtn; flogout:tbtn;
flogin:tbtn; flogin:tbtn;
label5:tlabel;
panel1:tpanel;
fdir:tedit;
fcbtn:tbtn;
panel4:tpanel;
fdbg:tbtn; fdbg:tbtn;
cancel_clk;
save_clk;
dbg_clk;
fhistorydir;
function Create(AOwner);override; //构造 function Create(AOwner);override; //构造
begin begin
inherited; inherited;
Visible := false; Visible := false;
ParentFont := false; //ParentFont := false;
Loader.LoadFromTfmScript(self,getinfo()); Loader.LoadFromTfmScript(self,getinfo());
flist.Columns := array( flist.Columns := array(("text":"ID号","width":150)
("text":"ID号","width":150), ,("text":"信息","width":300)
("text":"信息","width":300), ,("text":"创建时间","width":100)
("text":"创建时间","width":100)
); );
flogout.top := 140; //flogout.top := 140;
flogout.OnClick := function(o,e) flogout.OnClick := function(o,e)
begin begin
calldatafunction(cancel_clk,self,e); calldatafunction(cancel_clk,self,e);
@@ -1995,15 +1999,56 @@ type tdbgselwnd=class(tdcreateform)
calldatafunction(dbg_clk,self,e); calldatafunction(dbg_clk,self,e);
end end
setlist(); setlist();
onfontchanged := thisfunction(ftchanged);
end
function ftchanged(o,e);
begin
ft := font;
if flist and ft then
begin
flist.ItemHeight := ft.Height+6;
end
end
function panel1_gprefsize(o;e);virtual;
begin
ft := font;
if not ft then return;
fh := ft.Height;
fw := ft.Width;
e.width := 400; //宽度
e.height := fh+10; //高度
end
function flist_gprefsize(o;e);
begin
{**
@explan(说明) 获取最佳的尺寸 %%
@param(o)(tcontrol)控件 %%
@param(e)(tmmeasuresize) 消息对象 %%
**}
e.width := 600; //宽度
e.height := 400; //高度
end
function fusr_gprefsize(o;e);
begin
ft := font;
if not ft then return;
fh := ft.Height;
fw := ft.Width;
e.width := 400; //宽度
e.height := fh+5; //高度
end end
function setattachwait(flg); //设置登陆样式 function setattachwait(flg); //设置登陆样式
begin begin
if flg then if flg then
begin begin
Height := 210; //Height := 210;
flist.Visible := false;
panel4.Visible := false;
end else end else
begin begin
Height := 550; //Height := 550;
flist.Visible := true;
panel4.Visible := true;
end end
end end
function loaddata(); //导入数据 function loaddata(); //导入数据
@@ -2088,132 +2133,243 @@ type tdbgselwnd=class(tdcreateform)
begin begin
return %% return %%
object tserlogersimplewnd1:tserlogersimplewnd object tserlogersimplewnd1:tserlogersimplewnd
caption="远程调试" autosize=true
color=0xFFFFFF caption="远程调试"
top=100 childsizing=<
height=550 layout=2
minmaxbox=false controlsperline=4
onclose=tserlogersimplewnd1_close horizontalspacing=10
width=580 verticalspacing=10
wsdlgmodalframe=true leftrightspacing=10
wssizebox=false topbottomspacing=10
object label1:tlabel >
left=4 color=0xFFFFFF
top=3 height=636
width=80 left=700
height=25 minmaxbox=false
caption="服务器地址" onclose=tserlogersimplewnd1_close
end top=271
object furl:tedit width=452
height=25 wsdlgmodalframe=true
left=88 wssizebox=false
tabstop=true object fdiag:tfolderchooseadlg
top=3 left=501
width=204 top=34
end height=30
object label2:tlabel width=30
left=296 caption="执行目录"
top=3 end
width=34 object panel3:tpanel
height=25 autosize=true
caption="端口" caption="panel3"
end childsizing=<
object fport:tedit layout=1
height=25 controlsperline=2
left=333 horizontalspacing=5
tabstop=true verticalspacing=5
top=3 leftrightspacing=5
width=62 topbottomspacing=5
end >
object label3:tlabel height=136
left=2 left=10
top=38 top=10
width=80 width=416
height=25 wsdlgmodalframe=false
caption=" 用户名" object label1:tlabel
end left=5
object fusr:tedit top=5
height=25 width=58
left=88 height=22
tabstop=true autosize=true
top=38 caption="服务地址"
width=300 textalign=al9_centerright
end end
object label4:tlabel object portpal:tpanel
left=2 autosize=true
top=72 caption="panel1"
width=80 childsizing=<
height=25 layout=1
caption=" 密 码" controlsperline=3
end horizontalspacing=0
object label5:tlabel verticalspacing=1
left=2 leftrightspacing=0
top=100 topbottomspacing=1
width=80 >
height=25 height=22
caption=" 脚本目录" left=68
end top=5
width=343
object fpwd:tpassword wsdlgmodalframe=false
height=25 object furl:tedit
left=88 caption="edit1"
tabstop=true height=20
top=72 left=0
width=300 tabstop=true
end top=1
object fdir:tedit width=204
height=25 end
left=88 object label2:tlabel
tabstop=true left=205
top=100 top=1
width=300 width=30
end height=20
object fcbtn:tbtn autosize=true
caption="..." caption="端口"
height=25 end
left=390 object fport:tedit
tabstop=true caption="edit1"
top=100 height=20
width=22 left=236
onclick=getdir tabstop=true
end top=1
object flogout:tbtn width=62
an1chors=[akright akbottom] end
caption="取消" end
height=23ff object label3:tlabel
left=375 left=5
tabstop=true top=32
top=480 width=58
width=74 height=20
end autosize=true
object fdbg:tbtn caption="用户名"
an1chors=[akright akbottom] textalign=al9_centerright
caption="调试" end
height=23 object fusr:tedit
left=470 caption="edit1"
tabstop=true height=20
top=480 left=68
width=74 ongetpreferredsize=fusr_gprefsize
end tabstop=true
object flogin:tbtn top=32
caption="连接" width=343
height=23 end
left=470 object label4:tlabel
tabstop=true left=5
top=140 top=57
width=74 width=58
end height=20
object flist:tlistview autosize=true
anch1ors=[akTop akright akLeft akBottom] caption="密码"
height=290 textalign=al9_centerright
left=2 end
top=180 object fpwd:tpassword
width=560 caption="password1"
end height=20
object fdiag:tfolderchooseadlg left=68
caption="执行目录" ongetpreferredsize=fusr_gprefsize
end tabstop=true
top=57
width=343
end
object label5:tlabel
left=5
top=82
width=58
height=21
autosize=true
caption="脚本目录"
textalign=al9_centerright
end
object panel1:tpanel
autosize=true
caption="panel1"
childsizing=<
layout=1
controlsperline=2
horizontalspacing=0
verticalspacing=3
leftrightspacing=1
topbottomspacing=0
>
height=21
left=68
ongetpreferredsize=panel1_gprefsize
top=82
width=343
wsdlgmodalframe=false
object fdir:tedit
caption="edit1"
height=21
left=1
tabstop=true
top=0
width=300
end
object fcbtn:tbtn
caption="..."
height=21
left=304
onclick=getdir
tabstop=true
top=0
width=35
end
end
object label6:tlabel
left=5
top=108
width=58
height=23
autosize=true
caption=""
end
object panel2:tpanel
autosize=true
caption="panel2"
height=23
left=68
top=108
width=343
wsdlgmodalframe=false
object flogout:tbtn
autosize=true
caption="取消"
height=21
left=147
tabstop=true
top=0
width=42
end
object flogin:tbtn
autosize=true
caption="连接"
height=21
left=300
tabstop=true
top=0
width=42
end
end
end
object flist:tlistview
height=400
left=10
ongetpreferredsize=flist_gprefsize
top=156
width=416
end
object panel4:tpanel
autosize=true
caption="panel4"
height=21
left=10
top=566
width=416
wsdlgmodalframe=false
object fdbg:tbtn
align=alright
anchors=[aktop akleft]
autosize=true
caption="调试"
height=21
left=374
tabstop=true
top=0
width=42
end
end
end end
%%; %%;
end end
private private
designer/utslvcldesigner.tsf
+28 -19
View File
@@ -513,6 +513,10 @@ type TVclDesigner = class(tvcform)
begin begin
FProjectManager.ShowCurrentFormCode();//ShowEditor(); FProjectManager.ShowCurrentFormCode();//ShowEditor();
end end
function opensysfontmgr();
begin
FProjectManager.opensysfontmgr();
end
function opentfm(); //打开资源文件 function opentfm(); //打开资源文件
begin begin
FProjectManager.ShowCurrenttfm(); FProjectManager.ShowCurrenttfm();
@@ -574,9 +578,11 @@ type TVclDesigner = class(tvcform)
)), )),
("type":"menu","caption":"工具","items":( ("type":"menu","caption":"工具","items":(
("type":"menu","caption":"设计器目录","checked":0,"onclick":thisfunction(open_tsl_dir)),
("type":"menu","caption":"控件管理","checked":0,"onclick":thisfunction(mgr_control)), ("type":"menu","caption":"控件管理","checked":0,"onclick":thisfunction(mgr_control)),
("type":"menu","caption":"打开图片","checked":0,"onclick":thisfunction(ViewBitmap)), ("type":"menu","caption":"打开图片","checked":0,"onclick":thisfunction(ViewBitmap)),
("type":"menu","caption":"编辑器颜色","checked":0,"onclick":thisfunction(showhltcolor)) ("type":"menu","caption":"编辑器颜色","checked":0,"onclick":thisfunction(showhltcolor)),
("type":"menu","caption":"字体图标大小","onclick":thisfunction(opensysfontmgr))
)), )),
("type":"menu","caption":"帮助","items":( ("type":"menu","caption":"帮助","items":(
("type":"menu","caption":"关于","onclick":thisfunction(openabout)), ("type":"menu","caption":"关于","onclick":thisfunction(openabout)),
@@ -1498,8 +1504,8 @@ type TVclDesigner = class(tvcform)
function create(AOwner); function create(AOwner);
begin begin
inherited; inherited;
ParentFont := false; //ParentFont := false;
Font := array("width":10,"height":20); //Font := array("width":10,"height":20);
top := 10; top := 10;
left := 10; left := 10;
rect := _wapi.GetScreenRect(); rect := _wapi.GetScreenRect();
@@ -1564,12 +1570,17 @@ type TVclDesigner = class(tvcform)
FPropGrid.align := alclient; FPropGrid.align := alclient;
FEventGrid.align := alclient; FEventGrid.align := alclient;
FPropGrid.parent := FProp; FPropGrid.parent := FProp;
FEventGrid.parent := FEvent; FEventGrid.parent := FEvent;
Mobjinspect(); Mobjinspect();
onactivate := thisfunction(OnDesignerActivate); onactivate := thisfunction(OnDesignerActivate);
fdimagelist := new TDesigImageList(self); fdimagelist := new TDesigImageList(self);
global editorglobalinfo ;
if ifarray(editorglobalinfo) and editorglobalinfo then
begin
fdimagelist.imgsize := editorglobalinfo["imgsize"];
end
//FTree.Imagelist := fdimagelist; //FTree.Imagelist := fdimagelist;
fwindowinfos := new tfilesinfo(self,thisfunction(ClickTreeNode),fdimagelist,tparent); fwindowinfos := new tfilesinfo(self,thisfunction(ClickTreeNode),fdimagelist,tparent);
//******************toolbar *************** //******************toolbar ***************
@@ -1608,9 +1619,6 @@ type TVclDesigner = class(tvcform)
FToolBars := new TDesignertoolbars(self); FToolBars := new TDesignertoolbars(self);
FToolBars.Imagelist := fdimagelist; FToolBars.Imagelist := fdimagelist;
FToolBars.Font.width := 10;
FToolBars.Font.height := 20;
FToolBars.linkimagelist := FProjectManager.FTslEditer.gettoolbarimglist();
addtoolbuttons(); addtoolbuttons();
FToolBars.Align := alClient; FToolBars.Align := alClient;
FToolBars.parent := self; FToolBars.parent := self;
@@ -1631,6 +1639,13 @@ type TVclDesigner = class(tvcform)
FProjectManager.FTslEditer.setdbugruncall(thisfunction(debugproject)); //设置调试回调 FProjectManager.FTslEditer.setdbugruncall(thisfunction(debugproject)); //设置调试回调
FProjectManager.newmenu.parent := ffilemenu;// FProjectManager.newmenu.parent := ffilemenu;//
FProjectManager.goformmenu.parent := fviewmenu;// FProjectManager.goformmenu.parent := fviewmenu;//
FToolBars.onnotification := function(o,e)begin
d := e.msg;
if ifarray(d) and d["imgsize"]>0 then
begin
fdimagelist.imgsize := d["imgsize"];
end
end ;
//OnChange //OnChange
//fnewmenu //fnewmenu
end end
@@ -1640,6 +1655,10 @@ type TVclDesigner = class(tvcform)
begin begin
FProjectManager.showhltcolor(); FProjectManager.showhltcolor();
end end
function open_tsl_dir();
begin
_Wapi.openresourcemanager(sysexecname());
end
function mgr_control(); function mgr_control();
begin begin
if not fmgr_ctl then if not fmgr_ctl then
@@ -2096,19 +2115,10 @@ type TDesignertoolbars = class(TPageControl) //
[weakref]ftoolbars; [weakref]ftoolbars;
FLabels ; FLabels ;
[weakref]fimg; [weakref]fimg;
[weakref]flinkimagelist;
function SetImageList(im); function SetImageList(im);
begin begin
fimg := im; fimg := im;
end end
function SetlinkeImageList(img);
begin
flinkimagelist := img;
if flinkimagelist then
begin
flinkimagelist.onchange := thisfunction(changedimg);
end
end
public public
function changedimg(o,e); function changedimg(o,e);
begin begin
@@ -2120,7 +2130,7 @@ type TDesignertoolbars = class(TPageControl) //
FToolsheets := array(); FToolsheets := array();
ftoolbars := array(); ftoolbars := array();
inherited; inherited;
ParentFont := false; //ParentFont := false;
align := alClient; align := alClient;
@@ -2176,7 +2186,6 @@ type TDesignertoolbars = class(TPageControl) //
end end
end end
property ImageList write SetImageList; property ImageList write SetImageList;
property linkimagelist write SetlinkeImageList;
private private
[weakref]ftbs; [weakref]ftbs;
designer/utslvcldpropertytypes.tsf
+8 -2
View File
@@ -855,6 +855,12 @@ type TPropGrid = class(TTSLDataGrid)
OnMouseWheel := function(o,e)begin OnMouseWheel := function(o,e)begin
currentLeave(); currentLeave();
end end
onfontchanged := function(o,e)begin
ft := font;
if not ft then return ;
fh := ft.height;
itemheight := fh+6;
end
end end
function Recycling();override; function Recycling();override;
begin begin
@@ -1032,12 +1038,12 @@ type TTSLDataGrid=class(TDrawGrid)
if ifstring(v)then if ifstring(v)then
begin begin
wd := max(wd,length(v) * ftwidth+3); wd := max(wd,length(v) * ftwidth+3);
if wd>200 then break; if wd>500 then break;
end end
end end
if RowHeader then if RowHeader then
begin begin
fcs[0]:= array("text":" ","width":min(200,wd)); fcs[0]:= array("text":" ","width":min(500,wd));
end end
if FCL and allFCL and FShowTwo then if FCL and allFCL and FShowTwo then
begin begin
editor-install.exe
BIN
View File
Binary file not shown.
funcext/tvclib/tcontrol.tsf
+1 -1
View File
@@ -1524,7 +1524,7 @@ type tcontrol = class(tcomponent)
info := fonGetPreferredSize.functioninfo(); info := fonGetPreferredSize.functioninfo();
fn := info["functionname"]; fn := info["functionname"];
if ifstring(info["classname"]) then fn := info["classname"] $ "." $ fn; if ifstring(info["classname"]) then fn := info["classname"] $ "." $ fn;
fn := "onGetPreferredSize call: "$fn $" err!"; fn := "onGetPreferredSize call: "$fn $" err!" $ exceptobject.errinfo;
except except
fn := "onGetPreferredSize is not function"; fn := "onGetPreferredSize is not function";
end ; end ;
funcext/tvclib/tgraphiccontrol.tsf
+2
View File
@@ -74,6 +74,7 @@ type tgraphiccontrol = class(TControl)
p := Parent; p := Parent;
if(p is class(TWinControl))and p.HandleAllocated()then if(p is class(TWinControl))and p.HandleAllocated()then
begin begin
if p.autosize and (p.childsizing.layout<>0) then return p.AdjustSize();
if Align <> alNone then return p.DoControlAlign(); if Align <> alNone then return p.DoControlAlign();
end end
////////////////// //////////////////
@@ -182,6 +183,7 @@ type tgraphiccontrol = class(TControl)
inherited; inherited;
if NewParent is class(TWinControl)then if NewParent is class(TWinControl)then
begin begin
if NewParent.autosize or (NewParent.childsizing.layout<>0) then NewParent.AdjustSize();
InvalidateRect(); InvalidateRect();
end end
end end
funcext/tvclib/tslvcl.tsf
+23 -5
View File
@@ -1492,6 +1492,12 @@ type tmemo = class(TSynMemoNorm) //
if Fonchange then if Fonchange then
calldatafunction(Fonchange,self(true),new tuieventbase(0,0,0,0)); calldatafunction(Fonchange,self(true),new tuieventbase(0,0,0,0));
end end
function GetPreferredSize(w,h);override;
begin
if onGetPreferredSize then return inherited;
w := Width;
h := Height;
end
function MouseUp(o,e);override; function MouseUp(o,e);override;
begin begin
if csDesigning in ComponentState then return ; if csDesigning in ComponentState then return ;
@@ -1594,11 +1600,17 @@ type twrapmemo = class(TScrollingWinControl)
end end
end end
end end
function GetPreferredSize(w,h);override;
begin
if onGetPreferredSize then return inherited;
w := Width;
h := Height;
end
function FontChanged(o);override; function FontChanged(o);override;
begin begin
if HandleAllocated() then doControlALign(); if HandleAllocated() then doControlALign();
end end
protected protected
function GetXScrollDelta();override; //x间隔 function GetXScrollDelta();override; //x间隔
begin begin
return FCharwidth; return FCharwidth;
@@ -5784,7 +5796,11 @@ type Ttfm2Component = class(TTmfParser)
end end
function hastfmresource(o,cn); function hastfmresource(o,cn);
begin begin
data := get_resource_by_name(cn+".tfm"); ////////////根据新特性处理/////////
ci := o.classinfo();
data := ci["tfm"];
///////////////////////////////////////
if not data then data := get_resource_by_name(cn+".tfm");
if data then if data then
begin begin
LoadFromTfmScript(o,data); LoadFromTfmScript(o,data);
@@ -5844,20 +5860,22 @@ type Ttfm2Component = class(TTmfParser)
function GetReSourcetfmdir(p,rp); function GetReSourcetfmdir(p,rp);
begin begin
if not ifarray(rp) then rp := array(); if not ifarray(rp) then rp := array();
rp[length(rp)] := p;
iofp := ioFileseparator(); iofp := ioFileseparator();
for ii,vv in filelist("",p+"*") do for ii,vv in filelist("",p+"*") do
begin begin
fn := vv["FileName"]; fn := vv["FileName"];
if fn="." or fn=".." then continue; if fn="." or fn=".." then continue;
if Pos("D",vv["Attr"]) then if Pos("D",vv["Attr"]) then
begin begin
if lowercase(fn)="resource.tfm" then GetReSourcetfmdir(p+fn+iofp,rp);
{if lowercase(fn)="resource.tfm" then
begin begin
rp[length(rp)] := p+"resource.tfm"+iofp; rp[length(rp)] := p+"resource.tfm"+iofp;
end else end else
begin begin
GetReSourcetfmdir(p+fn+iofp,rp); GetReSourcetfmdir(p+fn+iofp,rp);
end end }
end end
end end
end end
funcext/tvclib/twincontrol.tsf
+8 -2
View File
@@ -590,9 +590,14 @@ type TWinControl = class(tcontrol)
if v=SW_SHOWNOACTIVATE then return ; if v=SW_SHOWNOACTIVATE then return ;
} }
_wapi.ShowWindow(FHandle,v?SW_SHOW:SW_HIDE); _wapi.ShowWindow(FHandle,v?SW_SHOW:SW_HIDE);
if(Parent is class(TWinControl))and parent.HandleAllocated()then p := parent;
if(p is class(TWinControl))and p.HandleAllocated()then
begin begin
if Align <> alNone then Parent.DoControlAlign(); if (p.autosize or (p.childsizing.layout<>0) ) then
begin
p.AdjustSize();
end else
if Align <> alNone then p.DoControlAlign();
end end
{if V then {if V then
begin begin
@@ -1787,6 +1792,7 @@ type TWinControl = class(tcontrol)
hParentWnd := hParentWndt; hParentWnd := hParentWndt;
end end
end end
Visible := false; //20250508 添加处理关闭按钮
return EndModalCode; return EndModalCode;
end end
function UpdateWindow(); function UpdateWindow();
funcext/tvclib/utslmemo.tsf
+11 -11
View File
@@ -729,8 +729,8 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
begin begin
if bytetype(dtx,i)<> 0 then if bytetype(dtx,i)<> 0 then
begin begin
bn := ft.charset; //bn := ft.charset;
ft.charset := 134; //ft.charset := 134;
break; break;
end end
end end
@@ -747,8 +747,8 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
begin begin
if bytetype(dtx,i)<> 0 then if bytetype(dtx,i)<> 0 then
begin begin
bn := ft.charset; //bn := ft.charset;
ft.charset := 134; //ft.charset := 134;
break; break;
end end
end end
@@ -757,10 +757,10 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
r[2]:= r[0]+ct * FCharWidth; r[2]:= r[0]+ct * FCharWidth;
cvs.DrawText(dtx2,r,DT_NOPREFIX); cvs.DrawText(dtx2,r,DT_NOPREFIX);
end end
if bn <> 100000 then {if bn <> 100000 then
begin begin
ft.charset := bn; ft.charset := bn;
end end}
end end
function paintlinestext(RC,FirstLine,LastLine,FirstCol,LastCol);virtual; function paintlinestext(RC,FirstLine,LastLine,FirstCol,LastCol);virtual;
@@ -4216,23 +4216,23 @@ type TSynMemoNorm = class(TsynCustomMemo) //
begin begin
if fw>7 then if fw>7 then
begin begin
if fw=18 then {if fw=18 then
begin begin
fw := 17; fw := 17;
hw := 34; hw := 34;
end end }
flg := true; flg := true;
font := array("width":fw-1,"height":hw-2); font := array("width":fw-1,"height":hw-2);
end end
end else end else
begin begin
if fw<18 then if fw<44 then
begin begin
if fw=16 then {if fw=16 then
begin begin
fw := 17; fw := 17;
hw := 34; hw := 34;
end end }
flg := true; flg := true;
font := array("width":fw+1,"height":hw+2); font := array("width":fw+1,"height":hw+2);
end end
funcext/tvclib/utslvclgdi.tsf
+5 -6
View File
@@ -256,11 +256,11 @@ type Tcustomfont = class(tgdi)
end end
function Setcharset(v) function Setcharset(v)
begin begin
if ifnumber(v)and v <> Fcharset then {if ifnumber(v) and v <> Fcharset then
begin begin
Fcharset := v; Fcharset := v;
onchange(); onchange();
end end}
end end
function Setoutprecision(v) function Setoutprecision(v)
begin begin
@@ -329,7 +329,7 @@ type Tcustomfont = class(tgdi)
begin begin
s += invoke(self,"f"+v0); s += invoke(self,"f"+v0);
end else end else
vvi := invoke(self,"f"+v0); vvi := invoke(self,"f"+v0);
if ifnumber(vvi)then s += inttostr(vvi); if ifnumber(vvi)then s += inttostr(vvi);
else s += "0"; else s += "0";
s += ";"; s += ";";
@@ -427,12 +427,10 @@ type Tcustomfont = class(tgdi)
continue; continue;
end end
{$endif} {$endif}
if v0="charset" then continue;
if not ifnil(vsv)then if not ifnil(vsv)then
begin begin
ovi := invoke(self,"f"+v0); ovi := invoke(self,"f"+v0);
{$ifdef linux}{$else}
if (vsv=17 and v0="width") or (vsv=34 and v0="height") then continue;
{$endif}
if (ovi <> vsv) then if (ovi <> vsv) then
begin begin
invoke(self,"f"+v0,1,vsv); invoke(self,"f"+v0,1,vsv);
@@ -456,6 +454,7 @@ type Tcustomfont = class(tgdi)
if FWidth>0 then return FWidth; if FWidth>0 then return FWidth;
return abs(FHeight)/2; return abs(FHeight)/2;
end end
//property constmembers read fconstmembers write setconstmembers
property height read Fheight write Setheight; property height read Fheight write Setheight;
property width read Fwidth write Setwidth; property width read Fwidth write Setwidth;
property escapement read Fescapement write Setescapement; property escapement read Fescapement write Setescapement;
funcext/tvclib/utslvclgrid.tsf
+6
View File
@@ -67,6 +67,12 @@ type TcustomGridCtl = class(tcustomscrollcontrol) //
// begin // begin
// DoControlAlign(); // DoControlAlign();
// end // end
function GetPreferredSize(w,h);override;
begin
if ongetpreferredsize then return inherited;
w := Width;
h := Height;
end
function DoControlAlign();override; function DoControlAlign();override;
begin begin
if(IsUpDating())then if(IsUpDating())then
funcext/tvclib/utslvclstdctl.tsf
+12 -3
View File
@@ -3590,7 +3590,11 @@ type TcustomListBox=class(TCustomListBoxbase)
end end
2: 2:
begin begin
selchange := 1; if FMultisel3Data[-1] then //修正选中改变的问题20250430
begin
Reindex(FMultisel3Data,array(-1:nil));
end else
selchange := 1;
end end
end; end;
if selchange then calllistselchengd(); if selchange then calllistselchengd();
@@ -3768,7 +3772,12 @@ type TcustomListBox=class(TCustomListBoxbase)
FSelEnd := n2; FSelEnd := n2;
flg := true; flg := true;
end end
end end else
if (FSelBegin>=0) and (n=-1) then
begin
FSelBegin := FSelEnd := -1;
flg := true;
end
if flg then if flg then
begin begin
InvalidateRect(nil,false); InvalidateRect(nil,false);
@@ -3801,7 +3810,7 @@ type TcustomListBox=class(TCustomListBoxbase)
end end
return; return;
end end
if not(isValidIndex2(n)) or n=FSelBegin then return; if not(isValidIndex2(n) or n=-1) or n=FSelBegin then return;
SelRange(false); SelRange(false);
FSelBegin := FSelEnd := n; FSelBegin := FSelEnd := n;
SelRange(true); SelRange(true);
funcext/tvclib/utvclgraphics.tsf
+39 -12
View File
@@ -1066,7 +1066,7 @@ type tg_axes = class(tg_base) //
f_changed .|= c_g_data_zoombox; f_changed .|= c_g_data_zoombox;
end end
end end
cmd_node_add_in: cmd_node_add_in,cmd_node_del_from:
begin begin
if pm is class(tg_graph_base) then if pm is class(tg_graph_base) then
begin begin
@@ -1217,7 +1217,7 @@ type tg_axes = class(tg_base) //
if (f_changed .& c_g_data_changed)=c_g_data_changed then if (f_changed .& c_g_data_changed)=c_g_data_changed then
begin begin
tbds := fdata_bounds; tbds := fdata_bounds;
for i,v in get_node_data_bounds(self(true)) do for i,v in get_node_data_bounds_format(self(true)) do
begin begin
if not fdata_bounds_locked[i] then if not fdata_bounds_locked[i] then
begin begin
@@ -4395,11 +4395,17 @@ type tg_base = class(TNode,tg_evet_conainter) //
function paint_pre(cvs);virtual; function paint_pre(cvs);virtual;
begin begin
paint(cvs); paint(cvs);
lgns := array();
for i := 0 to NodeCount-1 do for i := 0 to NodeCount-1 do
begin begin
vi := GetNodeByIndex(i); vi := GetNodeByIndex(i);
vi.paint_pre(cvs); if vi is class(tg_legend) then //处理次序问题
end begin
lgns[length(lgns)] := vi;
end else
vi.paint_pre(cvs);
end
for i,vi in lgns do vi.paint_pre(cvs);
end end
function hit_at(info):bool; //命中处理,鼠标信息 function hit_at(info):bool; //命中处理,鼠标信息
begin begin
@@ -4522,14 +4528,20 @@ type tg_base = class(TNode,tg_evet_conainter) //
function SetParent(V);virtual; function SetParent(V);virtual;
begin begin
if not check_parent(v) then return ; if not check_parent(v) then return ;
if v then ct := v.NodeCount; p := parent;
r := inherited; r := inherited;
if v then ct2 := v.NodeCount; p2 := parent;
if ct2>ct then if p=p2 then return ;
if p2 then //添加
begin
ax := p2.axes;
if ax then ax.executecommand(cmd_node_add_in,self(true));
end
if p then //移除
begin begin
ax := axes; ax := p.axes;
if ax then ax.executecommand(cmd_node_add_in,self(true)); if ax then ax.executecommand(cmd_node_del_from,self(true));
end end
return r; return r;
end end
protected protected
@@ -4699,6 +4711,7 @@ type tg_const = class()
static const cmd_figure_changed = "figure_changed"; static const cmd_figure_changed = "figure_changed";
static const cmd_data_changed = "data_changed"; static const cmd_data_changed = "data_changed";
static const cmd_node_add_in = "node_add_in"; static const cmd_node_add_in = "node_add_in";
static const cmd_node_del_from = "node_del_from";
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
static const tgc_complementary_color = "complementary_color"; //采用补色 static const tgc_complementary_color = "complementary_color"; //采用补色
//////////////////////////////// ////////////////////////////////
@@ -5239,7 +5252,7 @@ begin
n++; n++;
return new_bound_factor(a/10,n); return new_bound_factor(a/10,n);
end else end else
if a<=1 then if a<1 then
begin begin
n--; n--;
return new_bound_factor(a*10,n); return new_bound_factor(a*10,n);
@@ -5250,6 +5263,7 @@ begin
a_ := a; a_ := a;
b_ := b; b_ := b;
if not(par>=1) then par:=20;//20; if not(par>=1) then par:=20;//20;
if a=b then return ;
r := new_bound_factor((b-a)/par,n); r := new_bound_factor((b-a)/par,n);
if r<>0 then if r<>0 then
begin begin
@@ -5272,10 +5286,23 @@ begin
d := bds; d := bds;
end else end else
mg_bds(bds,d); mg_bds(bds,d);
end else
if v is class(tg_axis) then
begin
echo "\r\n axis";
end end
end end
return d; return d;
end end
function get_node_data_bounds_format(nd);
begin
d := get_node_data_bounds(nd);
for i:= 0 to 2 do
begin
if d[i,0]>=d[i,1] then d[i,1] := d[i,0]+1;
end
return d;
end
function modify_text_pos(x_,y_,txtw,txth,al);//修正对齐位置 function modify_text_pos(x_,y_,txtw,txth,al);//修正对齐位置
begin begin
case al of case al of
funcext/tvclib/uvcpropertytypespersistence.tsf
+10 -3
View File
@@ -2299,12 +2299,19 @@ type ttfmnode = class()
s := finheritedname; s := finheritedname;
if s and ifstring(s) then if s and ifstring(s) then
begin begin
data := get_resource_by_name( s+".tfm"); //////////根据新特性添加//////////////////////////////////////
o :=findclass(s);
if o then
begin
ci := o.classinfo();
data := ci["tfm"];
end
//////////////////////////////////////////////
if not data then data := get_resource_by_name( s+".tfm");
if data then if data then
begin begin
return get_inherited(data); return get_inherited(data);
end end
for i,v in finheritedpaths do for i,v in finheritedpaths do
begin begin
fv := v+s+".tfm"; fv := v+s+".tfm";
plugin/TSJSONParser.dll
BIN
View File
Binary file not shown.
plugin/TSLCPLUGIN.DLL
BIN
View File
Binary file not shown.
tsleditor.exe
BIN
View File
Binary file not shown.
tslkrnl.dll
BIN
View File
Binary file not shown.
tslvcltool.exe
BIN
View File
Binary file not shown.
whatsnew.txt
+11
View File
@@ -1,3 +1,14 @@
更新日志--------2025-5-7
升级：新增ExportJSONStringMBCS函数提供对中文原码保留。
更新日志--------2025-5-6
修正：profiler等窗口被打开时直接退出关闭会导致报告异常。
升级：支持编译错误行号跳转以及包含文件编译错误的跳转。
修正：板块管理中新建板块导致生成多个用户板块节点的问题。
更新日志--------2025-4-29
升级：为namespace下的调试提供支持。
更新日志--------2025-4-28 更新日志--------2025-4-28
修正：客户机检查语法生成代码跳转依赖时，某些错误发生会导致异常的问题。 修正：客户机检查语法生成代码跳转依赖时，某些错误发生会导致异常的问题。
修正：某些情况下函数编辑器内无法点击断点的问题。 修正：某些情况下函数编辑器内无法点击断点的问题。