The executable is now created in the "trunk", rather than Projects/SAMufasaGUI/.

Maybe fixed the colourpicker-black-screen bug.. not sure.

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@530 3f818213-9676-44b0-a9b4-5e4c4e03d09d

trunk/Projects/SAMufasaGUI/project1.lpi

@@ -39,7 +39,7 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="33">
+    <Units Count="34">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -224,12 +224,16 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="libloader"/>
       </Unit32>
+      <Unit33>
+        <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/tpa.inc"/>
+        <IsPartOfProject Value="True"/>
+      </Unit33>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="8"/>
     <Target>
-      <Filename Value="Simba"/>
+      <Filename Value="../../Simba"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)/;$(ProjPath)../../Units/MMLAddon/PSInc/"/>
@@ -245,7 +249,6 @@
     <Linking>
       <Debugging>
         <GenerateDebugInfo Value="True"/>
-        <GenerateDwarf Value="True"/>
       </Debugging>
     </Linking>
     <Other>

trunk/Projects/SAMufasaGUI/testunit.pas

@@ -43,7 +43,7 @@ uses
   ColorBox              , about, framefunctionlist, ocr, updateform, simbasettings;
 
 const
-    SimbaVersion = 521;
+    SimbaVersion = 530;
 
 type
 
@@ -545,9 +545,9 @@ begin
       exit;
     end;
     AppPath:= MainDir + DS;
-    includePath:= LoadSettingDef('Settings/Includes/Path', IncludeTrailingPathDelimiter(ExpandFileName(MainDir+  DS + '..' + DS + '..' + ds)) + 'Includes' + DS);
+    includePath:= IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Includes/Path', ExpandFileName(MainDir+DS+'Includes' + DS)));
-    fontPath := LoadSettingDef('Settings/Fonts/Path', IncludeTrailingPathDelimiter(ExpandFileName(MainDir+  DS + '..' + DS + '..' + ds)) + 'Fonts' + DS);
+    fontPath := IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Fonts/Path', ExpandFileName(MainDir+DS+  'Fonts' + DS)));
-    PluginsPath := LoadSettingDef('Settings/Plugins/Path', ExpandFileName(MainDir + DS + '..' + DS + '..'+ DS + 'Plugins'+ DS));
+    PluginsPath := IncludeTrailingPathDelimiter(LoadSettingDef('Settings/Plugins/Path', ExpandFileName(MainDir+ DS+ 'Plugins' + DS)));
     ScriptErrorLine:= -1;
     CurrentSyncInfo.SyncMethod:= @Self.SafeCallThread;
     UseCPascal := LoadSettingDef('Settings/Interpreter/UseCPascal', 'False');

trunk/Units/MMLAddon/PSInc/Wrappers/dtm.inc

@@ -84,6 +84,11 @@ begin
                                     sAngle, eAngle, aStep, aFound);
 end;       }
 
+procedure ps_SetDTMName(DTM : integer; name : string);
+begin
+  CurrThread.Client.MDTM.SetDTMName(DTM,name);
+end;
+
 function ps_DTMFromString(DTMString: String): Integer; extdecl;
 var
    dtm: pDTM;

trunk/Units/MMLAddon/PSInc/psexportedmethods.inc

@@ -30,6 +30,7 @@ AddFunction(@ps_PrintpDTM, 'Procedure PrintpDTM(tDTM : pDTM);');
 AddFunction(@ps_GetDTM ,'function GetDTM(index: Integer; out dtm: pDTM): Boolean;');
 AddFunction(@pDTMToTDTM, 'Function pDTMToTDTM(DTM: pDTM): TDTM;');
 AddFunction(@tDTMTopDTM, 'Function tDTMTopDTM(DTM: TDTM): pDTM;');
+AddFunction(@ps_SetDTMName, 'procedure SetDTMName(DTM : integer; name : string);');
 AddFunction(@ps_DTMFromString, 'function DTMFromString(DTMString: String): Integer;');
 AddFunction(@ps_FreeDTM, 'procedure FreeDTM(DTM: Integer);');
 AddFunction(@ps_FindDTM, 'function FindDTM(DTM: Integer; out x, y: Integer; x1, y1, x2, y2: Integer): Boolean;');

trunk/Units/MMLAddon/colourpicker.pas

@@ -100,7 +100,7 @@ var
    w, h: integer;
    SS : TShiftState;
    p : TPoint;
-
+   bmp2 : Graphics.TBitmap;
    bmp: TMufasaBitmap;
    Desktop : TIOManager;
 
@@ -173,8 +173,9 @@ begin
   { Copy the client to ImageMain }
   bmp:=TMufasaBitmap.Create;
   bmp.CopyClientToBitmap(Desktop, true, 0, 0, w-1, h-1);
-  ImageMain.Picture.Bitmap.Free;
+  Bmp2 := Bmp.ToTBitmap;
-  ImageMain.Picture.Bitmap := bmp.ToTBitmap;
+  ImageMain.Picture.Assign(bmp2);
+  bmp2.free;
   bmp.Free;
 
   { Set up handles and events }

trunk/Units/MMLCore/dtm.pas

@@ -112,9 +112,10 @@ begin
       if not b then
       begin;
         if DTMList[i].n <> '' then
-          Writeln(Format('DTM [%s] was not freed',[DTMList[i].n]))
+          Writeln(Format('DTM[%s] has not been freed in the script, freeing it now.',[DTMList[i].n]))
         else
-          writeln(Format('DTM [%d] was not freed',[i]));
+          writeln(Format('DTM[%d] has not been freed in the script, freeing it now.',[i]));
+        FreeDTM(i);
       end;
   end;
   SetLength(DTMList, 0);
@@ -252,15 +253,13 @@ begin
 end;
 
 function TMDTM.SetDTMName(DTM: Integer; s: string): boolean;
-var
-  dtm_: pDTM;
 begin
-  if(GetDTM(dtm, dtm_)) then
+  try
-  begin
+    DTMList[DTM].n:= s;
-    dtm_.n := s;
+    Exit(true);
-    Exit(True);
+  except
+    raise Exception.CreateFMT('SetDTMName: The given DTM %d does not exist.', [DTM]);
   end;
-  raise Exception.CreateFMT('SetDTMName: The given DTM %d does not exist.', [DTM]);
   Exit(False);
 end;