Commit fba0189

Nick committed on
Changing up the eye candy buttons
commit fba0189c45e811c59f34fe7ce12eff92757e9ac6 parent c37bcdc
2 changed files +104−22
Modifiedtracker.lfm +96−22
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 717 2 Left = 899
3 Height = 1275 3 Height = 1275
4 Top = 265 4 Top = 236
5 Width = 2056 5 Width = 2056
6 Caption = 'hUGETracker' 6 Caption = 'hUGETracker'
7 ClientHeight = 1241 7 ClientHeight = 1241
@@ -436,15 +436,18 @@ object frmTracker: TfrmTracker
436 Left = 140 436 Left = 140
437 Height = 24 437 Height = 24
438 Hint = 'Units of length to cut the sound after' 438 Hint = 'Units of length to cut the sound after'
439 Top = 140 439 Top = 147
440 Width = 174 440 Width = 310
441 Buttons.BtnBigDec.BtnOrder = 1 441 Buttons.BtnBigDec.BtnOrder = 1
442 Buttons.BtnBigDec.Visible = False 442 Buttons.BtnBigDec.Visible = False
443 Buttons.BtnBigInc.BtnOrder = 7 443 Buttons.BtnBigInc.BtnOrder = 7
444 Buttons.BtnBigInc.Visible = False 444 Buttons.BtnBigInc.Visible = False
445 Buttons.BtnDec.BtnOrder = 2 445 Buttons.BtnDec.BtnOrder = 2
446 Buttons.BtnDec.Visible = False
446 Buttons.BtnDrag.BtnOrder = 4 447 Buttons.BtnDrag.BtnOrder = 4
448 Buttons.BtnDrag.Visible = False
447 Buttons.BtnInc.BtnOrder = 6 449 Buttons.BtnInc.BtnOrder = 6
450 Buttons.BtnInc.Visible = False
448 Buttons.BtnMax.BtnOrder = 8 451 Buttons.BtnMax.BtnOrder = 8
449 Buttons.BtnMax.Visible = False 452 Buttons.BtnMax.Visible = False
450 Buttons.BtnMenu.BtnOrder = 5 453 Buttons.BtnMenu.BtnOrder = 5
@@ -537,7 +540,7 @@ object frmTracker: TfrmTracker
537 Left = 144 540 Left = 144
538 Height = 38 541 Height = 38
539 Hint = 'Whether to fade the sound in or out' 542 Hint = 'Whether to fade the sound in or out'
540 Top = 70 543 Top = 80
541 Width = 346 544 Width = 346
542 ItemHeight = 30 545 ItemHeight = 30
543 ItemIndex = 1 546 ItemIndex = 1
@@ -564,15 +567,18 @@ object frmTracker: TfrmTracker
564 Left = 144 567 Left = 144
565 Height = 24 568 Height = 24
566 Hint = 'The initial volume when the note is retriggered' 569 Hint = 'The initial volume when the note is retriggered'
567 Top = -2 570 Top = 16
568 Width = 198 571 Width = 344
569 Buttons.BtnBigDec.BtnOrder = 1 572 Buttons.BtnBigDec.BtnOrder = 1
570 Buttons.BtnBigDec.Visible = False 573 Buttons.BtnBigDec.Visible = False
571 Buttons.BtnBigInc.BtnOrder = 7 574 Buttons.BtnBigInc.BtnOrder = 7
572 Buttons.BtnBigInc.Visible = False 575 Buttons.BtnBigInc.Visible = False
573 Buttons.BtnDec.BtnOrder = 2 576 Buttons.BtnDec.BtnOrder = 2
577 Buttons.BtnDec.Visible = False
574 Buttons.BtnDrag.BtnOrder = 4 578 Buttons.BtnDrag.BtnOrder = 4
579 Buttons.BtnDrag.Visible = False
575 Buttons.BtnInc.BtnOrder = 6 580 Buttons.BtnInc.BtnOrder = 6
581 Buttons.BtnInc.Visible = False
576 Buttons.BtnMax.BtnOrder = 8 582 Buttons.BtnMax.BtnOrder = 8
577 Buttons.BtnMax.Visible = False 583 Buttons.BtnMax.Visible = False
578 Buttons.BtnMenu.BtnOrder = 5 584 Buttons.BtnMenu.BtnOrder = 5
@@ -612,15 +618,18 @@ object frmTracker: TfrmTracker
612 Left = 144 618 Left = 144
613 Height = 24 619 Height = 24
614 Hint = 'How much to change the volume each time' 620 Hint = 'How much to change the volume each time'
615 Top = 140 621 Top = 157
616 Width = 198 622 Width = 344
617 Buttons.BtnBigDec.BtnOrder = 1 623 Buttons.BtnBigDec.BtnOrder = 1
618 Buttons.BtnBigDec.Visible = False 624 Buttons.BtnBigDec.Visible = False
619 Buttons.BtnBigInc.BtnOrder = 7 625 Buttons.BtnBigInc.BtnOrder = 7
620 Buttons.BtnBigInc.Visible = False 626 Buttons.BtnBigInc.Visible = False
621 Buttons.BtnDec.BtnOrder = 2 627 Buttons.BtnDec.BtnOrder = 2
628 Buttons.BtnDec.Visible = False
622 Buttons.BtnDrag.BtnOrder = 4 629 Buttons.BtnDrag.BtnOrder = 4
630 Buttons.BtnDrag.Visible = False
623 Buttons.BtnInc.BtnOrder = 6 631 Buttons.BtnInc.BtnOrder = 6
632 Buttons.BtnInc.Visible = False
624 Buttons.BtnMax.BtnOrder = 8 633 Buttons.BtnMax.BtnOrder = 8
625 Buttons.BtnMax.Visible = False 634 Buttons.BtnMax.Visible = False
626 Buttons.BtnMenu.BtnOrder = 5 635 Buttons.BtnMenu.BtnOrder = 5
@@ -801,15 +810,18 @@ object frmTracker: TfrmTracker
801 Left = 182 810 Left = 182
802 Height = 24 811 Height = 24
803 Hint = 'Change by this amount each sweep tick' 812 Hint = 'Change by this amount each sweep tick'
804 Top = 131 813 Top = 144
805 Width = 198 814 Width = 350
806 Buttons.BtnBigDec.BtnOrder = 1 815 Buttons.BtnBigDec.BtnOrder = 1
807 Buttons.BtnBigDec.Visible = False 816 Buttons.BtnBigDec.Visible = False
808 Buttons.BtnBigInc.BtnOrder = 7 817 Buttons.BtnBigInc.BtnOrder = 7
809 Buttons.BtnBigInc.Visible = False 818 Buttons.BtnBigInc.Visible = False
810 Buttons.BtnDec.BtnOrder = 2 819 Buttons.BtnDec.BtnOrder = 2
820 Buttons.BtnDec.Visible = False
811 Buttons.BtnDrag.BtnOrder = 4 821 Buttons.BtnDrag.BtnOrder = 4
822 Buttons.BtnDrag.Visible = False
812 Buttons.BtnInc.BtnOrder = 6 823 Buttons.BtnInc.BtnOrder = 6
824 Buttons.BtnInc.Visible = False
813 Buttons.BtnMax.BtnOrder = 8 825 Buttons.BtnMax.BtnOrder = 8
814 Buttons.BtnMax.Visible = False 826 Buttons.BtnMax.Visible = False
815 Buttons.BtnMenu.BtnOrder = 5 827 Buttons.BtnMenu.BtnOrder = 5
@@ -958,7 +970,7 @@ object frmTracker: TfrmTracker
958 end 970 end
959 object NoiseGroupBox: TGroupBox 971 object NoiseGroupBox: TGroupBox
960 Left = 1138 972 Left = 1138
961 Height = 222 973 Height = 296
962 Top = 346 974 Top = 346
963 Width = 462 975 Width = 462
964 Anchors = [] 976 Anchors = []
@@ -967,7 +979,7 @@ object frmTracker: TfrmTracker
967 BorderSpacing.Right = 12 979 BorderSpacing.Right = 12
968 BorderSpacing.Bottom = 12 980 BorderSpacing.Bottom = 12
969 Caption = 'Noise' 981 Caption = 'Noise'
970 ClientHeight = 187 982 ClientHeight = 261
971 ClientWidth = 458 983 ClientWidth = 458
972 Enabled = False 984 Enabled = False
973 ParentFont = False 985 ParentFont = False
@@ -976,7 +988,7 @@ object frmTracker: TfrmTracker
976 Left = 14 988 Left = 14
977 Height = 34 989 Height = 34
978 Hint = 'Select LFSR width. When checked, output will sound like a tone rather than noise' 990 Hint = 'Select LFSR width. When checked, output will sound like a tone rather than noise'
979 Top = 70 991 Top = 140
980 Width = 373 992 Width = 373
981 Alignment = taLeftJustify 993 Alignment = taLeftJustify
982 Caption = '7 bit counter (more tone-like output)' 994 Caption = '7 bit counter (more tone-like output)'
@@ -985,37 +997,40 @@ object frmTracker: TfrmTracker
985 TabOrder = 0 997 TabOrder = 0
986 end 998 end
987 object Label14: TLabel 999 object Label14: TLabel
988 Left = 14 1000 Left = 16
989 Height = 30 1001 Height = 30
990 Top = 16 1002 Top = 90
991 Width = 124 1003 Width = 124
992 Caption = 'Dividing ratio' 1004 Caption = 'Dividing ratio'
993 ParentColor = False 1005 ParentColor = False
994 ParentFont = False 1006 ParentFont = False
995 end 1007 end
996 object RandomizeNoiseButton: TButton 1008 object RandomizeNoiseButton: TButton
997 Left = 14 1009 Left = 16
998 Height = 44 1010 Height = 44
999 Hint = 'Randomize the noise instrument parameters to get a random drum-like sound' 1011 Hint = 'Randomize the noise instrument parameters to get a random drum-like sound'
1000 Top = 120 1012 Top = 196
1001 Width = 380 1013 Width = 424
1002 Caption = 'Randomize' 1014 Caption = 'Randomize'
1003 OnClick = RandomizeNoiseButtonClick 1015 OnClick = RandomizeNoiseButtonClick
1004 ParentFont = False 1016 ParentFont = False
1005 TabOrder = 1 1017 TabOrder = 1
1006 end 1018 end
1007 object DivRatioSpinner: TECSpinPosition 1019 object DivRatioSpinner: TECSpinPosition
1008 Left = 152 1020 Left = 192
1009 Height = 24 1021 Height = 24
1010 Top = 16 1022 Top = 96
1011 Width = 198 1023 Width = 240
1012 Buttons.BtnBigDec.BtnOrder = 1 1024 Buttons.BtnBigDec.BtnOrder = 1
1013 Buttons.BtnBigDec.Visible = False 1025 Buttons.BtnBigDec.Visible = False
1014 Buttons.BtnBigInc.BtnOrder = 7 1026 Buttons.BtnBigInc.BtnOrder = 7
1015 Buttons.BtnBigInc.Visible = False 1027 Buttons.BtnBigInc.Visible = False
1016 Buttons.BtnDec.BtnOrder = 2 1028 Buttons.BtnDec.BtnOrder = 2
1029 Buttons.BtnDec.Visible = False
1017 Buttons.BtnDrag.BtnOrder = 4 1030 Buttons.BtnDrag.BtnOrder = 4
1031 Buttons.BtnDrag.Visible = False
1018 Buttons.BtnInc.BtnOrder = 6 1032 Buttons.BtnInc.BtnOrder = 6
1033 Buttons.BtnInc.Visible = False
1019 Buttons.BtnMax.BtnOrder = 8 1034 Buttons.BtnMax.BtnOrder = 8
1020 Buttons.BtnMax.Visible = False 1035 Buttons.BtnMax.Visible = False
1021 Buttons.BtnMenu.BtnOrder = 5 1036 Buttons.BtnMenu.BtnOrder = 5
@@ -1051,6 +1066,65 @@ object frmTracker: TfrmTracker
1051 ScaleFontOptions.FontStyles = [] 1066 ScaleFontOptions.FontStyles = []
1052 OnChange = DivRatioSpinnerChange 1067 OnChange = DivRatioSpinnerChange
1053 end 1068 end
1069 object ShiftClockSpinner: TECSpinPosition
1070 Left = 192
1071 Height = 24
1072 Top = 28
1073 Width = 240
1074 Buttons.BtnBigDec.BtnOrder = 1
1075 Buttons.BtnBigDec.Visible = False
1076 Buttons.BtnBigInc.BtnOrder = 7
1077 Buttons.BtnBigInc.Visible = False
1078 Buttons.BtnDec.BtnOrder = 2
1079 Buttons.BtnDec.Visible = False
1080 Buttons.BtnDrag.BtnOrder = 4
1081 Buttons.BtnDrag.Visible = False
1082 Buttons.BtnInc.BtnOrder = 6
1083 Buttons.BtnInc.Visible = False
1084 Buttons.BtnMax.BtnOrder = 8
1085 Buttons.BtnMax.Visible = False
1086 Buttons.BtnMenu.BtnOrder = 5
1087 Buttons.BtnMenu.Visible = False
1088 Buttons.BtnMiddle.BtnOrder = 3
1089 Buttons.BtnMiddle.Visible = False
1090 Buttons.BtnMin.BtnOrder = 0
1091 Buttons.BtnMin.Visible = False
1092 Buttons.DiscreteChange = 1
1093 Buttons.Increment = 1
1094 Buttons.Middle = 50
1095 Buttons.MouseIncrementX = 0.1
1096 Buttons.MouseIncrementY = 0.05
1097 Buttons.PageSize = 10
1098 Buttons.ParentFont = False
1099 Buttons.Style = ebsSplittedBlock
1100 ParentFont = False
1101 Position = 0
1102 ProgressFontOptions.FontSize = 0
1103 ProgressFontOptions.FontStyles = [fsBold]
1104 ProgressMiddlePos = 0
1105 ProgressStyle = epsGradient
1106 Scale.DateTimeFormat = 'hh:nn:ss'
1107 Scale.LogarithmBase = 10
1108 Scale.Max = 7
1109 Scale.Min = 0
1110 Scale.TickLongValue = 10
1111 Scale.TickMiddleValue = 5
1112 Scale.TickShortValue = 1
1113 Scale.TickVisible = etvNone
1114 Scale.ValueVisible = evvNone
1115 ScaleFontOptions.FontSize = 7
1116 ScaleFontOptions.FontStyles = []
1117 OnChange = ShiftClockSpinnerChange
1118 end
1119 object Label25: TLabel
1120 Left = 16
1121 Height = 30
1122 Top = 22
1123 Width = 149
1124 Caption = 'Shift clock mask'
1125 ParentColor = False
1126 ParentFont = False
1127 end
1054 end 1128 end
1055 end 1129 end
1056 end 1130 end
Modifiedtracker.pas +8−0
@@ -16,12 +16,14 @@ type
16 { TfrmTracker } 16 { TfrmTracker }
17 17
18 TfrmTracker = class(TForm) 18 TfrmTracker = class(TForm)
19 ShiftClockSpinner: TECSpinPosition;
19 InstrumentExportButton: TButton; 20 InstrumentExportButton: TButton;
20 InstrumentImportButton: TButton; 21 InstrumentImportButton: TButton;
21 InstrumentComboBox: TComboBox; 22 InstrumentComboBox: TComboBox;
22 CutAction: TAction; 23 CutAction: TAction;
23 ImageList2: TImageList; 24 ImageList2: TImageList;
24 GBSaveDialog: TSaveDialog; 25 GBSaveDialog: TSaveDialog;
26 Label25: TLabel;
25 MenuItem16: TMenuItem; 27 MenuItem16: TMenuItem;
26 MenuItem23: TMenuItem; 28 MenuItem23: TMenuItem;
27 MenuItem24: TMenuItem; 29 MenuItem24: TMenuItem;
@@ -234,6 +236,7 @@ type
234 procedure PanicToolButtonClick(Sender: TObject); 236 procedure PanicToolButtonClick(Sender: TObject);
235 procedure PasteActionExecute(Sender: TObject); 237 procedure PasteActionExecute(Sender: TObject);
236 procedure OctaveSpinEditChange(Sender: TObject); 238 procedure OctaveSpinEditChange(Sender: TObject);
239 procedure ShiftClockSpinnerChange(Sender: TObject);
237 procedure StepSpinEditChange(Sender: TObject); 240 procedure StepSpinEditChange(Sender: TObject);
238 procedure TicksPerRowSpinEditChange(Sender: TObject); 241 procedure TicksPerRowSpinEditChange(Sender: TObject);
239 procedure Timer1Timer(Sender: TObject); 242 procedure Timer1Timer(Sender: TObject);
@@ -1104,6 +1107,11 @@ begin
1104 TrackerGrid.SelectedOctave := OctaveSpinEdit.Value; 1107 TrackerGrid.SelectedOctave := OctaveSpinEdit.Value;
1105 end; 1108 end;
1106 1109
1110 procedure TfrmTracker.ShiftClockSpinnerChange(Sender: TObject);
1111 begin
1112 CurrentInstrument^.ShiftClockFreq := Round(ShiftClockSpinner.Position);
1113 end;
1114
1107 procedure TfrmTracker.StepSpinEditChange(Sender: TObject); 1115 procedure TfrmTracker.StepSpinEditChange(Sender: TObject);
1108 begin 1116 begin
1109 TrackerGrid.Step := StepSpinEdit.Value; 1117 TrackerGrid.Step := StepSpinEdit.Value;