moparisthebest
/
Simba
mirror of https://github.com/moparisthebest/Simba
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed the mainform, renamed the testunit added begining for a bitmapConversion tool.

This commit is contained in:
Raymond 2010-05-11 14:56:11 +02:00
parent db2c2d3b72
commit 98359e445a
15 changed files with 348 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Projects/SAMufasaGUI/about.pas
View File

@ -54,15 +54,15 @@ var
implementation implementation
uses uses
TestUnit; simba;
{ TAboutForm } { TAboutForm }
procedure TAboutForm.FormCreate(Sender: TObject); procedure TAboutForm.FormCreate(Sender: TObject);
begin begin
Self.Caption := format('About Simba r%d', [TestUnit.SimbaVersion]); Self.Caption := format('About Simba r%d', [simba.SimbaVersion]);
Self.LabelRevision.Caption := format('Revision %d', [TestUnit.SimbaVersion]); Self.LabelRevision.Caption := format('Revision %d', [simba.SimbaVersion]);
AboutMemo.Lines.Add('Simba is released under the GPL license.'); AboutMemo.Lines.Add('Simba is released under the GPL license.');
AboutMemo.Lines.Add(format('You are currently using version: %d',[Testunit.SimbaVersion])); AboutMemo.Lines.Add(format('You are currently using version: %d',[simba.SimbaVersion]));
AboutMemo.Lines.Add(''); AboutMemo.Lines.Add('');
AboutMemo.Lines.Add('Please report bugs at: http://mufasa.villavu.com/mantis/'); AboutMemo.Lines.Add('Please report bugs at: http://mufasa.villavu.com/mantis/');
end; end;

26
Projects/SAMufasaGUI/bitmapconv.lfm Normal file
View File

@ -0,0 +1,26 @@
object BitmapConvForm: TBitmapConvForm
Left = 726
Height = 240
Top = 192
Width = 320
Caption = 'BitmapConvForm'
ClientHeight = 240
ClientWidth = 320
LCLVersion = '0.9.29'
object Button1: TButton
Left = 144
Height = 52
Top = 152
Width = 105
Caption = 'Button1'
TabOrder = 0
end
object CheckBox1: TCheckBox
Left = 24
Height = 17
Top = 160
Width = 71
Caption = 'CheckBox1'
TabOrder = 1
end
end

32
Projects/SAMufasaGUI/bitmapconv.pas Normal file
View File

@ -0,0 +1,32 @@
unit bitmapconv;
{$mode objfpc}
interface
uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
StdCtrls;
type
{ TBitmapConvForm }
TBitmapConvForm = class(TForm)
Button1: TButton;
CheckBox1: TCheckBox;
private
{ private declarations }
public
{ public declarations }
end;
var
BitmapConvForm: TBitmapConvForm;
implementation
{$R *.lfm}
end.

8
Projects/SAMufasaGUI/colourhistory.pas
View File

@ -104,7 +104,7 @@ var
implementation implementation
uses uses
colour_conv, TestUnit, lclintf, lcltype; colour_conv, simba, lclintf, lcltype;
constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String); constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String);
begin begin
@ -502,7 +502,7 @@ constructor TColourHistoryForm.Create(TheOwner: TComponent);
begin begin
inherited Create(TheOwner); inherited Create(TheOwner);
PickNewColourButton.OnClick:= @Form1.ButtonPickClick; PickNewColourButton.OnClick:= @SimbaForm.ButtonPickClick;
end; end;
destructor TColourHistoryForm.Destroy; destructor TColourHistoryForm.Destroy;
@ -544,12 +544,12 @@ end;
procedure TColourHistoryForm.SetCHShowMenu(Sender: TObject); procedure TColourHistoryForm.SetCHShowMenu(Sender: TObject);
begin begin
Form1.MenuItemColourHistory.Checked := True; SimbaForm.MenuItemColourHistory.Checked := True;
end; end;
procedure TColourHistoryForm.UnSetCHShowMenu(Sender: TObject); procedure TColourHistoryForm.UnSetCHShowMenu(Sender: TObject);
begin begin
Form1.MenuItemColourHistory.Checked := False; SimbaForm.MenuItemColourHistory.Checked := False;
end; end;
initialization initialization

4
Projects/SAMufasaGUI/debugimage.pas
View File

@ -59,7 +59,7 @@ var
implementation implementation
uses uses
MufasaTypes, math, graphtype, IntfGraphics,TestUnit,lclintf,colour_conv,InterfaceBase; MufasaTypes, math, graphtype, IntfGraphics,simba,lclintf,colour_conv,InterfaceBase;
{ TDebugImgForm } { TDebugImgForm }
procedure TDebugImgForm.FormCreate(Sender: TObject); procedure TDebugImgForm.FormCreate(Sender: TObject);
@ -76,7 +76,7 @@ end;
procedure TDebugImgForm.FormHide(Sender: TObject); procedure TDebugImgForm.FormHide(Sender: TObject);
begin begin
Form1.MenuItemDebugImage.Checked := False; SimbaForm.MenuItemDebugImage.Checked := False;
end; end;
procedure TDebugImgForm.BlackDebugImage; procedure TDebugImgForm.BlackDebugImage;

