added an option to change rotaion-box behaviour in main window
This commit is contained in:
parent
4697a1d594
commit
be57c8d9a4
@ -113,6 +113,7 @@ var
|
||||
{ For random gradients }
|
||||
MinNodes, MaxNodes, MinHue, MaxHue, MinSat, MaxSat, MinLum, MaxLum: integer;
|
||||
ReferenceMode: integer;//FixedReference: boolean;
|
||||
MainForm_RotationMode: integer;
|
||||
BatchSize: Integer;
|
||||
Compatibility: integer; //0 = original, 1 = Drave's
|
||||
Favorites: TStringList;
|
||||
|
@ -77,9 +77,6 @@ type
|
||||
mnuListRename: TMenuItem;
|
||||
DisplayPopup: TPopupMenu;
|
||||
mnuPopCopyUPR: TMenuItem;
|
||||
mnuHiddenGraph: TMenuItem;
|
||||
mnuAutoZoom: TMenuItem;
|
||||
mnuDelete: TMenuItem;
|
||||
RedrawTimer: TTimer;
|
||||
mnuVar: TMenuItem;
|
||||
mnuVRandom: TMenuItem;
|
||||
@ -124,7 +121,6 @@ type
|
||||
mnuResetLocation: TMenuItem;
|
||||
N4: TMenuItem;
|
||||
N14: TMenuItem;
|
||||
mnuRefresh: TMenuItem;
|
||||
mnuSaveUndo: TMenuItem;
|
||||
N2: TMenuItem;
|
||||
ToolButton1: TToolButton;
|
||||
@ -154,7 +150,6 @@ type
|
||||
N9: TMenuItem;
|
||||
N10: TMenuItem;
|
||||
mnuManageFavorites: TMenuItem;
|
||||
mnuShowFull: TMenuItem;
|
||||
mnuImageSize: TMenuItem;
|
||||
N13: TMenuItem;
|
||||
ApplicationEvents: TApplicationEvents;
|
||||
@ -207,7 +202,6 @@ type
|
||||
procedure BackPanelResize(Sender: TObject);
|
||||
procedure mnuNextClick(Sender: TObject);
|
||||
procedure mnuPreviousClick(Sender: TObject);
|
||||
procedure mnuAutoZoomClick(Sender: TObject);
|
||||
procedure RedrawTimerTimer(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure MainFileClick(Sender: TObject);
|
||||
@ -2326,12 +2320,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
procedure TMainForm.mnuAutoZoomClick(Sender: TObject);
|
||||
begin
|
||||
EditForm.AutoZoom; // redraw included
|
||||
end;
|
||||
|
||||
function GradTitle(str: string): string;
|
||||
var
|
||||
p: integer;
|
||||
@ -4274,7 +4262,8 @@ begin
|
||||
|
||||
StopThread;
|
||||
UpdateUndo;
|
||||
MainCp.Rotate(-FRotateAngle); // "-" by Zueuk
|
||||
if MainForm_RotationMode = 0 then MainCp.Rotate(FRotateAngle)
|
||||
else MainCp.Rotate(-FRotateAngle);
|
||||
|
||||
RedrawTimer.Enabled := True;
|
||||
UpdateWindows;
|
||||
|
@ -52,23 +52,23 @@ object OptionsForm: TOptionsForm
|
||||
Caption = 'General'
|
||||
object chkConfirmDel: TCheckBox
|
||||
Left = 144
|
||||
Top = 139
|
||||
Top = 135
|
||||
Width = 97
|
||||
Height = 17
|
||||
HelpContext = 1005
|
||||
Caption = 'Confirm delete'
|
||||
TabOrder = 5
|
||||
TabOrder = 4
|
||||
end
|
||||
object JPEG: TGroupBox
|
||||
Left = 8
|
||||
Top = 72
|
||||
Top = 132
|
||||
Width = 121
|
||||
Height = 57
|
||||
Height = 53
|
||||
Caption = 'JPEG Quality'
|
||||
TabOrder = 1
|
||||
TabOrder = 0
|
||||
object txtJPEGquality: TComboBox
|
||||
Left = 16
|
||||
Top = 24
|
||||
Top = 20
|
||||
Width = 89
|
||||
Height = 21
|
||||
ItemHeight = 13
|
||||
@ -82,50 +82,21 @@ object OptionsForm: TOptionsForm
|
||||
'120')
|
||||
end
|
||||
end
|
||||
object GroupBox1: TGroupBox
|
||||
Left = 8
|
||||
Top = 4
|
||||
Width = 121
|
||||
Height = 57
|
||||
Caption = 'Batch size'
|
||||
TabOrder = 0
|
||||
object txtBatchSize: TEdit
|
||||
Left = 16
|
||||
Top = 24
|
||||
Width = 73
|
||||
Height = 21
|
||||
HelpContext = 1004
|
||||
TabOrder = 0
|
||||
Text = '100'
|
||||
end
|
||||
object udBatchSize: TUpDown
|
||||
Left = 89
|
||||
Top = 24
|
||||
Width = 13
|
||||
Height = 21
|
||||
Associate = txtBatchSize
|
||||
Min = 1
|
||||
Max = 300
|
||||
Position = 100
|
||||
TabOrder = 1
|
||||
Thousands = False
|
||||
end
|
||||
end
|
||||
object chkResize: TCheckBox
|
||||
Left = 144
|
||||
Top = 157
|
||||
Top = 153
|
||||
Width = 169
|
||||
Height = 17
|
||||
Caption = 'Resize on load'
|
||||
TabOrder = 6
|
||||
TabOrder = 5
|
||||
end
|
||||
object GroupBox16: TGroupBox
|
||||
Left = 8
|
||||
Top = 134
|
||||
Top = 4
|
||||
Width = 121
|
||||
Height = 59
|
||||
Caption = 'Nr processors'
|
||||
TabOrder = 2
|
||||
Height = 69
|
||||
Caption = 'Multithreading'
|
||||
TabOrder = 1
|
||||
object cbNrTheads: TComboBox
|
||||
Left = 16
|
||||
Top = 24
|
||||
@ -144,11 +115,11 @@ object OptionsForm: TOptionsForm
|
||||
end
|
||||
object chkShowTransparency: TCheckBox
|
||||
Left = 144
|
||||
Top = 175
|
||||
Top = 171
|
||||
Width = 169
|
||||
Height = 17
|
||||
Caption = 'Show Transparency'
|
||||
TabOrder = 7
|
||||
TabOrder = 6
|
||||
end
|
||||
object rgReferenceMode: TRadioGroup
|
||||
Left = 280
|
||||
@ -161,7 +132,7 @@ object OptionsForm: TOptionsForm
|
||||
'Normal'
|
||||
'Proportional'
|
||||
'Wandering (old-style)')
|
||||
TabOrder = 4
|
||||
TabOrder = 3
|
||||
end
|
||||
object rgTransparency: TRadioGroup
|
||||
Left = 136
|
||||
@ -173,7 +144,18 @@ object OptionsForm: TOptionsForm
|
||||
'No transparency'
|
||||
'Flam3-style'
|
||||
'Flamesong-style')
|
||||
TabOrder = 3
|
||||
TabOrder = 2
|
||||
end
|
||||
object rgRotationMode: TRadioGroup
|
||||
Left = 8
|
||||
Top = 76
|
||||
Width = 121
|
||||
Height = 53
|
||||
Caption = 'Rotation Mode'
|
||||
Items.Strings = (
|
||||
'Rotate image'
|
||||
'Rotate frame')
|
||||
TabOrder = 7
|
||||
end
|
||||
end
|
||||
object DisplayPage: TTabSheet
|
||||
@ -398,7 +380,7 @@ object OptionsForm: TOptionsForm
|
||||
end
|
||||
object chkKeepBackground: TCheckBox
|
||||
Left = 208
|
||||
Top = 90
|
||||
Top = 170
|
||||
Width = 161
|
||||
Height = 17
|
||||
HelpContext = 1023
|
||||
@ -406,21 +388,56 @@ object OptionsForm: TOptionsForm
|
||||
TabOrder = 4
|
||||
end
|
||||
object gpFlameTitlePrefix: TGroupBox
|
||||
Left = 8
|
||||
Top = 86
|
||||
Left = 208
|
||||
Top = 88
|
||||
Width = 193
|
||||
Height = 43
|
||||
Caption = 'Flame title prefix'
|
||||
Height = 97
|
||||
Caption = 'Random batch'
|
||||
TabOrder = 1
|
||||
object txtRandomPrefix: TEdit
|
||||
object Label38: TLabel
|
||||
Left = 8
|
||||
Top = 16
|
||||
Width = 169
|
||||
Top = 20
|
||||
Width = 48
|
||||
Height = 13
|
||||
Caption = 'Batch size'
|
||||
end
|
||||
object Label39: TLabel
|
||||
Left = 8
|
||||
Top = 52
|
||||
Width = 51
|
||||
Height = 13
|
||||
Caption = 'Title prefix'
|
||||
end
|
||||
object txtRandomPrefix: TEdit
|
||||
Left = 72
|
||||
Top = 50
|
||||
Width = 110
|
||||
Height = 21
|
||||
HelpContext = 1021
|
||||
TabOrder = 0
|
||||
Text = 'Apophysis'
|
||||
end
|
||||
object txtBatchSize: TEdit
|
||||
Left = 112
|
||||
Top = 16
|
||||
Width = 57
|
||||
Height = 21
|
||||
HelpContext = 1004
|
||||
TabOrder = 1
|
||||
Text = '100'
|
||||
end
|
||||
object udBatchSize: TUpDown
|
||||
Left = 169
|
||||
Top = 16
|
||||
Width = 13
|
||||
Height = 21
|
||||
Associate = txtBatchSize
|
||||
Min = 1
|
||||
Max = 300
|
||||
Position = 100
|
||||
TabOrder = 2
|
||||
Thousands = False
|
||||
end
|
||||
end
|
||||
object gpMutationTransforms: TGroupBox
|
||||
Left = 208
|
||||
@ -488,7 +505,7 @@ object OptionsForm: TOptionsForm
|
||||
end
|
||||
object gpForcedSymmetry: TGroupBox
|
||||
Left = 8
|
||||
Top = 136
|
||||
Top = 88
|
||||
Width = 193
|
||||
Height = 97
|
||||
Caption = 'Forced symmetry'
|
||||
|
@ -116,9 +116,6 @@ type
|
||||
udMinMutate: TUpDown;
|
||||
udMaxMutate: TUpDown;
|
||||
udSymOrder: TUpDown;
|
||||
GroupBox1: TGroupBox;
|
||||
txtBatchSize: TEdit;
|
||||
udBatchSize: TUpDown;
|
||||
GroupBox9: TGroupBox;
|
||||
Label20: TLabel;
|
||||
Label21: TLabel;
|
||||
@ -181,6 +178,11 @@ type
|
||||
Label24: TLabel;
|
||||
txtSymNVars: TEdit;
|
||||
udSymNVars: TUpDown;
|
||||
rgRotationMode: TRadioGroup;
|
||||
txtBatchSize: TEdit;
|
||||
udBatchSize: TUpDown;
|
||||
Label38: TLabel;
|
||||
Label39: TLabel;
|
||||
procedure btnCancelClick(Sender: TObject);
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure btnOKClick(Sender: TObject);
|
||||
@ -231,7 +233,7 @@ var
|
||||
Registry: TRegistry;
|
||||
i: integer;
|
||||
begin
|
||||
{ Read posution from registry }
|
||||
{ Read position from registry }
|
||||
Registry := TRegistry.Create;
|
||||
try
|
||||
Registry.RootKey := HKEY_CURRENT_USER;
|
||||
@ -254,7 +256,8 @@ begin
|
||||
txtTryLength.text := IntToStr(Trylength);
|
||||
chkConfirmDel.Checked := ConfirmDelete;
|
||||
txtJPEGQuality.text := IntToStr(JPEGQuality);
|
||||
rgReferenceMode.IteMindex := ReferenceMode;
|
||||
rgReferenceMode.ItemIndex := ReferenceMode;
|
||||
rgRotationMode.ItemIndex := MainForm_RotationMode;
|
||||
udBatchSize.Position := BatchSize;
|
||||
chkResize.checked := ResizeOnLoad;
|
||||
rgTransparency.ItemIndex := PNGTransparency;
|
||||
@ -369,6 +372,7 @@ begin
|
||||
NrTreads := StrToIntDef(cbNrTheads.text, 0);
|
||||
ConfirmDelete := chkConfirmDel.Checked;
|
||||
ReferenceMode := rgReferenceMode.ItemIndex;
|
||||
MainForm_RotationMode := rgRotationMode.ItemIndex;
|
||||
ResizeOnLoad := chkResize.checked;
|
||||
{ Display tab }
|
||||
defSampleDensity := StrToFloat(txtSampleDensity.Text);
|
||||
|
@ -351,6 +351,10 @@ begin
|
||||
if Registry.ValueExists('ReferenceMode') then
|
||||
ReferenceMode := Registry.ReadInteger('ReferenceMode')
|
||||
else ReferenceMode := 0;
|
||||
if Registry.ValueExists('RotationMode') then
|
||||
MainForm_RotationMode := Registry.ReadInteger('RotationMode')
|
||||
else MainForm_RotationMode := 0;
|
||||
|
||||
if Registry.ValueExists('MaxLum') then
|
||||
begin
|
||||
MaxLum := Registry.ReadInteger('MaxLum');
|
||||
@ -517,6 +521,7 @@ begin
|
||||
else
|
||||
begin
|
||||
ReferenceMode := 0;
|
||||
MainForm_RotationMode := 0;
|
||||
EditPrevQual := 1;
|
||||
MutatePrevQual := 1;
|
||||
AdjustPrevQual := 1;
|
||||
@ -884,6 +889,7 @@ begin
|
||||
Registry.WriteInteger('SymmetryNVars', SymmetryNVars);
|
||||
Registry.WriteInteger('VariationOptions', VariationOptions);
|
||||
Registry.WriteInteger('ReferenceMode', ReferenceMode);
|
||||
Registry.WriteInteger('RotationMode', MainForm_RotationMode);
|
||||
Registry.WriteInteger('MinNodes', MinNodes);
|
||||
Registry.WriteInteger('MinHue', MinHue);
|
||||
Registry.WriteInteger('MinSat', MinSat);
|
||||
|
Loading…
Reference in New Issue
Block a user