+ XP Themes compatibility

+ Changed color choice controls to TJvColorButton from JVCL
2007-07-14 20:45:47 +00:00 · 2007-07-14 20:45:47 +00:00 · c6f11999b0
commit c6f11999b0
parent f87b9b3b8e
6 changed files with 116 additions and 153 deletions
--- a/2.10/Source/Adjust.dfm
+++ b/2.10/Source/Adjust.dfm
@ -176,7 +176,7 @@ object AdjustForm: TAdjustForm
    Top = 132
    Width = 388
    Height = 129
-    ActivePage = TabSheet3
+    ActivePage = TabSheet2
    Align = alBottom
    Images = MainForm.Buttons
    TabOrder = 1
@ -375,7 +375,7 @@ object AdjustForm: TAdjustForm
        Caption = ' Master Scale'
        ParentShowHint = False
        ShowHint = True
-        TabOrder = 9
+        TabOrder = 8
        OnDblClick = DragPanelDblClick
        OnMouseDown = DragPanelMouseDown
        OnMouseMove = DragPanelMouseMove
@ -392,7 +392,7 @@ object AdjustForm: TAdjustForm
        Caption = 'Gamma'
        ParentShowHint = False
        ShowHint = True
-        TabOrder = 10
+        TabOrder = 9
        OnDblClick = DragPanelDblClick
        OnMouseDown = DragPanelMouseDown
        OnMouseMove = DragPanelMouseMove
@ -468,25 +468,14 @@ object AdjustForm: TAdjustForm
        OnExit = txtVibrancyExit
        OnKeyPress = txtVibrancyKeyPress
      end
-      object ColorPanel: TPanel
-        Left = 72
-        Top = 78
-        Width = 65
-        Height = 21
-        Cursor = crHandPoint
-        BevelOuter = bvLowered
-        Color = clBlack
-        TabOrder = 6
-        OnClick = ColorPanelClick
-      end
      object chkTransparent: TCheckBox
-        Left = 144
-        Top = 80
+        Left = 138
+        Top = 79
        Width = 81
        Height = 17
        Caption = 'Transparent'
        Enabled = False
-        TabOrder = 7
+        TabOrder = 6
        Visible = False
      end
      object editPPU: TEdit
@ -494,7 +483,7 @@ object AdjustForm: TAdjustForm
        Top = 76
        Width = 75
        Height = 21
-        TabOrder = 8
+        TabOrder = 7
        OnExit = editPPUValidate
        OnKeyPress = editPPUKeyPress
      end
@ -509,7 +498,7 @@ object AdjustForm: TAdjustForm
        Caption = 'Brightness'
        ParentShowHint = False
        ShowHint = True
-        TabOrder = 11
+        TabOrder = 10
        OnDblClick = DragPanelDblClick
        OnMouseDown = DragPanelMouseDown
        OnMouseMove = DragPanelMouseMove
@ -526,12 +515,23 @@ object AdjustForm: TAdjustForm
        Caption = 'Vibrancy'
        ParentShowHint = False
        ShowHint = True
-        TabOrder = 12
+        TabOrder = 11
        OnDblClick = DragPanelDblClick
        OnMouseDown = DragPanelMouseDown
        OnMouseMove = DragPanelMouseMove
        OnMouseUp = DragPanelMouseUp
      end
+      object ColorButton: TJvColorButton
+        Left = 72
+        Top = 75
+        Width = 57
+        Height = 24
+        OtherCaption = '&Other...'
+        Options = [cdFullOpen, cdAnyColor]
+        OnChange = ColorButtonChange
+        TabOrder = 12
+        TabStop = False
+      end
    end
    object TabSheet3: TTabSheet
      Caption = 'Gradient'
@ -1057,11 +1057,6 @@ object AdjustForm: TAdjustForm
      OnClick = mnuInstantPreviewClick
    end
  end
-  object ColorDialog: TColorDialog
-    Options = [cdFullOpen]
-    Left = 232
-    Top = 16
-  end
  object GradientPopup: TPopupMenu
    Images = MainForm.Buttons
    Left = 200
--- a/2.10/Source/Adjust.pas
+++ b/2.10/Source/Adjust.pas
@ -23,7 +23,7 @@ interface
 uses
  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
  StdCtrls, ExtCtrls, ComCtrls, Buttons, Menus, AppEvnts,
-  ControlPoint, Cmap, Render;
+  ControlPoint, Cmap, Render, JvExControls, JvColorBox, JvColorButton;

 const
  WM_UPDATE_PARAMS = WM_APP + 5439;
@ -41,7 +41,6 @@ type
    mnuLowQuality: TMenuItem;
    mnuMediumQuality: TMenuItem;
    mnuHighQuality: TMenuItem;
