1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-25 18:52:15 -05:00

Renamed: The project to Simba, TestUnit to SimbaUnit.

This commit is contained in:
Raymond 2010-05-11 15:13:27 +02:00
parent 906418873c
commit 8f306ce787
17 changed files with 43 additions and 42 deletions

View File

@ -1,4 +1,4 @@
#$ fpc -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 project1.lpr #$ fpc -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 Simba.lpr
.PHONY: default clean .PHONY: default clean
@ -27,4 +27,4 @@ clean:
del $(binary) del $(binary)
$(binary): $(binary):
$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) project1.lpr $(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) Simba.lpr

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -42,17 +42,17 @@
</RequiredPackages> </RequiredPackages>
<Units Count="47"> <Units Count="47">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="Simba.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="project1"/> <UnitName Value="Simba"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="simba.pas"/> <Filename Value="simbaunit.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="SimbaForm"/> <ComponentName Value="SimbaForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="simba"/> <UnitName Value="SimbaUnit"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
@ -205,7 +205,7 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="SettingsForm"/> <ComponentName Value="SettingsForm"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="simbasettings"/> <UnitName Value="SimbaSettings"/>
</Unit29> </Unit29>
<Unit30> <Unit30>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/tpa.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/tpa.inc"/>

View File

@ -21,24 +21,24 @@
SAMufasaGUI for the Mufasa Macro Library SAMufasaGUI for the Mufasa Macro Library
} }
program project1; program Simba;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
{$DEFINE SIMBA} {$DEFINE Simba}
uses uses
{$IFDEF UNIX}{$IFDEF UseCThreads} {$IFDEF UNIX}{$IFDEF UseCThreads}
cthreads, cmem, cthreads, cmem,
{$ENDIF}{$ENDIF} {$ENDIF}{$ENDIF}
Interfaces, Forms, simba, colourhistory, About, internets, debugimage, Interfaces, Forms, SimbaUnit, 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, bitmapconv; extensionmanagergui, mmisc, bitmapconv;
{$R project1.res} {$R Simba.res}
begin begin
Application.Title:='Simba'; Application.Title:='Simba';

View File

@ -54,15 +54,15 @@ var
implementation implementation
uses uses
simba; SimbaUnit;
{ TAboutForm } { TAboutForm }
procedure TAboutForm.FormCreate(Sender: TObject); procedure TAboutForm.FormCreate(Sender: TObject);
begin begin
Self.Caption := format('About Simba r%d', [simba.SimbaVersion]); Self.Caption := format('About Simba r%d', [SimbaUnit.SimbaVersion]);
Self.LabelRevision.Caption := format('Revision %d', [simba.SimbaVersion]); Self.LabelRevision.Caption := format('Revision %d', [SimbaUnit.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',[simba.SimbaVersion])); AboutMemo.Lines.Add(format('You are currently using version: %d',[SimbaUnit.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;

View File

@ -104,7 +104,7 @@ var
implementation implementation
uses uses
colour_conv, simba, lclintf, lcltype; colour_conv, SimbaUnit, lclintf, lcltype;
constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String); constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String);
begin begin

View File

@ -59,7 +59,7 @@ var
implementation implementation
uses uses
MufasaTypes, math, graphtype, IntfGraphics,simba,lclintf,colour_conv,InterfaceBase; MufasaTypes, math, graphtype, IntfGraphics,SimbaUnit,lclintf,colour_conv,InterfaceBase;
{ TDebugImgForm } { TDebugImgForm }
procedure TDebugImgForm.FormCreate(Sender: TObject); procedure TDebugImgForm.FormCreate(Sender: TObject);

View File

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

View File

@ -72,7 +72,7 @@ type
implementation implementation
uses uses
simba, Graphics, stringutil, simpleanalyzer,v_ideCodeParser,lclintf; SimbaUnit, Graphics, stringutil, simpleanalyzer,v_ideCodeParser,lclintf;
{ TFunctionListFrame } { TFunctionListFrame }

View File

@ -5,6 +5,7 @@ object ScriptFrame: TScriptFrame
Width = 397 Width = 397
ClientHeight = 328 ClientHeight = 328
ClientWidth = 397 ClientWidth = 397
LCLVersion = '0.9.29'
TabOrder = 0 TabOrder = 0
DesignLeft = 159 DesignLeft = 159
DesignTop = 420 DesignTop = 420

View File

