JVCL components removed, XP look turned off (hmm)

2007-10-28 13:16:27 +00:00 · 2007-10-28 13:16:27 +00:00 · 9c2b72b4b9
commit 9c2b72b4b9
parent c6f11999b0
4 changed files with 2106 additions and 992 deletions
--- a/2.10/Source/Main.dfm
+++ b/2.10/Source/Main.dfm
--- a/2.10/Source/Main.pas
+++ b/2.10/Source/Main.pas
@ -33,7 +33,7 @@ uses
  ExtDlgs, AppEvnts, ShellAPI, Registry,
  Global, Xform, XFormMan, ControlPoint, CMap,
  RenderThread, RenderTypes,
-  LibXmlParser, LibXmlComps, PngImage, XPMan;
+  LibXmlParser, LibXmlComps, PngImage;

 const
  PixelCountMax = 32768;
@ -42,7 +42,7 @@ const
  RS_XO = 2;
  RS_VO = 3;

-  AppVersionString = 'Apophysis 2.06d beta';
+  AppVersionString = 'Apophysis 2.07 beta';

 type
  TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove,
@ -184,7 +184,6 @@ type
    tbShowTrace: TToolButton;
    ToolButton2: TToolButton;
    mnuRenderAll: TMenuItem;
-    XPManifest1: TXPManifest;
    procedure tbzoomoutwindowClick(Sender: TObject);
    procedure mnuimageClick(Sender: TObject);
    procedure mnuExitClick(Sender: TObject);
@ -2483,6 +2482,7 @@ begin
  Screen.Cursors[crEditRotate] := LoadCursor(HInstance, 'ROTATE_WB');
  Screen.Cursors[crEditScale]  := LoadCursor(HInstance, 'SCALE_WB');

+(*
 {$IFDEF DEBUG}
  // Enable raw mode (default mode uses stack frames which aren't always generated by the compiler)
  Include(JclStackTrackingOptions, stRawMode);
@ -2493,12 +2493,12 @@ begin
  JclStartExceptionTracking;
  Application.OnException := AppException;
 {$ENDIF}
+*)

-  FMouseMoveState := msDrag; // --Z-- was: msZoomWindow;
+  FMouseMoveState := msDrag;
  LimitVibrancy := True;
  Favorites := TStringList.Create;
  GetScripts;
-//  Compatibility := 1; // for Drave's compatibility
  Randomize;
  MainSeed := Random(1234567890);
  maincp := TControlPoint.Create;
--- a/2.10/Source/Options.dfm
+++ b/2.10/Source/Options.dfm
@ -44,7 +44,7 @@ object OptionsForm: TOptionsForm
    Top = 8
    Width = 451
    Height = 265
-    ActivePage = EditorPage
+    ActivePage = GeneralPage
    TabOrder = 0
    TabStop = False
    object GeneralPage: TTabSheet
@ -306,13 +306,24 @@ object OptionsForm: TOptionsForm
          Height = 13
          Caption = 'Helpers'
        end
+        object pnlBackColor: TPanel
+          Left = 8
+          Top = 104
+          Width = 62
+          Height = 17
+          Cursor = crHandPoint
+          BevelOuter = bvLowered
+          Color = clBlack
+          TabOrder = 0
+          OnClick = pnlBackColorClick
+        end
        object chkUseXFormColor: TCheckBox
          Left = 8
          Top = 16
          Width = 129
          Height = 17
          Caption = 'Use transform color'
-          TabOrder = 0
+          TabOrder = 4
        end
        object chkHelpers: TCheckBox
          Left = 8
@ -322,7 +333,51 @@ object OptionsForm: TOptionsForm
          Caption = 'Helper lines'
          Checked = True
          State = cbChecked
+          TabOrder = 6
+        end
+        object pnlReference: TPanel
+          Left = 8
+          Top = 144
+          Width = 62
+          Height = 17
+          Cursor = crHandPoint
+          BevelOuter = bvLowered
+          Color = clGray
          TabOrder = 1