2
Projects/SAMufasaGUI/extensionmanager.pas
View File

@ -38,7 +38,7 @@ var
implementation implementation
uses uses
TestUnit, settingssandbox,simbasettings; simba, settingssandbox,simbasettings;
procedure TExtensionManager.SetOnchange(const AValue: TNotifyEvent); procedure TExtensionManager.SetOnchange(const AValue: TNotifyEvent);
var var

34
Projects/SAMufasaGUI/framefunctionlist.pas
View File

@ -72,7 +72,7 @@ type
implementation implementation
uses uses
TestUnit, Graphics, stringutil, simpleanalyzer,v_ideCodeParser,lclintf; simba, Graphics, stringutil, simpleanalyzer,v_ideCodeParser,lclintf;
{ TFunctionListFrame } { TFunctionListFrame }
@ -99,14 +99,14 @@ procedure TFunctionListFrame.FrameEndDock(Sender, Target: TObject; X, Y: Integer
begin begin
if Target is TPanel then if Target is TPanel then
begin begin
Form1.SplitterFunctionList.Visible := true; SimbaForm.SplitterFunctionList.Visible := true;
CloseButton.Visible:= true; CloseButton.Visible:= true;
end end
else if Target is TCustomDockForm then else if Target is TCustomDockForm then
begin begin
TCustomDockForm(Target).Caption := 'Functionlist'; TCustomDockForm(Target).Caption := 'Functionlist';
TCustomDockForm(Target).OnClose := @DockFormOnClose; TCustomDockForm(Target).OnClose := @DockFormOnClose;
Form1.SplitterFunctionList.Visible:= false; SimbaForm.SplitterFunctionList.Visible:= false;
CloseButton.Visible:= false; CloseButton.Visible:= false;
end; end;
end; end;
@ -125,8 +125,8 @@ begin
if node.Data <> nil then if node.Data <> nil then
if InCodeCompletion then if InCodeCompletion then
begin begin
Form1.CurrScript.SynEdit.InsertTextAtCaret( GetMethodName(PMethodInfo(node.Data)^.MethodStr,true)); SimbaForm.CurrScript.SynEdit.InsertTextAtCaret( GetMethodName(PMethodInfo(node.Data)^.MethodStr,true));
Form1.RefreshTab; SimbaForm.RefreshTab;
end end
else else
begin begin
@ -138,10 +138,10 @@ begin
if MethodInfo.Filename <> '' then if MethodInfo.Filename <> '' then
begin; begin;
// Writeln(MethodInfo.filename); // Writeln(MethodInfo.filename);
Form1.LoadScriptFile(MethodInfo.Filename,true,true); SimbaForm.LoadScriptFile(MethodInfo.Filename,true,true);
end; end;
Form1.CurrScript.SynEdit.SelStart := MethodInfo.BeginPos + 1; SimbaForm.CurrScript.SynEdit.SelStart := MethodInfo.BeginPos + 1;
Form1.CurrScript.SynEdit.SelEnd := MethodInfo.EndPos + 1; SimbaForm.CurrScript.SynEdit.SelEnd := MethodInfo.EndPos + 1;
end; end;
end; end;
end; end;
@ -172,13 +172,13 @@ end;
procedure TFunctionListFrame.DockFormOnClose(Sender: TObject; var CloseAction: TCloseAction); procedure TFunctionListFrame.DockFormOnClose(Sender: TObject; var CloseAction: TCloseAction);
begin begin
CloseAction := caHide; CloseAction := caHide;
Form1.MenuItemFunctionList.Checked := False; SimbaForm.MenuItemFunctionList.Checked := False;
end; end;
procedure TFunctionListFrame.CloseButtonClick(Sender: TObject); procedure TFunctionListFrame.CloseButtonClick(Sender: TObject);
begin begin
self.Hide; self.Hide;
Form1.MenuItemFunctionList.Checked := False; SimbaForm.MenuItemFunctionList.Checked := False;
end; end;
procedure TFunctionListFrame.FunctionListMouseUp(Sender: TObject; procedure TFunctionListFrame.FunctionListMouseUp(Sender: TObject;
@ -248,8 +248,8 @@ begin
FillThread.Analyzer := TCodeInsight.Create; FillThread.Analyzer := TCodeInsight.Create;
with FillThread,FillThread.Analyzer do with FillThread,FillThread.Analyzer do
begin begin
OnFindInclude := @Form1.OnCCFindInclude; OnFindInclude := @SimbaForm.OnCCFindInclude;
FileName := Form1.CurrScript.ScriptFile; FileName := SimbaForm.CurrScript.ScriptFile;
MS := TMemoryStream.Create; MS := TMemoryStream.Create;
MS.Write(Script[1],length(script)); MS.Write(Script[1],length(script));
OnTerminate:=@FillThreadTerminate; OnTerminate:=@FillThreadTerminate;
@ -278,9 +278,9 @@ begin
FunctionList.FullCollapse; FunctionList.FullCollapse;
if InCodeCompletion then if InCodeCompletion then
begin; begin;
Form1.CurrScript.SynEdit.Lines[CompletionCaret.y - 1] := CompletionStart; SimbaForm.CurrScript.SynEdit.Lines[CompletionCaret.y - 1] := CompletionStart;
Form1.CurrScript.SynEdit.LogicalCaretXY:= point(CompletionCaret.x,CompletionCaret.y); SimbaForm.CurrScript.SynEdit.LogicalCaretXY:= point(CompletionCaret.x,CompletionCaret.y);
Form1.CurrScript.SynEdit.SelEnd:= Form1.CurrScript.SynEdit.SelStart; SimbaForm.CurrScript.SynEdit.SelEnd:= SimbaForm.CurrScript.SynEdit.SelStart;
end; end;
FilterTreeVis(False); FilterTreeVis(False);
ScriptNode.Expand(true); ScriptNode.Expand(true);
@ -403,7 +403,7 @@ begin
FilterTreeVis(false); FilterTreeVis(false);
editSearchList.Color := 6711039; editSearchList.Color := 6711039;
if InCodeCompletion then if InCodeCompletion then
Form1.CurrScript.SynEdit.Lines[CompletionCaret.y - 1] := CompletionStart; SimbaForm.CurrScript.SynEdit.Lines[CompletionCaret.y - 1] := CompletionStart;
end; end;
FilterTree.EndUpdate; FilterTree.EndUpdate;
end; end;
@ -411,7 +411,7 @@ begin
if result and InCodeCompletion then if result and InCodeCompletion then
begin; begin;
str := format(CompletionLine, [InsertStr]); str := format(CompletionLine, [InsertStr]);
with Form1.CurrScript.SynEdit do with SimbaForm.CurrScript.SynEdit do
begin; begin;
Lines[CompletionCaret.y - 1] := str; Lines[CompletionCaret.y - 1] := str;
LogicalCaretXY:= StartWordCompletion; LogicalCaretXY:= StartWordCompletion;

2
Projects/SAMufasaGUI/framescript.lfm
View File

@ -20,7 +20,7 @@ object ScriptFrame: TScriptFrame
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False
ParentFont = False ParentFont = False
PopupMenu = Form1.ScriptPopup PopupMenu = SimbaForm.ScriptPopup
TabOrder = 0 TabOrder = 0
OnDragDrop = SynEditDragDrop OnDragDrop = SynEditDragDrop
OnDragOver = SynEditDragOver OnDragOver = SynEditDragOver

100
Projects/SAMufasaGUI/framescript.pas
View File

@ -93,7 +93,7 @@ type
implementation implementation
uses uses
TestUnit, SynEditTypes, LCLIntF, StrUtils,framefunctionlist; simba, SynEditTypes, LCLIntF, StrUtils,framefunctionlist;
function WordAtCaret(e: TSynEdit; var sp, ep: Integer; Start: Integer = -1): string; function WordAtCaret(e: TSynEdit; var sp, ep: Integer; Start: Integer = -1): string;
var var
@ -156,7 +156,7 @@ begin
if not ScriptChanged then if not ScriptChanged then
begin; begin;
ScriptChanged:= True; ScriptChanged:= True;
Form1.Caption:= Format(WindowTitle,[ScriptName + '*']); SimbaForm.Caption:= Format(WindowTitle,[ScriptName + '*']);
OwnerSheet.Caption:=ScriptName + '*'; OwnerSheet.Caption:=ScriptName + '*';
end; end;
end; end;
@ -172,8 +172,8 @@ var
begin begin
mp := TCodeInsight.Create; mp := TCodeInsight.Create;
mp.FileName := ScriptFile; mp.FileName := ScriptFile;
mp.OnMessage := @Form1.OnCCMessage; mp.OnMessage := @SimbaForm.OnCCMessage;
mp.OnFindInclude := @Form1.OnCCFindInclude; mp.OnFindInclude := @SimbaForm.OnCCFindInclude;
ms := TMemoryStream.Create; ms := TMemoryStream.Create;
SynEdit.Lines.SaveToStream(ms); SynEdit.Lines.SaveToStream(ms);
@ -194,10 +194,10 @@ begin
begin begin
if FileExists(TCodeInsight(d.Parser).FileName) then if FileExists(TCodeInsight(d.Parser).FileName) then
begin; begin;
if Form1.LoadScriptFile(TCodeInsight(d.Parser).FileName,true,true) then if SimbaForm.LoadScriptFile(TCodeInsight(d.Parser).FileName,true,true) then
begin; begin;
Form1.CurrScript.SynEdit.SelStart:= d.StartPos + 1; SimbaForm.CurrScript.SynEdit.SelStart:= d.StartPos + 1;
Form1.CurrScript.SynEdit.SelEnd := d.StartPos + Length(TrimRight(d.RawText)) + 1; SimbaForm.CurrScript.SynEdit.SelEnd := d.StartPos + Length(TrimRight(d.RawText)) + 1;
end; end;
end end
else else
@ -220,7 +220,7 @@ procedure TScriptFrame.SynEditCommandProcessed(Sender: TObject;
var var
Command2 : TSynEditorCommand; Command2 : TSynEditorCommand;
begin begin
if (Command = ecChar) and (AChar = '(') and (Form1.ParamHint.Visible = false) and (Form1.ShowHintAuto) then if (Command = ecChar) and (AChar = '(') and (SimbaForm.ParamHint.Visible = false) and (SimbaForm.ShowHintAuto) then
begin begin
Command2:= ecCodeHints; Command2:= ecCodeHints;
SynEditProcessUserCommand(sender,command2,achar,nil); SynEditProcessUserCommand(sender,command2,achar,nil);
@ -237,12 +237,12 @@ end;
procedure TScriptFrame.SynEditDragOver(Sender, Source: TObject; X, Y: Integer; procedure TScriptFrame.SynEditDragOver(Sender, Source: TObject; X, Y: Integer;
State: TDragState; var Accept: Boolean); State: TDragState; var Accept: Boolean);
begin begin
Accept := Source = Form1.frmFunctionList; Accept := Source = SimbaForm.frmFunctionList;
if(Accept)then if(Accept)then
begin begin
SynEdit.CaretXY := SynEdit.PixelsToLogicalPos(point(x, y)); SynEdit.CaretXY := SynEdit.PixelsToLogicalPos(point(x, y));
if(not(Form1.Active))then Form1.BringToFront; if(not(SimbaForm.Active))then SimbaForm.BringToFront;
if(Form1.ActiveControl <> SynEdit)then Form1.ActiveControl := SynEdit; if(SimbaForm.ActiveControl <> SynEdit)then SimbaForm.ActiveControl := SynEdit;
end; end;
end; end;
@ -251,18 +251,18 @@ procedure TScriptFrame.SynEditKeyDown(Sender: TObject; var Key: Word;
begin begin
if key = VK_F3 then if key = VK_F3 then
begin; begin;
Form1.ActionFindNextExecute(Sender); SimbaForm.ActionFindNextExecute(Sender);
key := 0; key := 0;
end; end;
if key = VK_ESCAPE then if key = VK_ESCAPE then
Form1.ParamHint.Hide; SimbaForm.ParamHint.Hide;
Form1.CodeCompletionForm.HandleKeyDown(Sender, Key, Shift); SimbaForm.CodeCompletionForm.HandleKeyDown(Sender, Key, Shift);
end; end;
procedure TScriptFrame.SynEditKeyPress(Sender: TObject; var Key: char); procedure TScriptFrame.SynEditKeyPress(Sender: TObject; var Key: char);
begin begin
Form1.CodeCompletionForm.HandleKeyPress(Sender, Key); SimbaForm.CodeCompletionForm.HandleKeyPress(Sender, Key);
end; end;
procedure TScriptFrame.SynEditMouseLink(Sender: TObject; X, Y: Integer; procedure TScriptFrame.SynEditMouseLink(Sender: TObject; X, Y: Integer;
@ -309,8 +309,8 @@ begin
if (Command = ecCodeCompletion) and ((not SynEdit.GetHighlighterAttriAtRowCol(SynEdit.CaretXY, s, Attri)) or if (Command = ecCodeCompletion) and ((not SynEdit.GetHighlighterAttriAtRowCol(SynEdit.CaretXY, s, Attri)) or
((Attri.Name <> SYNS_AttrComment) and (Attri.name <> SYNS_AttrString) and (Attri.name <> SYNS_AttrDirective))) then ((Attri.Name <> SYNS_AttrComment) and (Attri.name <> SYNS_AttrString) and (Attri.name <> SYNS_AttrDirective))) then
begin begin
{form1.FunctionListShown(True); {SimbaForm.FunctionListShown(True);
with form1.frmFunctionList do with SimbaForm.frmFunctionList do
if editSearchList.CanFocus then if editSearchList.CanFocus then
begin; begin;
editSearchList.SetFocus; editSearchList.SetFocus;
@ -348,8 +348,8 @@ begin
end;} end;}
mp := TCodeInsight.Create; mp := TCodeInsight.Create;
mp.FileName := ScriptFile; mp.FileName := ScriptFile;
mp.OnMessage := @Form1.OnCCMessage; mp.OnMessage := @SimbaForm.OnCCMessage;
mp.OnFindInclude := @Form1.OnCCFindInclude; mp.OnFindInclude := @SimbaForm.OnCCFindInclude;
ms := TMemoryStream.Create; ms := TMemoryStream.Create;
ItemList := TStringList.Create; ItemList := TStringList.Create;
@ -360,7 +360,7 @@ begin
try try
Filter := WordAtCaret(Synedit, sp, ep); Filter := WordAtCaret(Synedit, sp, ep);
Form1.CodeCompletionStart := Point(sp, Synedit.CaretY); SimbaForm.CodeCompletionStart := Point(sp, Synedit.CaretY);
//mp.Run(ms, nil, Synedit.SelStart + (ep - Synedit.CaretX) - 1); //mp.Run(ms, nil, Synedit.SelStart + (ep - Synedit.CaretX) - 1);
s := SynEdit.Lines[SynEdit.Carety-1]; s := SynEdit.Lines[SynEdit.Carety-1];
@ -382,7 +382,7 @@ begin
mp.FillSynCompletionProposal(ItemList, InsertList, s); mp.FillSynCompletionProposal(ItemList, InsertList, s);
p := SynEdit.ClientToScreen(SynEdit.RowColumnToPixels(Point(ep, SynEdit.CaretY))); p := SynEdit.ClientToScreen(SynEdit.RowColumnToPixels(Point(ep, SynEdit.CaretY)));
p.y := p.y + SynEdit.LineHeight; p.y := p.y + SynEdit.LineHeight;
Form1.CodeCompletionForm.Show(p, ItemList, InsertList, Filter, SynEdit); SimbaForm.CodeCompletionForm.Show(p, ItemList, InsertList, Filter, SynEdit);
finally finally
FreeAndNil(ms); FreeAndNil(ms);
FreeAndNil(mp); FreeAndNil(mp);
@ -392,11 +392,11 @@ begin
end; end;
if command = ecCodeHints then if command = ecCodeHints then
begin begin
if Form1.ParamHint.Visible = true then if SimbaForm.ParamHint.Visible = true then
form1.ParamHint.hide; SimbaForm.ParamHint.hide;
mp := TCodeInsight.Create; mp := TCodeInsight.Create;
mp.OnMessage := @form1.OnCCMessage; mp.OnMessage := @SimbaForm.OnCCMessage;
mp.OnFindInclude := @form1.OnCCFindInclude; mp.OnFindInclude := @SimbaForm.OnCCFindInclude;
ms := TMemoryStream.Create; ms := TMemoryStream.Create;
synedit.Lines.SaveToStream(ms); synedit.Lines.SaveToStream(ms);
@ -441,7 +441,7 @@ begin
if (not (d is TciProcedureDeclaration)) and (d.Owner is TciProcedureDeclaration) then if (not (d is TciProcedureDeclaration)) and (d.Owner is TciProcedureDeclaration) then
d := d.Owner; d := d.Owner;
if (TciProcedureDeclaration(d).Params <> '') then if (TciProcedureDeclaration(d).Params <> '') then
Form1.ParamHint.Show(PosToCaretXY(synedit,posi + 1), PosToCaretXY(synedit,bracketpos), SimbaForm.ParamHint.Show(PosToCaretXY(synedit,posi + 1), PosToCaretXY(synedit,bracketpos),
TciProcedureDeclaration(d), synedit,mp) TciProcedureDeclaration(d), synedit,mp)
else else
FormWriteln('<no parameters expected>'); FormWriteln('<no parameters expected>');
@ -452,21 +452,21 @@ begin
//Do not free the MP, we need to use this. //Do not free the MP, we need to use this.
end; end;
end; end;
if Form1.CodeCompletionForm.Visible then if SimbaForm.CodeCompletionForm.Visible then
case Command of case Command of
ecDeleteChar, ecDeleteWord, ecDeleteEOL: ecDeleteChar, ecDeleteWord, ecDeleteEOL:
begin begin
if (SynEdit.CaretY = Form1.CodeCompletionStart.y) then if (SynEdit.CaretY = SimbaForm.CodeCompletionStart.y) then
begin begin
//e.GetWordBoundsAtRowCol(acp_start, sp, ep); //e.GetWordBoundsAtRowCol(acp_start, sp, ep);
s := WordAtCaret(SynEdit, sp, ep, Form1.CodeCompletionStart.x); s := WordAtCaret(SynEdit, sp, ep, SimbaForm.CodeCompletionStart.x);
if (SynEdit.CaretX >= Form1.CodeCompletionStart.x) and (SynEdit.CaretX <= ep) then if (SynEdit.CaretX >= SimbaForm.CodeCompletionStart.x) and (SynEdit.CaretX <= ep) then
begin begin
Form1.CodeCompletionForm.ListBox.Filter := s; SimbaForm.CodeCompletionForm.ListBox.Filter := s;
Exit; Exit;
end; end;
end; end;
Form1.CodeCompletionForm.Hide; SimbaForm.CodeCompletionForm.Hide;
end; end;
end; end;
end; end;
@ -491,28 +491,28 @@ begin
{$IFDEF UpdateEditButtons} {$IFDEF UpdateEditButtons}
if scSelection in changes then if scSelection in changes then
begin; begin;
Form1.TT_Cut.Enabled := SynEdit.SelAvail; SimbaForm.TT_Cut.Enabled := SynEdit.SelAvail;
form1.TT_Copy.Enabled:= Form1.TT_Cut.Enabled; SimbaForm.TT_Copy.Enabled:= SimbaForm.TT_Cut.Enabled;
form1.TT_Paste.Enabled:= SynEdit.CanPaste; SimbaForm.TT_Paste.Enabled:= SynEdit.CanPaste;
end; end;
{$ENDIF} {$ENDIF}
if Form1.CodeCompletionForm.Visible then if SimbaForm.CodeCompletionForm.Visible then
if (scAll in Changes) or (scTopLine in Changes) then if (scAll in Changes) or (scTopLine in Changes) then
Form1.CodeCompletionForm.Visible := False SimbaForm.CodeCompletionForm.Visible := False
else if (scCaretX in Changes) or (scCaretY in Changes) or (scSelection in Changes) or (scModified in Changes) then else if (scCaretX in Changes) or (scCaretY in Changes) or (scSelection in Changes) or (scModified in Changes) then
begin begin
if (SynEdit.CaretY = Form1.CodeCompletionStart.y) then if (SynEdit.CaretY = SimbaForm.CodeCompletionStart.y) then
begin begin
s := WordAtCaret(SynEdit, sp, ep, Form1.CodeCompletionStart.x); s := WordAtCaret(SynEdit, sp, ep, SimbaForm.CodeCompletionStart.x);
if (SynEdit.CaretX >= Form1.CodeCompletionStart.x) and (SynEdit.CaretX - 1 <= ep) then if (SynEdit.CaretX >= SimbaForm.CodeCompletionStart.x) and (SynEdit.CaretX - 1 <= ep) then
begin begin
Form1.CodeCompletionForm.ListBox.Filter := s; SimbaForm.CodeCompletionForm.ListBox.Filter := s;
Exit; Exit;
end; end;
end; end;
Form1.CodeCompletionForm.Hide; SimbaForm.CodeCompletionForm.Hide;
end; end;
end; end;
@ -522,7 +522,7 @@ begin
if ScriptChanged then if ScriptChanged then
if SynEdit.Lines.Text = StartText then if SynEdit.Lines.Text = StartText then
begin; begin;
Form1.Caption:= format(WindowTitle,[ScriptName]); SimbaForm.Caption:= format(WindowTitle,[ScriptName]);
OwnerSheet.Caption:= ScriptName; OwnerSheet.Caption:= ScriptName;
ScriptChanged := false; ScriptChanged := false;
end; end;
@ -534,7 +534,7 @@ begin
if ScriptChanged then if ScriptChanged then
if SynEdit.Lines.Text = StartText then if SynEdit.Lines.Text = StartText then
begin; begin;
Form1.Caption:= format(WindowTitle,[ScriptName]); SimbaForm.Caption:= format(WindowTitle,[ScriptName]);
OwnerSheet.Caption := ScriptName; OwnerSheet.Caption := ScriptName;
ScriptChanged := false; ScriptChanged := false;
end; end;
@ -551,10 +551,10 @@ begin
else else
begin begin
ErrorData.Module:= SetDirSeparators(ErrorData.Module);// Set it right ;-) ErrorData.Module:= SetDirSeparators(ErrorData.Module);// Set it right ;-)
Form1.LoadScriptFile(ErrorData.Module,true,true);//Checks if the file is already open! SimbaForm.LoadScriptFile(ErrorData.Module,true,true);//Checks if the file is already open!
ErrorData.Module:= ''; ErrorData.Module:= '';
Form1.CurrScript.ErrorData := Self.ErrorData; SimbaForm.CurrScript.ErrorData := Self.ErrorData;
Form1.CurrScript.HandleErrorData; SimbaForm.CurrScript.HandleErrorData;
exit; exit;
end; end;
end; end;
@ -575,7 +575,7 @@ procedure TScriptFrame.MakeActiveScriptFrame;
var var
i : integer; i : integer;
begin begin
if Form1.Visible then if SimbaForm.Visible then
for i := 0 to OwnerPage.PageCount - 1 do for i := 0 to OwnerPage.PageCount - 1 do
if OwnerPage.Pages[i] = OwnerSheet then if OwnerPage.Pages[i] = OwnerSheet then
begin; begin;
@ -589,7 +589,7 @@ end;
procedure TScriptFrame.ScriptThreadTerminate(Sender: TObject); procedure TScriptFrame.ScriptThreadTerminate(Sender: TObject);
begin begin
FScriptState:= ss_None; FScriptState:= ss_None;
Form1.RefreshTab; SimbaForm.RefreshTab;
end; end;
procedure AddKey(const SynEdit : TSynEdit; const ACmd: TSynEditorCommand; const AKey: word;const AShift: TShiftState); procedure AddKey(const SynEdit : TSynEdit; const ACmd: TSynEditorCommand; const AKey: word;const AShift: TShiftState);
begin begin
@ -614,7 +614,7 @@ begin
FScriptState:= ss_None; FScriptState:= ss_None;
ScriptErrorLine:= -1; ScriptErrorLine:= -1;
OwnerSheet.Caption:= ScriptName; OwnerSheet.Caption:= ScriptName;
SynEdit.Highlighter := Form1.CurrHighlighter; SynEdit.Highlighter := SimbaForm.CurrHighlighter;
SynEdit.Options:= SynEdit.Options + [eoTabIndent] - [eoSmartTabs]; SynEdit.Options:= SynEdit.Options + [eoTabIndent] - [eoSmartTabs];
SynEdit.IncrementColor.Background := $30D070; SynEdit.IncrementColor.Background := $30D070;
SynEdit.HighlightAllColor.Background:= clYellow; SynEdit.HighlightAllColor.Background:= clYellow;

22
Projects/SAMufasaGUI/project1.lpi
View File

@ -40,19 +40,19 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="46"> <Units Count="47">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="project1"/> <UnitName Value="project1"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="testunit.pas"/> <Filename Value="simba.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="Form1"/> <ComponentName Value="SimbaForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/> <UnitName Value="simba"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
@ -288,6 +288,13 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="v_MiscFunctions"/> <UnitName Value="v_MiscFunctions"/>
</Unit45> </Unit45>
<Unit46>
<Filename Value="bitmapconv.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="BitmapConvForm"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="bitmapconv"/>
</Unit46>
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
@ -319,4 +326,11 @@
<CreateMakefileOnBuild Value="True"/> <CreateMakefileOnBuild Value="True"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>
<Debugging>
<Exceptions Count="1">
<Item1>
<Name Value="ESyntaxError"/>
</Item1>
</Exceptions>
</Debugging>
</CONFIG> </CONFIG>

7
Projects/SAMufasaGUI/project1.lpr
View File

@ -31,12 +31,12 @@ uses
{$IFDEF UNIX}{$IFDEF UseCThreads} {$IFDEF UNIX}{$IFDEF UseCThreads}
cthreads, cmem, cthreads, cmem,
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
Interfaces, Forms, testunit, colourhistory, About, internets, debugimage, Interfaces, Forms, simba, colourhistory, About, internets, debugimage,
framefunctionlist, simpleanalyzer, updater, updateform, simbasettings, framefunctionlist, simpleanalyzer, updater, updateform, simbasettings,
libloader, mufasabase, v_ideCodeInsight, PSDump, v_ideCodeParser, libloader, mufasabase, v_ideCodeInsight, PSDump, v_ideCodeParser,
v_AutoCompleteForm, CastaliaPasLex, CastaliaPasLexTypes, CastaliaSimplePasPar, v_AutoCompleteForm, CastaliaPasLex, CastaliaPasLexTypes, CastaliaSimplePasPar,
CastaliaSimplePasParTypes, dcpbase64, mPasLex, v_Constants, v_MiscFunctions, CastaliaSimplePasParTypes, dcpbase64, mPasLex, v_Constants, v_MiscFunctions,
extensionmanagergui, mmisc; extensionmanagergui, mmisc, bitmapconv;
{$R project1.res} {$R project1.res}
@ -44,11 +44,12 @@ begin
Application.Title:='Simba'; Application.Title:='Simba';
Application.Initialize; Application.Initialize;
Application.CreateForm(TForm1, Form1); Application.CreateForm(TSimbaForm, SimbaForm);
Application.CreateForm(TColourHistoryForm, ColourHistoryForm); Application.CreateForm(TColourHistoryForm, ColourHistoryForm);
Application.CreateForm(TAboutForm, AboutForm); Application.CreateForm(TAboutForm, AboutForm);
Application.CreateForm(TDebugImgForm, DebugImgForm); Application.CreateForm(TDebugImgForm, DebugImgForm);
Application.CreateForm(TExtensionsForm, ExtensionsForm); Application.CreateForm(TExtensionsForm, ExtensionsForm);
Application.CreateForm(TBitmapConvForm, BitmapConvForm);
// Application.CreateForm(TSimbaUpdateForm, SimbaUpdateForm); // Application.CreateForm(TSimbaUpdateForm, SimbaUpdateForm);
// Application.CreateForm(TSettingsForm, SettingsForm); Done in FormCreate of MainForm // Application.CreateForm(TSettingsForm, SettingsForm); Done in FormCreate of MainForm
Application.Run; Application.Run;

14
Projects/SAMufasaGUI/psextension.pas
View File

@ -49,7 +49,7 @@ uses
uPSC_extctrls,uPSC_menus, //Compile libs uPSC_extctrls,uPSC_menus, //Compile libs
uPSR_std, uPSR_controls,uPSR_classes,uPSR_graphics,uPSR_stdctrls,uPSR_forms, uPSR_std, uPSR_controls,uPSR_classes,uPSR_graphics,uPSR_stdctrls,uPSR_forms,
uPSR_extctrls,uPSR_menus, //Runtime-libs uPSR_extctrls,uPSR_menus, //Runtime-libs
testunit,updateform,settingssandbox,bitmaps,files,Dialogs, mmisc//Writeln simba,updateform,settingssandbox,bitmaps,files,Dialogs, mmisc//Writeln
; ;
function TSimbaPSExtension.HookExists(const HookName: String): Boolean; function TSimbaPSExtension.HookExists(const HookName: String): Boolean;
@ -119,10 +119,10 @@ procedure TSimbaPSExtension.RegisterMyMethods(Sender: TPSScript);
begin begin
Sender.Comp.AddTypes('TStringArray','Array of String'); Sender.Comp.AddTypes('TStringArray','Array of String');
Sender.Comp.AddConstantN('AppPath','string').SetString(MainDir + DirectorySeparator); Sender.Comp.AddConstantN('AppPath','string').SetString(MainDir + DirectorySeparator);
Sender.Comp.AddConstantN('IncludePath','string').SetString(Form1.IncludePath); Sender.Comp.AddConstantN('IncludePath','string').SetString(SimbaForm.IncludePath);
Sender.Comp.AddConstantN('PluginPath','string').SetString(Form1.PluginPath); Sender.Comp.AddConstantN('PluginPath','string').SetString(SimbaForm.PluginPath);
Sender.Comp.AddConstantN('FontPath','string').SetString(form1.FontPath); Sender.Comp.AddConstantN('FontPath','string').SetString(SimbaForm.FontPath);
Sender.Comp.AddConstantN('ExtPath','string').SetString(form1.ExtPath); Sender.Comp.AddConstantN('ExtPath','string').SetString(SimbaForm.ExtPath);
Sender.Comp.AddTypeS('TMsgDlgType', '( mtWarning, mtError, mtInformation, mtConfirmati' Sender.Comp.AddTypeS('TMsgDlgType', '( mtWarning, mtError, mtInformation, mtConfirmati'
+'on, mtCustom )'); +'on, mtCustom )');
Sender.Comp.AddTypeS('TMsgDlgBtn', '( mbYes, mbNo, mbOK, mbCancel, mbAbort, mbRetry, m' Sender.Comp.AddTypeS('TMsgDlgBtn', '( mbYes, mbNo, mbOK, mbCancel, mbAbort, mbRetry, m'
@ -146,8 +146,8 @@ end;
procedure TSimbaPSExtension.OnPSExecute(Sender: TPSScript); procedure TSimbaPSExtension.OnPSExecute(Sender: TPSScript);
begin begin
Sender.SetVarToInstance('simba',Form1); Sender.SetVarToInstance('simba',SimbaForm);
Sender.SetVarToInstance('Simba_MainMenu',Form1.MainMenu); Sender.SetVarToInstance('Simba_MainMenu',SimbaForm.MainMenu);
Sender.SetPointerToData('Settings',@Self.Settings,Sender.FindNamedType('TMMLSettingsSandbox')); Sender.SetPointerToData('Settings',@Self.Settings,Sender.FindNamedType('TMMLSettingsSandbox'));
end; end;

2
Projects/SAMufasaGUI/testunit.lfm → Projects/SAMufasaGUI/simba.lfm
View File

@ -1,4 +1,4 @@
object Form1: TForm1 object SimbaForm: TSimbaForm
Left = 150 Left = 150
Height = 623 Height = 623
Top = 69 Top = 69

356
Projects/SAMufasaGUI/testunit.pas → Projects/SAMufasaGUI/simba.pas
View File

File diff suppressed because it is too large Load Diff

6
Projects/SAMufasaGUI/updateform.pas
View File

@ -81,14 +81,14 @@ var
implementation implementation
uses uses
internets, TestUnit, simbasettings,lclintf; internets, simba, simbasettings,lclintf;
function TSimbaUpdateForm.CanUpdate: Boolean; function TSimbaUpdateForm.CanUpdate: Boolean;
begin begin
GetLatestSimbaVersion; GetLatestSimbaVersion;
mDebugLn(format('Current Simba version: %d',[TestUnit.SimbaVersion])); mDebugLn(format('Current Simba version: %d',[simba.SimbaVersion]));
mDebugLn('Latest Simba Version: ' + IntToStr(FSimbaVersion)); mDebugLn('Latest Simba Version: ' + IntToStr(FSimbaVersion));
Exit(testunit.SimbaVersion < FSimbaVersion); Exit(simba.SimbaVersion < FSimbaVersion);
end; end;
function TSimbaUpdateForm.GetLatestFontVersion: integer; function TSimbaUpdateForm.GetLatestFontVersion: integer;