@ -93,7 +93,7 @@ type
implementation implementation
uses uses
simba, SynEditTypes, LCLIntF, StrUtils,framefunctionlist; SimbaUnit, 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

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
simba,updateform,settingssandbox,bitmaps,files,Dialogs, mmisc//Writeln SimbaUnit,updateform,settingssandbox,bitmaps,files,Dialogs, mmisc//Writeln
; ;
function TSimbaPSExtension.HookExists(const HookName: String): Boolean; function TSimbaPSExtension.HookExists(const HookName: String): Boolean;
@ -146,7 +146,7 @@ end;
procedure TSimbaPSExtension.OnPSExecute(Sender: TPSScript); procedure TSimbaPSExtension.OnPSExecute(Sender: TPSScript);
begin begin
Sender.SetVarToInstance('simba',SimbaForm); Sender.SetVarToInstance('Simba',SimbaForm);
Sender.SetVarToInstance('Simba_MainMenu',SimbaForm.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;

View File

@ -1,4 +1,4 @@
unit simbasettings; unit Simbasettings;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}

View File

@ -4,7 +4,7 @@ object SimbaForm: TSimbaForm
Top = 69 Top = 69
Width = 660 Width = 660
AllowDropFiles = True AllowDropFiles = True
Caption = 'THA FUKING SIMBA' Caption = 'THA FUKING Simba'
ClientHeight = 603 ClientHeight = 603
ClientWidth = 660 ClientWidth = 660
KeyPreview = True KeyPreview = True

View File

@ -18,10 +18,10 @@
See the file COPYING, included in this distribution, See the file COPYING, included in this distribution,
for details about the copyright. for details about the copyright.
simba/GUI for the Mufasa Macro Library Simba/GUI for the Mufasa Macro Library
} }
unit simba; unit SimbaUnit;
{$undef EditButtons} {$undef EditButtons}
{$Undef ProcessMessages} //Define this for processmessages in ThreadSafeCall {$Undef ProcessMessages} //Define this for processmessages in ThreadSafeCall
@ -41,7 +41,7 @@ uses
SynExportHTML, SynEditKeyCmds, SynEditHighlighter, SynExportHTML, SynEditKeyCmds, SynEditHighlighter,
SynEditMarkupHighAll, LMessages, Buttons,mmisc, SynEditMarkupHighAll, LMessages, Buttons,mmisc,
stringutil,mufasatypesutil,mufasabase, v_ideCodeParser, stringutil,mufasatypesutil,mufasabase, v_ideCodeParser,
about, framefunctionlist, ocr, updateform, simbasettings, psextension, virtualextension, about, framefunctionlist, ocr, updateform, Simbasettings, psextension, virtualextension,
extensionmanager, settingssandbox, v_ideCodeInsight, CastaliaPasLexTypes, extensionmanager, settingssandbox, v_ideCodeInsight, CastaliaPasLexTypes,
CastaliaSimplePasPar, v_AutoCompleteForm, PSDump; CastaliaSimplePasPar, v_AutoCompleteForm, PSDump;
@ -1130,7 +1130,7 @@ begin
CreateSetting('Settings/Fonts/VersionLink', FontURL + 'Version'); CreateSetting('Settings/Fonts/VersionLink', FontURL + 'Version');
CreateSetting('Settings/Fonts/UpdateLink', FontURL + 'Fonts.tar.bz2'); CreateSetting('Settings/Fonts/UpdateLink', FontURL + 'Fonts.tar.bz2');
CreateSetting('Settings/News/URL', 'http://simba.villavu.com/bin/news'); CreateSetting('Settings/News/URL', 'http://Simba.villavu.com/bin/news');
{Creates the paths and returns the path} {Creates the paths and returns the path}
PluginsPath := CreateSetting('Settings/Plugins/Path', ExpandFileName(MainDir+ DS+ 'Plugins' + DS)); PluginsPath := CreateSetting('Settings/Plugins/Path', ExpandFileName(MainDir+ DS+ 'Plugins' + DS));
@ -1895,7 +1895,7 @@ end;
procedure TSimbaForm.MenuItemHandbookClick(Sender: TObject); procedure TSimbaForm.MenuItemHandbookClick(Sender: TObject);
begin begin
OpenURL('http://wizzup.org/static/simba/doc/ps_handbook/'); OpenURL('http://wizzup.org/static/Simba/doc/ps_handbook/');
end; end;
procedure TSimbaForm.MenuItemColourHistoryClick(Sender: TObject); procedure TSimbaForm.MenuItemColourHistoryClick(Sender: TObject);
@ -2374,7 +2374,7 @@ function TSimbaForm.GetSimbaNews: String;
var var
t: TDownloadThread; t: TDownloadThread;
begin begin
t := TDownloadThread.Create(LoadSettingDef('Settings/News/URL', 'http://simba.villavu.com/bin/news'), t := TDownloadThread.Create(LoadSettingDef('Settings/News/URL', 'http://Simba.villavu.com/bin/news'),
@Result); @Result);
t.Resume; t.Resume;
while not t.done do while not t.done do
@ -2804,7 +2804,7 @@ begin
Exit; Exit;
with TOpenDialog.Create(nil) do with TOpenDialog.Create(nil) do
try try
Filter:= 'Simba Files|*.simba;*.simb;*.cogat;*.mufa;*.txt;*.' +LoadSettingDef('Settings/Extensions/FileExtension','sex')+ Filter:= 'Simba Files|*.Simba;*.simb;*.cogat;*.mufa;*.txt;*.' +LoadSettingDef('Settings/Extensions/FileExtension','sex')+
'|Any files|*.*'; '|Any files|*.*';
if Execute then if Execute then
if FileExists(filename) then if FileExists(filename) then
@ -2886,14 +2886,14 @@ begin
Result := false; Result := false;
with TSaveDialog.Create(nil) do with TSaveDialog.Create(nil) do
try try
filter := 'Simba Files|*.simba;*.simb;*.cogat;*.mufa;*.txt;*.' + filter := 'Simba Files|*.Simba;*.simb;*.cogat;*.mufa;*.txt;*.' +
LoadSettingDef('Settings/Extensions/FileExtension','sex')+ LoadSettingDef('Settings/Extensions/FileExtension','sex')+
'|Any files|*.*'; '|Any files|*.*';
if Execute then if Execute then
begin; begin;
if ExtractFileExt(FileName) = '' then if ExtractFileExt(FileName) = '' then
begin; begin;
ScriptFile := FileName + '.simba'; ScriptFile := FileName + '.Simba';
end else end else
ScriptFile := FileName; ScriptFile := FileName;
CurrScript.SynEdit.Lines.SaveToFile(ScriptFile); CurrScript.SynEdit.Lines.SaveToFile(ScriptFile);

