Commit 8633e65

Nick committed on
Two small suggestions from kabcorp
commit 8633e657a03ae871b8c3f6d06070d232be11808b parent bd5e772
8 changed files +67−34
Modifiedeffecteditor.lfm +6−5
@@ -1,7 +1,7 @@
1 object frmEffectEditor: TfrmEffectEditor 1 object frmEffectEditor: TfrmEffectEditor
2 Left = 1941 2 Left = 1357
3 Height = 238 3 Height = 238
4 Top = 453 4 Top = 431
5 Width = 391 5 Width = 391
6 BorderIcons = [biSystemMenu, biMinimize] 6 BorderIcons = [biSystemMenu, biMinimize]
7 BorderStyle = bsDialog 7 BorderStyle = bsDialog
@@ -9,12 +9,13 @@ object frmEffectEditor: TfrmEffectEditor
9 ClientHeight = 238 9 ClientHeight = 238
10 ClientWidth = 391 10 ClientWidth = 391
11 FormStyle = fsStayOnTop 11 FormStyle = fsStayOnTop
12 OnClose = FormClose 12 KeyPreview = True
13 OnCloseQuery = FormCloseQuery 13 OnCloseQuery = FormCloseQuery
14 OnKeyDown = FormKeyDown
14 OnShow = FormCreate 15 OnShow = FormCreate
15 Position = poMainFormCenter 16 Position = poMainFormCenter
16 ShowInTaskBar = stNever 17 ShowInTaskBar = stNever
17 LCLVersion = '2.0.6.0' 18 LCLVersion = '2.0.11.0'
18 object ComboBox1: TComboBox 19 object ComboBox1: TComboBox
19 Left = 78 20 Left = 78
20 Height = 23 21 Height = 23
@@ -61,7 +62,7 @@ object frmEffectEditor: TfrmEffectEditor
61 Height = 183 62 Height = 183
62 Top = 46 63 Top = 46
63 Width = 367 64 Width = 367
64 PageIndex = 2 65 PageIndex = 0
65 TabOrder = 1 66 TabOrder = 1
66 object OneParamPage: TPage 67 object OneParamPage: TPage
67 object OneParamTrackBar: TTrackBar 68 object OneParamTrackBar: TTrackBar
Modifiedeffecteditor.pas +9−13
@@ -6,7 +6,7 @@ interface
6 6
7 uses 7 uses
8 Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, 8 Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,
9 ComCtrls, hugeDatatypes, utils; 9 ComCtrls, hugeDatatypes, utils, LCLType;
10 10
11 type 11 type
12 12
@@ -52,13 +52,12 @@ type
52 Value2: TLabel; 52 Value2: TLabel;
53 VibratoPage: TPage; 53 VibratoPage: TPage;
54 TwoParamsPage: TPage; 54 TwoParamsPage: TPage;
55 procedure Button1Click(Sender: TObject);
56 procedure CheckBox1Change(Sender: TObject); 55 procedure CheckBox1Change(Sender: TObject);
57 procedure ComboBox1Change(Sender: TObject); 56 procedure ComboBox1Change(Sender: TObject);
58 procedure DutyRadioGroupSelectionChanged(Sender: TObject); 57 procedure DutyRadioGroupSelectionChanged(Sender: TObject);
59 procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
60 procedure FormCloseQuery(Sender: TObject; var CanClose: boolean); 58 procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
61 procedure FormCreate(Sender: TObject); 59 procedure FormCreate(Sender: TObject);
60 procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
62 procedure OneParamTrackBarChange(Sender: TObject); 61 procedure OneParamTrackBarChange(Sender: TObject);
63 procedure RightVolumeTrackBarChange(Sender: TObject); 62 procedure RightVolumeTrackBarChange(Sender: TObject);
64 procedure TwoParamsTrackBar1Change(Sender: TObject); 63 procedure TwoParamsTrackBar1Change(Sender: TObject);
@@ -122,11 +121,6 @@ begin
122 LoadEffect; 121 LoadEffect;
123 end; 122 end;
124 123
125 procedure TfrmEffectEditor.Button1Click(Sender: TObject);
126 begin
127 Close;
128 end;
129
130 procedure TfrmEffectEditor.CheckBox1Change(Sender: TObject); 124 procedure TfrmEffectEditor.CheckBox1Change(Sender: TObject);
131 var 125 var
132 Val: Integer; 126 Val: Integer;
@@ -156,11 +150,6 @@ begin
156 end; 150 end;
157 end; 151 end;
158 152
159 procedure TfrmEffectEditor.FormClose(Sender: TObject;
160 var CloseAction: TCloseAction);
161 begin
162 end;
163
164 procedure TfrmEffectEditor.FormCloseQuery(Sender: TObject; var CanClose: boolean 153 procedure TfrmEffectEditor.FormCloseQuery(Sender: TObject; var CanClose: boolean
165 ); 154 );
166 begin 155 begin
@@ -176,6 +165,13 @@ begin
176 end; 165 end;
177 end; 166 end;
178 167
168 procedure TfrmEffectEditor.FormKeyDown(Sender: TObject; var Key: Word;
169 Shift: TShiftState);
170 begin
171 if Key = VK_ESCAPE then
172 Close;
173 end;
174
179 procedure TfrmEffectEditor.OneParamTrackBarChange(Sender: TObject); 175 procedure TfrmEffectEditor.OneParamTrackBarChange(Sender: TObject);
180 begin 176 begin
181 Cell^.EffectParams.Value := OneParamTrackBar.Position; 177 Cell^.EffectParams.Value := OneParamTrackBar.Position;
ModifiedhUGEDriver +1−1
@@ -1 +1 @@
1 Subproject commit 2bedc2984db5ff082e5a9d272cfd9273097b2aff 1 Subproject commit e9964787c7183c4f3e67e4c0967fe64f4ea19916
Modifiedhugesettings.pas +10−0
@@ -13,6 +13,7 @@ type
13 13
14 TTrackerSettings = class 14 TTrackerSettings = class
15 private 15 private
16 FDisplayRowNumbersAsHex: Boolean;
16 FPreviewWhenBumping: Boolean; 17 FPreviewWhenBumping: Boolean;
17 FPreviewWhenPlacing: Boolean; 18 FPreviewWhenPlacing: Boolean;
18 SettingsFile: TINIFile; 19 SettingsFile: TINIFile;
@@ -20,6 +21,7 @@ type
20 FPatternEditorFontSize: Integer; 21 FPatternEditorFontSize: Integer;
21 FUseScopes, FUseCustomKeymap: Boolean; 22 FUseScopes, FUseCustomKeymap: Boolean;
22 23
24 procedure SetDisplayRowNumbersAsHex(AValue: Boolean);
23 procedure SetPatternEditorFontSize(AValue: Integer); 25 procedure SetPatternEditorFontSize(AValue: Integer);
24 procedure SetPreviewWhenBumping(AValue: Boolean); 26 procedure SetPreviewWhenBumping(AValue: Boolean);
25 procedure SetPreviewWhenPlacing(AValue: Boolean); 27 procedure SetPreviewWhenPlacing(AValue: Boolean);
@@ -31,6 +33,7 @@ type
31 property UseCustomKeymap: Boolean read FUseCustomKeymap write SetUseCustomKeymap; 33 property UseCustomKeymap: Boolean read FUseCustomKeymap write SetUseCustomKeymap;
32 property PreviewWhenPlacing: Boolean read FPreviewWhenPlacing write SetPreviewWhenPlacing; 34 property PreviewWhenPlacing: Boolean read FPreviewWhenPlacing write SetPreviewWhenPlacing;
33 property PreviewWhenBumping: Boolean read FPreviewWhenBumping write SetPreviewWhenBumping; 35 property PreviewWhenBumping: Boolean read FPreviewWhenBumping write SetPreviewWhenBumping;
36 property DisplayRowNumbersAsHex: Boolean read FDisplayRowNumbersAsHex write SetDisplayRowNumbersAsHex;
34 37
35 constructor Create; 38 constructor Create;
36 end; 39 end;
@@ -48,6 +51,12 @@ begin
48 SettingsFile.WriteInteger('hUGETracker', 'fontsize', AValue); 51 SettingsFile.WriteInteger('hUGETracker', 'fontsize', AValue);
49 end; 52 end;
50 53
54 procedure TTrackerSettings.SetDisplayRowNumbersAsHex(AValue: Boolean);
55 begin
56 FDisplayRowNumbersAsHex:=AValue;
57 SettingsFile.WriteBool('hUGETracker', 'DisplayRowNumbersAsHex', AValue);
58 end;
59
51 procedure TTrackerSettings.SetPreviewWhenBumping(AValue: Boolean); 60 procedure TTrackerSettings.SetPreviewWhenBumping(AValue: Boolean);
52 begin 61 begin
53 FPreviewWhenBumping:=AValue; 62 FPreviewWhenBumping:=AValue;
@@ -81,6 +90,7 @@ begin
81 FUseCustomKeymap := SettingsFile.ReadBool('hUGETracker', 'CustomKeymap', False); 90 FUseCustomKeymap := SettingsFile.ReadBool('hUGETracker', 'CustomKeymap', False);
82 FPreviewWhenPlacing := SettingsFile.ReadBool('hUGETracker', 'PreviewWhenPlacing', True); 91 FPreviewWhenPlacing := SettingsFile.ReadBool('hUGETracker', 'PreviewWhenPlacing', True);
83 FPreviewWhenBumping := SettingsFile.ReadBool('hUGETracker', 'PreviewWhenBumping', False); 92 FPreviewWhenBumping := SettingsFile.ReadBool('hUGETracker', 'PreviewWhenBumping', False);
93 FDisplayRowNumbersAsHex := SettingsFile.ReadBool('hUGETracker', 'DisplayRowNumbersAsHex', False);
84 end; 94 end;
85 95
86 initialization 96 initialization
Modifiedoptions.lfm +16−7
@@ -1,11 +1,11 @@
1 object frmOptions: TfrmOptions 1 object frmOptions: TfrmOptions
2 Left = 1344 2 Left = 1806
3 Height = 615 3 Height = 641
4 Top = 391 4 Top = 123
5 Width = 305 5 Width = 305
6 BorderStyle = bsDialog 6 BorderStyle = bsDialog
7 Caption = 'Options' 7 Caption = 'Options'
8 ClientHeight = 615 8 ClientHeight = 641
9 ClientWidth = 305 9 ClientWidth = 305
10 OnClose = FormClose 10 OnClose = FormClose
11 OnCreate = FormCreate 11 OnCreate = FormCreate
@@ -25,7 +25,7 @@ object frmOptions: TfrmOptions
25 AnchorSideBottom.Side = asrBottom 25 AnchorSideBottom.Side = asrBottom
26 Left = 169 26 Left = 169
27 Height = 25 27 Height = 25
28 Top = 576 28 Top = 602
29 Width = 123 29 Width = 123
30 Anchors = [akRight, akBottom] 30 Anchors = [akRight, akBottom]
31 Caption = 'OK' 31 Caption = 'OK'
@@ -57,7 +57,7 @@ object frmOptions: TfrmOptions
57 object KeymapGroupBox: TGroupBox 57 object KeymapGroupBox: TGroupBox
58 Left = 14 58 Left = 14
59 Height = 418 59 Height = 418
60 Top = 151 60 Top = 175
61 Width = 279 61 Width = 279
62 Caption = 'Custom key map' 62 Caption = 'Custom key map'
63 ClientHeight = 398 63 ClientHeight = 398
@@ -161,7 +161,16 @@ object frmOptions: TfrmOptions
161 Caption = 'Play preview when bumping notes up/down' 161 Caption = 'Play preview when bumping notes up/down'
162 ParentFont = False 162 ParentFont = False
163 TabOrder = 6 163 TabOrder = 6
164 Visible = False 164 end
165 object DisplayHexRowNumbersCheck: TCheckBox
166 Left = 14
167 Height = 19
168 Top = 147
169 Width = 262
170 Alignment = taLeftJustify
171 Caption = 'Display row numbers in hexadecimal notation'
172 ParentFont = False
173 TabOrder = 7
165 end 174 end
166 object SaveDialog1: TSaveDialog 175 object SaveDialog1: TSaveDialog
167 Left = 240 176 Left = 240
Modifiedoptions.pas +3−2
@@ -18,6 +18,7 @@ type
18 Button3: TButton; 18 Button3: TButton;
19 Button4: TButton; 19 Button4: TButton;
20 Button5: TButton; 20 Button5: TButton;
21 DisplayHexRowNumbersCheck: TCheckBox;
21 PreviewWhenPlacingCheck: TCheckBox; 22 PreviewWhenPlacingCheck: TCheckBox;
22 PreviewWhenBumpingCheck: TCheckBox; 23 PreviewWhenBumpingCheck: TCheckBox;
23 KeymapCheckbox: TCheckBox; 24 KeymapCheckbox: TCheckBox;
@@ -88,7 +89,7 @@ begin
88 TrackerSettings.UseScopes := ScopesCheck.Checked; 89 TrackerSettings.UseScopes := ScopesCheck.Checked;
89 TrackerSettings.UseCustomKeymap := KeymapCheckbox.Checked; 90 TrackerSettings.UseCustomKeymap := KeymapCheckbox.Checked;
90 TrackerSettings.PreviewWhenBumping := PreviewWhenBumpingCheck.Checked; 91 TrackerSettings.PreviewWhenBumping := PreviewWhenBumpingCheck.Checked;
91 TrackerSettings.PreviewWhenPlacing := PreviewWhenPlacingCheck.Checked; 92 TrackerSettings.DisplayRowNumbersAsHex := DisplayHexRowNumbersCheck.Checked;
92 end; 93 end;
93 94
94 procedure TfrmOptions.FormCreate(Sender: TObject); 95 procedure TfrmOptions.FormCreate(Sender: TObject);
@@ -102,7 +103,7 @@ begin
102 ScopesCheck.Checked := TrackerSettings.UseScopes; 103 ScopesCheck.Checked := TrackerSettings.UseScopes;
103 KeymapCheckbox.Checked := TrackerSettings.UseCustomKeymap; 104 KeymapCheckbox.Checked := TrackerSettings.UseCustomKeymap;
104 PreviewWhenBumpingCheck.Checked := TrackerSettings.PreviewWhenBumping; 105 PreviewWhenBumpingCheck.Checked := TrackerSettings.PreviewWhenBumping;
105 PreviewWhenPlacingCheck.Checked := TrackerSettings.PreviewWhenPlacing; 106 DisplayHexRowNumbersCheck.Checked := TrackerSettings.DisplayRowNumbersAsHex;
106 end; 107 end;
107 108
108 procedure TfrmOptions.KeymapCheckboxChange(Sender: TObject); 109 procedure TfrmOptions.KeymapCheckboxChange(Sender: TObject);
Modifiedtracker.lfm +2−2
@@ -61,10 +61,10 @@ object frmTracker: TfrmTracker
61 Height = 521 61 Height = 521
62 Top = 0 62 Top = 0
63 Width = 1034 63 Width = 1034
64 ActivePage = GeneralTabSheet 64 ActivePage = PatternTabSheet
65 Align = alClient 65 Align = alClient
66 ParentFont = False 66 ParentFont = False
67 TabIndex = 0 67 TabIndex = 1
68 TabOrder = 0 68 TabOrder = 0
69 object GeneralTabSheet: TTabSheet 69 object GeneralTabSheet: TTabSheet
70 Caption = 'General' 70 Caption = 'General'
Modifiedtracker.pas +20−4
@@ -465,6 +465,7 @@ type
465 465
466 procedure CreateKeymap; 466 procedure CreateKeymap;
467 procedure RecreateTrackerGrid; 467 procedure RecreateTrackerGrid;
468 procedure RecreateRowNumbers;
468 procedure UpdateUIAfterLoad(FileName: String = ''); 469 procedure UpdateUIAfterLoad(FileName: String = '');
469 procedure UpdateWindowTitle; 470 procedure UpdateWindowTitle;
470 procedure UpdateHexWaveTextbox; 471 procedure UpdateHexWaveTextbox;
@@ -1086,6 +1087,20 @@ begin
1086 TrackerGrid.PopupMenu := TrackerGridPopup; 1087 TrackerGrid.PopupMenu := TrackerGridPopup;
1087 end; 1088 end;
1088 1089
1090 procedure TfrmTracker.RecreateRowNumbers;
1091 var
1092 I: Integer;
1093 begin
1094 RowNumberStringGrid.Clean;
1095 // Add the row numbers to the string grid
1096 for I := 0 to RowNumberStringGrid.RowCount-1 do begin
1097 if TrackerSettings.DisplayRowNumbersAsHex then
1098 RowNumberStringGrid.Cells[0, I] := IntToHex(I, 2)
1099 else
1100 RowNumberStringGrid.Cells[0, I] := IntToStr(I)
1101 end;
1102 end;
1103
1089 procedure TfrmTracker.LoadInstrument(Bank: TInstrumentType; Instr: Integer); 1104 procedure TfrmTracker.LoadInstrument(Bank: TInstrumentType; Instr: Integer);
1090 var 1105 var
1091 CI: ^TInstrument; 1106 CI: ^TInstrument;
@@ -1359,6 +1374,9 @@ begin
1359 InitializeSong(Song); 1374 InitializeSong(Song);
1360 LoadDefaultInstruments(Song); 1375 LoadDefaultInstruments(Song);
1361 1376
1377 // Create row numbers
1378 RecreateRowNumbers;
1379
1362 // Create pattern editor control 1380 // Create pattern editor control
1363 RecreateTrackerGrid; 1381 RecreateTrackerGrid;
1364 CreateKeymap; 1382 CreateKeymap;
@@ -1387,10 +1405,6 @@ begin
1387 // Switch to general tab sheet 1405 // Switch to general tab sheet
1388 PageControl1.ActivePageIndex := 0; 1406 PageControl1.ActivePageIndex := 0;
1389 1407
1390 // Add the row numbers to the string grid
1391 for I := 0 to RowNumberStringGrid.RowCount-1 do
1392 RowNumberStringGrid.Cells[0, I] := IntToStr(I);
1393
1394 {$ifdef DEVELOPMENT} 1408 {$ifdef DEVELOPMENT}
1395 DebugShiteButton.Visible := True; 1409 DebugShiteButton.Visible := True;
1396 DebugPlayNoteButton.Visible := True; 1410 DebugPlayNoteButton.Visible := True;
@@ -2153,6 +2167,8 @@ begin
2153 OscilloscopeUpdateTimer.Enabled := ScopesOn; 2167 OscilloscopeUpdateTimer.Enabled := ScopesOn;
2154 Panel2.Visible := ScopesOn; 2168 Panel2.Visible := ScopesOn;
2155 2169
2170 RecreateRowNumbers;
2171
2156 CreateKeymap 2172 CreateKeymap
2157 end; 2173 end;
2158 2174