From 2c9a9705ccb0fc35f9b0ed6b728ebf2c5984f705 Mon Sep 17 00:00:00 2001
From: zueuk <zueuk>
Date: Sat, 23 Sep 2006 15:53:39 +0000
Subject: [PATCH] final interface fixes

---
 2.10/Source/Main.dfm    |  2 ++
 2.10/Source/Main.pas    | 25 ++++++++++++++++---------
 2.10/Source/Options.pas |  2 +-
 2.10/Source/Tracer.pas  |  6 ++++--
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/2.10/Source/Main.dfm b/2.10/Source/Main.dfm
index 6b1246d..08762b5 100644
--- a/2.10/Source/Main.dfm
+++ b/2.10/Source/Main.dfm
@@ -299,6 +299,7 @@ object MainForm: TMainForm
       Caption = 'ToolButton2'
       ImageIndex = 39
       Style = tbsSeparator
+      Visible = False
     end
     object tbShowTrace: TToolButton
       Left = 579
@@ -306,6 +307,7 @@ object MainForm: TMainForm
       Hint = 'Show trace window'
       Caption = 'tbShowTrace'
       ImageIndex = 38
+      Visible = False
       OnClick = tbShowTraceClick
     end
   end
diff --git a/2.10/Source/Main.pas b/2.10/Source/Main.pas
index 00b6101..499f0e2 100644
--- a/2.10/Source/Main.pas
+++ b/2.10/Source/Main.pas
@@ -39,7 +39,7 @@ const
   RS_XO = 2;
   RS_VO = 3;
 
-  AppVersionString = 'Apophysis 2.05 pre-release 17';
+  AppVersionString = 'Apophysis 2.05 rc1';
 
 type
   TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove,
@@ -1787,7 +1787,6 @@ end;
 procedure TMainForm.DrawFlame;
 var
   GlobalMemoryInfo: TMemoryStatus; // holds the global memory status information
-  RenderMem: integer;
   RenderCP: TControlPoint;
   Mem, ApproxMem: cardinal;
 begin
@@ -4230,21 +4229,29 @@ procedure TMainForm.ImageMouseDown(Sender: TObject; Button: TMouseButton;
 begin
   if button <> mbLeft then exit;
   FClickRect.TopLeft := Point(x, y);
-  FClickRect.BottomRight := FclickRect.TopLeft;
+  FClickRect.BottomRight := FClickRect.TopLeft;
   case FMouseMoveState of
     msZoomWindow:
       begin
         FSelectRect.TopLeft := Point(x, y);
         FSelectRect.BottomRight := Point(x, y);
         DrawZoomWindow;
-        FMouseMoveState := msZoomWindowMove;
+
+//        if ssAlt in Shift then
+//          FMouseMoveState := msZoomOutWindowMove
+//        else
+          FMouseMoveState := msZoomWindowMove;
       end;
     msZoomOutWindow:
       begin
         FSelectRect.TopLeft := Point(x, y);
         FSelectRect.BottomRight := Point(x, y);
         DrawZoomWindow;
-        FMouseMoveState := msZoomOutWindowMove;
+
+//        if ssAlt in Shift then
+//          FMouseMoveState := msZoomWindowMove
+//        else
+          FMouseMoveState := msZoomOutWindowMove;
       end;
     msDrag:
       begin
@@ -4293,7 +4300,7 @@ begin
         dx := x - FClickRect.TopLeft.X;
         dy := y - FClickRect.TopLeft.Y;
 
-        if ssAlt in Shift then begin
+        if ssShift in Shift then begin
           if (dy = 0) or (abs(dx/dy) >= Image.Width/Image.Height) then
             dy := Round(dx / Image.Width * Image.Height)
           else
@@ -4303,7 +4310,7 @@ begin
           FSelectRect.Right := FClickRect.TopLeft.X + dx;
           FSelectRect.Bottom := FClickRect.TopLeft.Y + dy;
         end
-        else if ssShift in Shift then begin
+        else if ssCtrl in Shift then begin
           FSelectRect.TopLeft := FClickRect.TopLeft;
           sgn := IfThen(dy*dx >=0, 1, -1);
           if (dy = 0) or (abs(dx/dy) >= Image.Width/Image.Height) then begin
@@ -4386,7 +4393,7 @@ begin
         FMouseMoveState := msZoomWindow;
         if (abs(FSelectRect.Left - FSelectRect.Right) < 10) or
            (abs(FSelectRect.Top - FSelectRect.Bottom) < 10) then
-          Exit; // zoom to much or double clicked
+        Exit; // zoom to much or double clicked
 
         StopThread;
         UpdateUndo;
@@ -4597,7 +4604,7 @@ begin
 
     Pen.Style   := psDot; //psDash;
 
-    if ssAlt in FShiftState then
+    if ssShift in FShiftState then
     begin
       dx := FClickRect.Right - FClickRect.Left;
       dy := FClickRect.Bottom - FClickRect.Top;
diff --git a/2.10/Source/Options.pas b/2.10/Source/Options.pas
index c972aea..cd5efa0 100644
--- a/2.10/Source/Options.pas
+++ b/2.10/Source/Options.pas
@@ -486,7 +486,7 @@ begin
 
   MainPreviewScale := 1 + 0.02 * StrToFloatDef(cbExtendPercent.Text, 0);
   if MainPreviewScale < 1 then MainPreviewScale := 1
-  else if MainPreviewScale > 3 then MainPreviewScale := 3;
+  else if MainPreviewScale > 5 then MainPreviewScale := 5;
   ExtendMainPreview := chkExtendMainPreview.Checked;
 
   ShowRenderStats := chkShowRenderStats.Checked;
diff --git a/2.10/Source/Tracer.pas b/2.10/Source/Tracer.pas
index 3259a24..bd4e871 100644
--- a/2.10/Source/Tracer.pas
+++ b/2.10/Source/Tracer.pas
@@ -70,6 +70,8 @@ procedure TTraceForm.FormCreate(Sender: TObject);
 var
   Registry: TRegistry;
 begin
+  TraceLevel := 0; // Tracer disabled in release version
+
   { Read position from registry }
   Registry := TRegistry.Create;
   try
@@ -85,8 +87,8 @@ begin
       if Registry.ValueExists('Height') then
         self.Height := Registry.ReadInteger('Height');
 
-      if Registry.ValueExists('TraceLevel') then
-        TraceLevel := Registry.ReadInteger('TraceLevel');
+//      if Registry.ValueExists('TraceLevel') then
+//        TraceLevel := Registry.ReadInteger('TraceLevel');
     end;
     Registry.CloseKey;
   finally