View File

@ -63,32 +63,32 @@ const
DownloadSpeedTextEnded = 'Downloaded at %d kB/s'; DownloadSpeedTextEnded = 'Downloaded at %d kB/s';
SimbaURL = {$IFDEF WINDOWS} SimbaURL = {$IFDEF WINDOWS}
{$IFDEF CPUI386} {$IFDEF CPUI386}
'http://simba.villavu.com/bin/Windows/x86/Stable/' 'http://Simba.villavu.com/bin/Windows/x86/Stable/'
{$ELSE} {$ELSE}
'http://simba.villavu.com/bin/Windows/x86_64/Stable/' 'http://Simba.villavu.com/bin/Windows/x86_64/Stable/'
{$ENDIF} {$ENDIF}
{$ELSE} {$ELSE}
{$IFDEF CPUI386} {$IFDEF CPUI386}
'http://simba.villavu.com/bin/Linux/x86/Stable/' 'http://Simba.villavu.com/bin/Linux/x86/Stable/'
{$ELSE} {$ELSE}
'http://simba.villavu.com/bin/Linux/x86_64/Stable/' 'http://Simba.villavu.com/bin/Linux/x86_64/Stable/'
{$ENDIF} {$ENDIF}
{$ENDIF}; {$ENDIF};
FontURL = 'http://simba.villavu.com/bin/Fonts/'; FontURL = 'http://Simba.villavu.com/bin/Fonts/';
var var
SimbaUpdateForm: TSimbaUpdateForm; SimbaUpdateForm: TSimbaUpdateForm;
implementation implementation
uses uses
internets, simba, simbasettings,lclintf; internets, SimbaUnit, Simbasettings,lclintf;
function TSimbaUpdateForm.CanUpdate: Boolean; function TSimbaUpdateForm.CanUpdate: Boolean;
begin begin
GetLatestSimbaVersion; GetLatestSimbaVersion;
mDebugLn(format('Current Simba version: %d',[simba.SimbaVersion])); mDebugLn(format('Current Simba version: %d',[SimbaUnit.SimbaVersion]));
mDebugLn('Latest Simba Version: ' + IntToStr(FSimbaVersion)); mDebugLn('Latest Simba Version: ' + IntToStr(FSimbaVersion));
Exit(simba.SimbaVersion < FSimbaVersion); Exit(SimbaUnit.SimbaVersion < FSimbaVersion);
end; end;
function TSimbaUpdateForm.GetLatestFontVersion: integer; function TSimbaUpdateForm.GetLatestFontVersion: integer;