moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2025-02-07 02:30:19 -05:00
Code Issues Releases Wiki Activity

Added IncludePaths etc

Browse Source 
git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@394 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Raymond 2010-01-10 22:01:33 +00:00
parent 1b4706f1fd
commit 9be1743a7f
3 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Projects/SAMufasaGUI/testunit.pas
View File

@ -42,7 +42,7 @@ uses
ocr, updateform, simbasettings;
const
SimbaVersion = 392;
SimbaVersion = 394;
type
@ -284,6 +284,7 @@ type
procedure UpdateTimerCheck(Sender: TObject);
private
PopupTab : integer;
FirstRun : boolean;//Only show the warnings the first run (path not existing one's)
SearchStart : TPoint;
LastTab : integer;
function GetScriptState: TScriptState;
@ -441,8 +442,7 @@ begin
chk := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Updater/CheckForUpdates',
'True', SimbaSettingsFile
);
'True', SimbaSettingsFile);
if chk <> 'True' then
Exit;
@ -454,12 +454,8 @@ begin
end;
time := StrToIntDef(SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Updater/CheckEveryXMinutes',
'30', SimbaSettingsFile
), 30);
'Settings/Updater/CheckEveryXMinutes','30', SimbaSettingsFile)
,30);
UpdateTimer.Interval:= time {mins} * 60 {secs} * 1000 {ms};//Every half hour
end;
@ -492,6 +488,10 @@ procedure TForm1.RunScript;
var
DbgImgInfo : TDbgImgInfo;
fontPath: String;
includePath : string;
AppPath : string;
pluginspath: string;
ScriptPath : string;
loadFontsOnScriptStart: String;
begin
@ -522,12 +522,41 @@ begin
DbgImgInfo.GetDebugBitmap:= @DebugImgForm.GetDbgBmp;
DbgImgInfo.GetBitmap:= @DebugImgForm.GetDebugImage;
ScriptThread.SetDbgImg(DbgImgInfo);
ScriptThread.OnError:=@ErrorThread;
if ScriptFile <> '' then
ScriptThread.SetPaths( ExtractFileDir(ScriptFile) + DS,IncludeTrailingPathDelimiter(ExpandFileName(MainDir +DS + '..' + DS + '..' + ds)))
else
ScriptThread.SetPaths('', IncludeTrailingPathDelimiter(ExpandFileName(MainDir +DS + '..' + DS + '..' + ds)));
ScriptPath := ExtractFileDir(ScriptFile);
AppPath:= MainDir + DS;
includePath:= SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Includes/Path',
IncludeTrailingPathDelimiter(ExpandFileName(MainDir+
DS + '..' + DS + '..' + ds)) + 'Includes' + DS,
SimbaSettingsFile);
fontPath := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Fonts/Path',
IncludeTrailingPathDelimiter(ExpandFileName(MainDir+
DS + '..' + DS + '..' + ds)) + 'Fonts' + DS,
SimbaSettingsFile);
PluginsPath := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Plugins/Path',
ExpandFileName(MainDir + DS + '..' + DS + '..'+ DS + 'Plugins'+ DS),
SimbaSettingsFile);
if not DirectoryExists(PluginsPath) and not assigned(PluginsGlob) then
begin
if FirstRun then
Writeln('Warning: The plugins directory specified in Settings isn''t valid. Not loading Plugins now.');
end else if not Assigned(PluginsGlob) then
begin
PluginsGlob := TMPlugins.Create;
PluginsGlob.PluginDirs.Add(PluginsPath);
end;
if not DirectoryExists(IncludePath) then
if FirstRun then
Writeln('Warning: The include directory specified in the Settings isn''t valid.');
if not DirectoryExists(fontPath) then
if FirstRun then
Writeln('Warning: The font directory specified in the Settings isn''t valid. Can''t load fonts now');
ScriptThread.SetPaths(ScriptPath,AppPath,Includepath,PluginsPath,fontPath);
// This doesn't actually set the Client's MWindow to the passed window, it
// only copies the current set window handle.
@ -537,26 +566,18 @@ begin
loadFontsOnScriptStart := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Fonts/LoadOnStartUp', 'True', SimbaSettingsFile);
// Copy our current fonts
if not assigned(Self.OCR_Fonts) and (lowercase(loadFontsOnScriptStart) = 'true') then
if not assigned(Self.OCR_Fonts) and (lowercase(loadFontsOnScriptStart) = 'true') and DirectoryExists(fontPath) then
begin
Self.OCR_Fonts := TMOCR.Create(ScriptThread.Client);
fontPath := SettingsForm.Settings.GetSetLoadSaveDefaultKeyValueIfNotExists(
'Settings/Fonts/Path',
IncludeTrailingPathDelimiter(ExpandFileName(MainDir
+DS + '..' + DS + '..' + ds)) + 'Fonts' + DS,
SimbaSettingsFile
);
if DirectoryExists(fontPath) then
begin
OCR_Fonts.InitTOCR(fontPath);
end
end;{
else
begin
writeln('Warning: The Font directory in the Settings is not valid. Changing to default.');
OCR_Fonts.InitTOCR(IncludeTrailingPathDelimiter(ExpandFileName(MainDir +DS + '..' + DS + '..' + ds)) + 'Fonts' + DS);
end;
end; }
ScriptThread.Client.MOCR.SetFonts(OCR_Fonts.GetFonts);
end else
@ -564,6 +585,7 @@ begin
ScriptThread.Client.MOCR.SetFonts(OCR_Fonts.GetFonts);
ScriptThread.OnTerminate:=@ScriptThreadTerminate;
ScriptState:= ss_Running;
FirstRun := false;
//Lets run it!
ScriptThread.Resume;
end;
@ -1223,9 +1245,6 @@ begin
Picker := TMColorPicker.Create(Window);
Selector := TMWindowSelector.Create(Window);
MainDir:= ExtractFileDir(Application.ExeName);
PluginsGlob := TMPlugins.Create;
PluginsGlob.PluginDirs.Add(ExpandFileName(MainDir + DS + '..' + DS + '..'+ DS + 'Plugins'+ DS));
{ For writeln }
SetLength(DebugStream, 0);
DebugCriticalSection := syncobjs.TCriticalSection.Create;
@ -1241,7 +1260,7 @@ begin
end;
{$endif}
frmFunctionList.OnEndDock:= @frmFunctionList.FrameEndDock;
// Ed
FirstRun := true;//Our next run is the first run.
end;
procedure TForm1.FormDestroy(Sender: TObject);