-    ColorDialog: TColorDialog;
    PrevPnl: TPanel;
    PreviewImage: TImage;
    PageControl: TPageControl;
@ -60,7 +59,6 @@ type
    txtBrightness: TEdit;
    scrollVibrancy: TScrollBar;
    txtVibrancy: TEdit;
-    ColorPanel: TPanel;
    TabSheet3: TTabSheet;
    scrollAngle: TScrollBar;
    txtAngle: TEdit;
@ -135,6 +133,7 @@ type
    pnlVibrancy: TPanel;
    chkResizeMain: TCheckBox;
    Bevel3: TBevel;
+    ColorButton: TJvColorButton;
    procedure FormCreate(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure FormDestroy(Sender: TObject);
@ -176,7 +175,6 @@ type
    procedure scrollZoomChange(Sender: TObject);
    procedure scrollCenterXChange(Sender: TObject);
    procedure scrollCenterYChange(Sender: TObject);
-    procedure ColorPanelClick(Sender: TObject);
    procedure scrollContrastScroll(Sender: TObject;
      ScrollCode: TScrollCode; var ScrollPos: Integer);
    procedure txtGammaEnter(Sender: TObject);
@ -256,6 +254,7 @@ type
      Shift: TShiftState; X, Y: Integer);
    procedure DragPanelDblClick(Sender: TObject);
    procedure FormActivate(Sender: TObject);
+    procedure ColorButtonChange(Sender: TObject);

  private
    Resetting: boolean;
@ -375,7 +374,7 @@ begin
      scrollCenterY.Position := 0;
    end;

-    ColorPanel.color := cp.background[2] shl 16 + cp.background[1] shl 8 + cp.background[0];
+    ColorButton.Color := cp.background[2] shl 16 + cp.background[1] shl 8 + cp.background[0];
    //cbColor.text := IntToHex(integer(ColorPanel.Color), 6);

    GetMainWindowSize;
@ -921,22 +920,16 @@ begin
  DrawPreview;
 end;

-procedure TAdjustForm.ColorPanelClick(Sender: TObject);
+procedure TAdjustForm.ColorButtonChange(Sender: TObject);
 var
  col: Longint;
 begin
-  ColorDialog.Color := COlorPanel.Color;
-  if ColorDialog.Execute then
-  begin
-    ColorPanel.Color := ColorDialog.Color;
-    //cbColor.text := IntToHex(integer(ColorDialog.Color), 6);
-    col := ColorToRGB(ColorDialog.Color);
-    cp.background[0] := col and 255;
-    cp.background[1] := col shr 8 and 255;
-    cp.background[2] := col shr 16 and 255;
-    DrawPreview;
-    UpdateFlame(true);
-  end;
+  col := ColorToRGB(ColorButton.Color);
+  cp.background[0] := col and 255;
+  cp.background[1] := col shr 8 and 255;
+  cp.background[2] := col shr 16 and 255;
+  DrawPreview;
+  UpdateFlame(true);
 end;

 procedure TAdjustForm.scrollContrastScroll(Sender: TObject;
--- a/2.10/Source/Main.dfm
+++ b/2.10/Source/Main.dfm
@ -2021,4 +2021,8 @@ object MainForm: TMainForm
    Left = 72
    Top = 120
  end
+  object XPManifest1: TXPManifest
+    Left = 104
+    Top = 120
+  end
 end
--- 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;
+  LibXmlParser, LibXmlComps, PngImage, XPMan;

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

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

 type
  TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove,
@ -184,6 +184,7 @@ type
    tbShowTrace: TToolButton;
    ToolButton2: TToolButton;
    mnuRenderAll: TMenuItem;
+    XPManifest1: TXPManifest;
    procedure tbzoomoutwindowClick(Sender: TObject);
    procedure mnuimageClick(Sender: TObject);
    procedure mnuExitClick(Sender: TObject);
--- 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 = GeneralPage
+    ActivePage = EditorPage
    TabOrder = 0
    TabStop = False
    object GeneralPage: TTabSheet
@ -306,24 +306,13 @@ 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 = 4
+          TabOrder = 0
        end
        object chkHelpers: TCheckBox
          Left = 8
@ -333,51 +322,7 @@ 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
@ -387,9 +332,49 @@ object OptionsForm: TOptionsForm
          Caption = 'Always show both type of transforms'
          Checked = True
          State = cbChecked
-          TabOrder = 7
+          TabOrder = 2
          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
@ -443,6 +428,16 @@ 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;
+  MMSystem, JvExControls, JvColorBox, JvColorButton;

 type
  TOptionsForm = class(TForm)
@ -189,13 +189,8 @@ 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;
@ -221,6 +216,11 @@ 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);

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

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

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

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

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

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

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

 procedure TOptionsForm.btnBrowseSoundClick(Sender: TObject);