+          OnClick = pnlReferenceClick
+        end
+        object pnlGridColor1: TPanel
+          Left = 75
+          Top = 104
+          Width = 29
+          Height = 17
+          Cursor = crHandPoint
+          BevelOuter = bvLowered
+          Color = clBlack
+          TabOrder = 2
+          OnClick = pnlGridColor1Click
+        end
+        object pnlGridColor2: TPanel
+          Left = 108
+          Top = 104
+          Width = 29
+          Height = 17
+          Cursor = crHandPoint
+          BevelOuter = bvLowered
+          Color = clBlack
+          TabOrder = 3
+          OnClick = pnlGridColor2Click
+        end
+        object pnlHelpersColor: TPanel
+          Left = 75
+          Top = 144
+          Width = 62
+          Height = 17
+          Cursor = crHandPoint
+          BevelOuter = bvLowered
+          Color = clGray
+          TabOrder = 5
+          OnClick = pnlHelpersColorClick
        end
        object chkShowAllXforms: TCheckBox
          Left = 8
@ -332,49 +387,9 @@ object OptionsForm: TOptionsForm
          Caption = 'Always show both type of transforms'
          Checked = True
          State = cbChecked
-          TabOrder = 2
+          TabOrder = 7
          WordWrap = True
        end
-        object cbtnReference: TJvColorButton
-          Left = 8
-          Top = 141
-          Width = 63
-          OtherCaption = '&Other...'
-          Options = [cdFullOpen]
-          OnChange = cbtnReferenceChange
-          TabOrder = 3
-          TabStop = False
-        end
-        object cbtnGrid1: TJvColorButton
-          Left = 73
-          Top = 102
-          Width = 34
-          OtherCaption = '&Other...'
-          Options = [cdFullOpen]
-          OnChange = cbtnGrid1Change
-          TabOrder = 4
-          TabStop = False
-        end
-        object cbtnGrid2: TJvColorButton
-          Left = 108
-          Top = 102
-          Width = 34
-          OtherCaption = '&Other...'
-          Options = [cdFullOpen]
-          OnChange = cbtnGrid2Change
-          TabOrder = 5
-          TabStop = False
-        end
-        object cbtnHelpers: TJvColorButton
-          Left = 73
-          Top = 142
-          Width = 69
-          OtherCaption = '&Other...'
-          Options = [cdFullOpen]
-          OnChange = cbtnHelpersChange
-          TabOrder = 6
-          TabStop = False
-        end
      end
      object rgReferenceMode: TRadioGroup
        Left = 160
@ -428,16 +443,6 @@ object OptionsForm: TOptionsForm
          'Reset value to zero, if zero set to "1"')
        TabOrder = 3
      end
-      object cbtnBackColor: TJvColorButton
-        Left = 16
-        Top = 106
-        Width = 63
-        OtherCaption = '&Other...'
-        Options = [cdFullOpen]
-        OnChange = cbtnBackColorChange
-        TabOrder = 4
-        TabStop = False
-      end
    end
    object DisplayPage: TTabSheet
      Caption = 'Display'
--- a/2.10/Source/Options.pas
+++ b/2.10/Source/Options.pas
@ -24,7 +24,7 @@ interface
 uses
  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
  StdCtrls, ComCtrls, ExtCtrls, Buttons, Registry, Mask, CheckLst,
-  MMSystem, JvExControls, JvColorBox, JvColorButton;
+  MMSystem;

 type
  TOptionsForm = class(TForm)
@ -189,8 +189,13 @@ type
    Label41: TLabel;
    Label42: TLabel;
    Label43: TLabel;
+    pnlBackColor: TPanel;
    chkUseXFormColor: TCheckBox;
    chkHelpers: TCheckBox;
+    pnlReference: TPanel;
+    pnlGridColor1: TPanel;
+    pnlGridColor2: TPanel;
+    pnlHelpersColor: TPanel;
    rgReferenceMode: TRadioGroup;
    chkPlaysound: TCheckBox;
    btnPlay: TSpeedButton;
@ -216,11 +221,6 @@ type
    btnGradientsFile: TSpeedButton;
    chkConfirmExit: TCheckBox;
    chkConfirmStopRender: TCheckBox;
-    cbtnBackColor: TJvColorButton;
-    cbtnReference: TJvColorButton;
-    cbtnGrid1: TJvColorButton;
-    cbtnGrid2: TJvColorButton;
-    cbtnHelpers: TJvColorButton;
    procedure btnCancelClick(Sender: TObject);
    procedure FormShow(Sender: TObject);
    procedure btnOKClick(Sender: TObject);
@ -245,14 +245,14 @@ type
    procedure btnRendererClick(Sender: TObject);
    procedure SpeedButton2Click(Sender: TObject);
    procedure FormCreate(Sender: TObject);