3
Units/MMLAddon/PSInc/pscompile.inc
View File

@ -23,6 +23,9 @@
Sender.Comp.AddConstantN('AppPath','string').SetString(CurrThread.AppPath);
Sender.Comp.AddConstantN('ScriptPath','string').SetString(CurrThread.ScriptPath);
Sender.Comp.AddConstantN('IncludePath','string').SetString(CurrThread.IncludePath);
Sender.Comp.AddConstantN('PluginPath','string').SetString(CurrThread.PluginPath);
Sender.Comp.AddConstantN('FontPath','string').SetString(CurrThread.FontPath);
Sender.Comp.AddTypeS('TIntegerArray', 'Array of integer');
Sender.Comp.AddTypeS('TExtendedArray','Array of extended');
Sender.Comp.AddTypeS('TBoolArray', 'Array of Boolean');

38
Units/MMLAddon/mmlpsthread.pas
View File

@ -68,7 +68,7 @@ type
Parser: TPSPascalPreProcessorParser; const Active: Boolean;
const DirectiveName, DirectiveParam: string; var Continue: Boolean);
private
ScriptPath, AppPath : string;
ScriptPath, AppPath, IncludePath, PluginPath, FontPath: string;
protected
//DebugTo : TMemo;
DebugTo: TWritelnProc;
@ -95,7 +95,7 @@ type
procedure SetPSScript(Script : string);
procedure SetDebug( writelnProc : TWritelnProc );
procedure SetDbgImg( DebugImageInfo : TDbgImgInfo);
procedure SetPaths(ScriptP,AppP : string);
procedure SetPaths(ScriptP,AppP,IncludeP,PluginP,FontP : string);
constructor Create(CreateSuspended: Boolean; TheSyncInfo : PSyncInfo);
destructor Destroy; override;
end;
@ -290,7 +290,7 @@ begin
if FileExists(FileName) then
Path := FileName
else
Path := AppPath+ 'Includes' + DS + Filename;
Path := IncludePath + Filename;
if not FileExists(Path) then
begin;
psWriteln(Path + ' doesn''t exist');
@ -424,32 +424,8 @@ begin
end;
procedure TMMLPSThread.LoadMethods;
var
c : integer;
CurrSection : string;
procedure SetCurrSection(str : string);
begin;
CurrSection := Str;
end;
procedure AddFunction( Ptr : Pointer; DeclStr : String);
begin;
// SetLength(ExportedMethods,c+1);
if c >= 200 then
raise exception.create('PSThread.LoadMethods: Exported more than 200 functions');
ExportedMethods[c].FuncDecl:= DeclStr;
ExportedMethods[c].FuncPtr:= Ptr;
ExportedMethods[c].Section:= CurrSection;
inc(c);
end;
begin
c := 0;
CurrSection := 'Other';
SetLength(ExportedMethods,200);
{$i PSInc/psexportedmethods.inc}
SetLength(ExportedMethods,c);
ExportedMethods:= GetExportedMethods;
end;
class function TMMLPSThread.GetExportedMethods: TExpMethodArr;
@ -497,10 +473,14 @@ begin
DebugImg := DebugImageInfo;
end;
procedure TMMLPSThread.SetPaths(ScriptP, AppP: string);
procedure TMMLPSThread.SetPaths(ScriptP, AppP,IncludeP,PluginP,FontP: string);
begin
AppPath:= AppP;
ScriptPath:= ScriptP;
IncludePath:= IncludeP;
PluginPath:= PluginP;
FontPath:= FontP;
end;