From dbc5dcb6dd524ef8d978c1fa36607eaf90713625 Mon Sep 17 00:00:00 2001
From: zueuk <zueuk>
Date: Mon, 12 Sep 2005 13:00:00 +0000
Subject: [PATCH] replaced several 'Apophysis 2.02j' strings with one
 'AppVersionString' constant

---
 2.10/Source/Main.dfm |  8 +++---
 2.10/Source/Main.pas | 64 ++++++--------------------------------------
 2 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/2.10/Source/Main.dfm b/2.10/Source/Main.dfm
index 86c6e20..397f1b6 100644
--- a/2.10/Source/Main.dfm
+++ b/2.10/Source/Main.dfm
@@ -27,7 +27,7 @@ object MainForm: TMainForm
     Left = 160
     Top = 28
     Width = 4
-    Height = 494
+    Height = 480
   end
   object ToolBar: TToolBar
     Left = 0
@@ -283,7 +283,7 @@ object MainForm: TMainForm
     Left = 0
     Top = 28
     Width = 160
-    Height = 494
+    Height = 480
     Align = alLeft
     Columns = <
       item
@@ -302,7 +302,7 @@ object MainForm: TMainForm
     Left = 164
     Top = 28
     Width = 433
-    Height = 494
+    Height = 480
     Align = alClient
     BevelInner = bvLowered
     BevelOuter = bvNone
@@ -326,7 +326,7 @@ object MainForm: TMainForm
   end
   object StatusBar: TStatusBar
     Left = 0
-    Top = 522
+    Top = 508
     Width = 597
     Height = 19
     Panels = <
diff --git a/2.10/Source/Main.pas b/2.10/Source/Main.pas
index b4f2ccf..45550d4 100644
--- a/2.10/Source/Main.pas
+++ b/2.10/Source/Main.pas
@@ -38,6 +38,8 @@ const
   RS_XO = 2;
   RS_VO = 3;
 
+  AppVersionString = 'Apophysis 2.02j';
+
 type
   TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
 
@@ -2100,7 +2102,7 @@ begin
     mnuListRename.Enabled := True;
     mnuItemDelete.Enabled := True;
     OpenFile := OpenDialog.FileName;
-    MainForm.Caption := 'Apophysis 2.02j' + ' - ' + OpenFile; // --Z--
+    MainForm.Caption := AppVersionString + ' - ' + OpenFile; // --Z--
     OpenFileType := ftXML;
     if UpperCase(ExtractFileExt(OpenDialog.FileName)) = '.IFS' then
     begin
@@ -2220,7 +2222,7 @@ begin
   RandomBatch;
   OpenFile := AppPath + 'apophysis.rand';
   OpenFileType := ftXML;
-  MainForm.Caption := 'Apophysis 2.02j' + ' - Random Batch';
+  MainForm.Caption := AppVersionString + ' - Random Batch';
   ListXML(OpenFile, 1);
   ListView.SetFocus;
   if batchsize = 1 then DrawFlame;
@@ -2642,7 +2644,7 @@ begin
     MainCp.Width := image.width;
     MainCp.Height := Image.Height;
     RandomBatch;
-    MainForm.Caption := 'Apophysis 2.02j' + ' - Random Batch';
+    MainForm.Caption := AppVersionString + ' - Random Batch';
     OpenFile := AppPath + 'apophysis.rand';
     ListXML(OpenFile, 1);
     OpenFileType := ftXML;
@@ -2662,7 +2664,7 @@ begin
       OpenFileType := ftXML;
       MainForm.ListView.Selected := MainForm.ListView.Items[0];
     end;
-    MainForm.Caption := 'Apophysis 2.02j' + ' - ' + defFlameFile;
+    MainForm.Caption := AppVersionString + ' - ' + defFlameFile;
   end;
   ListView.SetFocus;
   CanDrawOnResize := True;
@@ -2983,6 +2985,8 @@ begin
 //  if GradientForm.visible then GradientForm.UpdateGradient(maincp.cmap);
 
   if EditForm.visible then EditForm.UpdateDisplay;
+// hmm I think I still have some problems with EditForm updating
+// several times in a row with all these calls :-\
 
 //  if AdjustForm.visible then AdjustForm.UpdateDisplay;
   if MutateForm.visible then MutateForm.UpdateDisplay;
@@ -4551,58 +4555,6 @@ begin
     UpdateWindows;
   end
   else mnuResetLocationClick(Sender);
-{    msDragMove:
-      begin
-        FViewBMP.Free;
-        FViewBMP := nil;
-
-        FSelectRect.BottomRight := Point(x, y);
-        FMouseMoveState := msDrag;
-
-        if (x = 0) and (y = 0) then
-          Exit; // double clicked
-
-        StopThread;
-        UpdateUndo;
-        MainCp.MoveRect(FSelectRect);
-
-        RedrawTimer.Enabled := True;
-        UpdateWindows;
-      end;
-    msZoomWindowMove:
-      begin
-        DrawZoomWindow(FSelectRect);
-        FSelectRect.BottomRight := Point(x, y);
-        FMouseMoveState := msZoomWindow;
-        if (abs(FSelectRect.Left - FSelectRect.Right) < 10) or
-           (abs(FSelectRect.Top - FSelectRect.Bottom) < 10) then
-          Exit; // zoom to much or double clicked
-
-        StopThread;
-        UpdateUndo;
-        MainCp.ZoomtoRect(FSelectRect);
-
-        RedrawTimer.Enabled := True;
-        UpdateWindows;
-      end;
-    msZoomOutWindowMove:
-      begin
-        DrawZoomWindow(FSelectRect);
-        FSelectRect.BottomRight := Point(x, y);
-        FMouseMoveState := msZoomOutWindow;
-        if (abs(FSelectRect.Left - FSelectRect.Right) < 10) or
-           (abs(FSelectRect.Top - FSelectRect.Bottom) < 10) then
-          Exit; // zoom to much or double clicked
-
-        StopThread;
-        UpdateUndo;
-        MainCp.ZoomOuttoRect(FSelectRect);
-
-        RedrawTimer.Enabled := True;
-        UpdateWindows;
-      end;
-  end;
-}
 end;
 {$IFDEF DEBUG}
 ///////////////////////////////////////////////////////////////////////////////