moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-12-24 08:18:52 -05:00
Code Issues Releases Wiki Activity

Merge ssh://villavu.com:54367/simba

Browse Source
This commit is contained in:
Niels 2010-05-20 10:09:08 +02:00
commit 3cb659dbf6
5 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/Simba/framefunctionlist.pas
View File

@ -231,6 +231,8 @@ begin
exit;
if FLastScript = Script then
exit;
if SimbaForm.CurrScript = nil then
exit;
FLastScript:= Script;
Filtering := FilterTree.Visible;
if FilterTree.Visible then

5
Projects/Simba/framescript.pas
View File

@ -29,7 +29,7 @@ interface
uses
Classes, SysUtils, FileUtil, LResources, Forms, SynHighlighterPas, SynEdit, SynEditMarkupHighAll,
mmlpsthread,ComCtrls, SynEditKeyCmds, LCLType,MufasaBase, SynEditMarkupSpecialLine, Graphics, Controls, SynEditStrConst,
v_ideCodeInsight, v_ideCodeParser, CastaliaPasLexTypes, CastaliaSimplePasPar, SynEditHighlighter,synedittextbase;
v_ideCodeInsight, v_ideCodeParser, CastaliaPasLexTypes, CastaliaSimplePasPar, SynEditHighlighter,synedittextbase,SynPluginSyncroEdit;
const
ecCodeCompletion = ecUserFirst;
ecCodeHints = ecUserFirst + 1;
@ -46,6 +46,7 @@ type
TScriptFrame = class(TFrame)
SynEdit: TSynEdit;
SyncEdit : TSynPluginSyncroEdit;
procedure SynEditChange(Sender: TObject);
procedure SynEditClickLink(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
@ -583,6 +584,8 @@ var
MarkCaret : TSynEditMarkupHighlightAllCaret;
begin
inherited Create(TheOwner);
SyncEdit := TSynPluginSyncroEdit.Create(SynEdit);
SimbaForm.Mufasa_Image_List.GetBitmap(28,SyncEdit.GutterGlyph);
OwnerSheet := TTabSheet(TheOwner);
OwnerPage := TPageControl(OwnerSheet.Owner);

36
Projects/Simba/simbaunit.lfm
View File

@ -1493,7 +1493,7 @@ object SimbaForm: TSimbaForm
left = 448
top = 144
Bitmap = {
4C691C0000001000000010000000424242004242420042424200424242004242
4C691D0000001000000010000000424242004242420042424200424242004242
420042424200424242004242420042424200424242004242420042424200A155
42FFA15542FFA15542FF4242420E424242004242420042424200424242004242
4200424242004242420042424200424242004242420042424200A15542FFFFDA
@ -2389,7 +2389,39 @@ object SimbaForm: TSimbaForm
001A0000001A0000001A0000001A0000001A0000001A0000001A0000001A0000
001A0000001A0000001600000009FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000001C00000033000000360000
0036000000360000003600000036000000360000003600000036000000200000
0002FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000033F8F8F8F0FBFBFBFDFCFC
FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFF8F8F8FF949494910000
002000000002FFFFFF00FFFFFF00FFFFFF0000000036FBFBFBFDF4F4F4FFF5F5
F5FFF5F5F5FFF5F5F5FFF1F1F1FFEFEFEFFFE9E9E9FFFCFCFCFFACD5E4FF58A5
D8FF85B1DBFF469DD0FF2B95D15E0000000100000036FCFCFCFFF7F7F7FFF9F9
F9FFF7F7F7FFF7F7F7FFF3F3F3FFF0F0F0FFEAEAEAFFAFE4F3FF77BEE7FFB4D2
F0FFE5F3FFFFACD2EFFF488CC7E80000000100000036FCFCFCFFF9F9F9FFF9F9
F9FFF9F9F9FFF7F7F7FFF6F6F6FFF2F2F2FFA8D9E8FF81D6EEFFB2E3F9FF8BC0
E7FFAED3F6FFC4E0FCFF669FD3F70000000100000036FCFCFCFFFBFBFBFFFCFC
FCFFFCFCFCFFFBFBFBFFF8F8F8FFBAE3F0FF7DD4EEFFC4F6FDFF6CDDF6FF6DCA
EDFF63A3D7FF5C99CFF04F8EC4270000000100000036FCFCFCFFFCFCFCFFFCFC
FCFFFCFCFCFFFCFCFCFFBDE5F2FF79D3EEFFC7F7FDFF5FDCF5FF5BE2F7FF7AD6
F2FF51A2E2FF234A6B5C000000010000000100000036FCFCFCFFFCFCFCFFFCFC
FCFFFCFCFCFFAFD4E5FF77CBE7FFC7F7FDFF5EDCF5FF5AE1F7FF7BD4F1FF4B9A
DDFFD4E5F5FF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC
FCFFB2D5E5FF76BAD7FFC2F6FDFF63DFF7FF5DE2F8FF79D3F0FF4998DCFFDEE9
F2FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFA5C3
D7FF7AB6D5FF90B7D1FF55C9E4FF5BDFF5FF78D0EDFF519DDDFFDFEBF5FFF8F8
F8FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFF4389
AAFFE0F2FFFF549AD8FF1A7ABEFF4998C5FF488EC7FFD8E6F3FFF8F8F8FFF8F8
F8FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFF2E67
85FF94C7F9FF91C9F9FF4185C9FF266BAEFFD4E2EEFFFAFAFAFFFAFAFAFFFAFA
FAFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFF1843
5AFF2B6189FF4C8ABEFF6FA8CBFFE0E9F1FFFBFBFBFFFBFBFBFFFBFBFBFFFBFB
FBFFFCFCFCFF00000036000000010000000100000036FCFCFCFEFCFCFCFFFCFC
FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFC
FCFFFCFCFCFD00000036FFFFFF00FFFFFF0000000034F9F9F9F5FCFCFCFDFCFC
FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFC
FCFDF9F9F9F300000033FFFFFF00FFFFFF000000001D00000034000000360000
0036000000360000003600000036000000360000003600000036000000360000
0036000000330000001DFFFFFF00
}
end
object MTrayIcon: TTrayIcon

2
Projects/Simba/simbaunit.pas
View File

@ -46,7 +46,7 @@ uses
CastaliaSimplePasPar, v_AutoCompleteForm, PSDump;
const
SimbaVersion = 686;
SimbaVersion = 687;
type

1
Units/MMLAddon/PSInc/Wrappers/dtm.inc
View File

@ -106,6 +106,7 @@ end;
function ps_SDTMToMDTM(Const DTM: TSDTM): TMDTM;extdecl;
begin
result := SDTMToMDTM(DTM);
CurrThread.Client.MDTMs.AddDTM(result);
end;
function ps_CreateDTMPoint(x,y,c,t,asz : integer; bp : boolean) : TMDTMPoint;