+    procedure pnlBackColorClick(Sender: TObject);
+    procedure pnlReferenceClick(Sender: TObject);
+    procedure pnlGridColor1Click(Sender: TObject);
+    procedure pnlGridColor2Click(Sender: TObject);
+    procedure pnlHelpersColorClick(Sender: TObject);
    procedure btnBrowseSoundClick(Sender: TObject);
    procedure btnPlayClick(Sender: TObject);
    procedure btnGradientsFileClick(Sender: TObject);
-    procedure cbtnBackColorChange(Sender: TObject);
-    procedure cbtnReferenceChange(Sender: TObject);
-    procedure cbtnGrid1Change(Sender: TObject);
-    procedure cbtnGrid2Change(Sender: TObject);
-    procedure cbtnHelpersChange(Sender: TObject);

  private
    { Private declarations }
@ -347,10 +347,10 @@ begin
  txtMediumQuality.Text := FloatToStr(prevMediumQuality);
  txtHighQuality.Text := FloatToStr(prevHighQuality);

-  cbtnBackColor.Color := TColor(EditorBkgColor);
-  cbtnGrid1.Color := GridColor1;
-  cbtnGrid2.Color := GridColor2;
-  cbtnReference.Color := TColor(ReferenceTriangleColor);
+  pnlBackColor.Color := TColor(EditorBkgColor);
+  pnlGridColor1.Color := GridColor1;
+  pnlGridColor2.Color := GridColor2;
+  pnlReference.color := TColor(ReferenceTriangleColor);

  rgTransparency.ItemIndex :=  PNGTransparency;
  chkShowTransparency.Checked := ShowTransparency;
@ -730,29 +730,54 @@ begin
  end;
 end;

-procedure TOptionsForm.cbtnBackColorChange(Sender: TObject);
+procedure TOptionsForm.pnlBackColorClick(Sender: TObject);
 begin
-  EditorBkgColor := Integer(cbtnBackColor.Color);
+  AdjustForm.ColorDialog.Color := pnlBackColor.Color;
+  if AdjustForm.ColorDialog.Execute then
+  begin
+    pnlBackColor.Color := AdjustForm.ColorDialog.Color;
+    EditorBkgColor := Integer(pnlBackColor.color);
+  end;
 end;

-procedure TOptionsForm.cbtnReferenceChange(Sender: TObject);
+procedure TOptionsForm.pnlReferenceClick(Sender: TObject);
 begin
-  ReferenceTriangleColor := Integer(cbtnReference.Color);
+  AdjustForm.ColorDialog.Color := pnlReference.Color;
+  if AdjustForm.ColorDialog.Execute then
+  begin
+    pnlReference.Color := AdjustForm.ColorDialog.Color;
+    ReferenceTriangleColor := Integer(pnlReference.color);
+  end;
 end;

-procedure TOptionsForm.cbtnGrid1Change(Sender: TObject);
+procedure TOptionsForm.pnlGridColor1Click(Sender: TObject);
 begin
-  GridColor1 := Integer(cbtnGrid1.Color);
+  AdjustForm.ColorDialog.Color := pnlGridColor1.Color;
+  if AdjustForm.ColorDialog.Execute then
+  begin
+    pnlGridColor1.Color := AdjustForm.ColorDialog.Color;
+    GridColor1 := Integer(pnlGridColor1.color);
+  end;
 end;

-procedure TOptionsForm.cbtnGrid2Change(Sender: TObject);
+procedure TOptionsForm.pnlGridColor2Click(Sender: TObject);
 begin
-  GridColor2 := Integer(cbtnGrid2.Color);
+  AdjustForm.ColorDialog.Color := pnlGridColor2.Color;
+  if AdjustForm.ColorDialog.Execute then
+  begin
+    pnlGridColor2.Color := AdjustForm.ColorDialog.Color;
+    GridColor2 := Integer(pnlGridColor2.color);
+  end;
 end;

-procedure TOptionsForm.cbtnHelpersChange(Sender: TObject);
+procedure TOptionsForm.pnlHelpersColorClick(Sender: TObject);
 begin
-  HelpersColor := Integer(cbtnHelpers.Color);
+  AdjustForm.ColorDialog.Color := pnlHelpersColor.Color;
+  if AdjustForm.ColorDialog.Execute then
+  begin
+    pnlHelpersColor.Color := AdjustForm.ColorDialog.Color;
+    HelpersColor := Integer(pnlHelpersColor.color);
+  end;
 end;

 procedure TOptionsForm.btnBrowseSoundClick(Sender: TObject);