Commit 5069f97

Nick committed on
Add more sample songs, fix undo bugs
commit 5069f9789cc948ee3d2930b411384a82d95162df parent fc50ab5
9 changed files +59−57
Modifiedeffecteditor.lfm +2−2
@@ -1,7 +1,7 @@
1 object frmEffectEditor: TfrmEffectEditor 1 object frmEffectEditor: TfrmEffectEditor
2 Left = 1892 2 Left = 1006
3 Height = 238 3 Height = 238
4 Top = 120 4 Top = 86
5 Width = 391 5 Width = 391
6 BorderIcons = [biSystemMenu, biMinimize] 6 BorderIcons = [biSystemMenu, biMinimize]
7 BorderStyle = bsDialog 7 BorderStyle = bsDialog
Modifiedtracker.lfm +53−53
@@ -1,11 +1,11 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 620 2 Left = 333
3 Height = 714 3 Height = 686
4 Top = 127 4 Top = 131
5 Width = 1181 5 Width = 1166
6 Caption = 'hUGETracker' 6 Caption = 'hUGETracker'
7 ClientHeight = 694 7 ClientHeight = 666
8 ClientWidth = 1181 8 ClientWidth = 1166
9 KeyPreview = True 9 KeyPreview = True
10 Menu = MainMenu1 10 Menu = MainMenu1
11 OnClose = FormClose 11 OnClose = FormClose
@@ -19,7 +19,7 @@ object frmTracker: TfrmTracker
19 LCLVersion = '2.0.6.0' 19 LCLVersion = '2.0.6.0'
20 object TreeView1: TTreeView 20 object TreeView1: TTreeView
21 Left = 0 21 Left = 0
22 Height = 468 22 Height = 440
23 Top = 203 23 Top = 203
24 Width = 193 24 Width = 193
25 Align = alLeft 25 Align = alLeft
@@ -37,35 +37,35 @@ object frmTracker: TfrmTracker
37 end 37 end
38 object Splitter1: TSplitter 38 object Splitter1: TSplitter
39 Left = 193 39 Left = 193
40 Height = 468 40 Height = 440
41 Top = 203 41 Top = 203
42 Width = 5 42 Width = 5
43 end 43 end
44 object Panel1: TPanel 44 object Panel1: TPanel
45 Left = 198 45 Left = 198
46 Height = 468 46 Height = 440
47 Top = 203 47 Top = 203
48 Width = 983 48 Width = 968
49 Align = alClient 49 Align = alClient
50 BevelOuter = bvNone 50 BevelOuter = bvNone
51 ClientHeight = 468 51 ClientHeight = 440
52 ClientWidth = 983 52 ClientWidth = 968
53 ParentFont = False 53 ParentFont = False
54 TabOrder = 2 54 TabOrder = 2
55 object PageControl1: TPageControl 55 object PageControl1: TPageControl
56 Left = 0 56 Left = 0
57 Height = 468 57 Height = 440
58 Top = 0 58 Top = 0
59 Width = 983 59 Width = 968
60 ActivePage = RoutinesTabSheet 60 ActivePage = GeneralTabSheet
61 Align = alClient 61 Align = alClient
62 ParentFont = False 62 ParentFont = False
63 TabIndex = 5 63 TabIndex = 0
64 TabOrder = 0 64 TabOrder = 0
65 object GeneralTabSheet: TTabSheet 65 object GeneralTabSheet: TTabSheet
66 Caption = 'General' 66 Caption = 'General'
67 ClientHeight = 440 67 ClientHeight = 412
68 ClientWidth = 975 68 ClientWidth = 960
69 ParentFont = False 69 ParentFont = False
70 object SongInformationGroupbox: TGroupBox 70 object SongInformationGroupbox: TGroupBox
71 Left = 8 71 Left = 8
@@ -141,17 +141,17 @@ object frmTracker: TfrmTracker
141 end 141 end
142 object PatternTabSheet: TTabSheet 142 object PatternTabSheet: TTabSheet
143 Caption = 'Patterns' 143 Caption = 'Patterns'
144 ClientHeight = 440 144 ClientHeight = 412
145 ClientWidth = 975 145 ClientWidth = 960
146 ParentFont = False 146 ParentFont = False
147 object Panel3: TPanel 147 object Panel3: TPanel
148 Left = 224 148 Left = 224
149 Height = 440 149 Height = 412
150 Top = 0 150 Top = 0
151 Width = 751 151 Width = 736
152 Align = alClient 152 Align = alClient
153 ClientHeight = 440 153 ClientHeight = 412
154 ClientWidth = 751 154 ClientWidth = 736
155 ParentFont = False 155 ParentFont = False
156 TabOrder = 0 156 TabOrder = 0
157 object HeaderControl1: THeaderControl 157 object HeaderControl1: THeaderControl
@@ -159,7 +159,7 @@ object frmTracker: TfrmTracker
159 Height = 30 159 Height = 30
160 Hint = 'Left click to mute, right click to solo' 160 Hint = 'Left click to mute, right click to solo'
161 Top = 1 161 Top = 1
162 Width = 749 162 Width = 734
163 DragReorder = False 163 DragReorder = False
164 Images = ImageList2 164 Images = ImageList2
165 Sections = < 165 Sections = <
@@ -199,9 +199,9 @@ object frmTracker: TfrmTracker
199 end 199 end
200 object ScrollBox1: TScrollBox 200 object ScrollBox1: TScrollBox
201 Left = 1 201 Left = 1
202 Height = 408 202 Height = 380
203 Top = 31 203 Top = 31
204 Width = 749 204 Width = 734
205 HorzScrollBar.Increment = 1 205 HorzScrollBar.Increment = 1
206 HorzScrollBar.Page = 1 206 HorzScrollBar.Page = 1
207 HorzScrollBar.Smooth = True 207 HorzScrollBar.Smooth = True
@@ -218,7 +218,7 @@ object frmTracker: TfrmTracker
218 end 218 end
219 object OrderEditStringGrid: TStringGrid 219 object OrderEditStringGrid: TStringGrid
220 Left = 0 220 Left = 0
221 Height = 440 221 Height = 412
222 Top = 0 222 Top = 0
223 Width = 224 223 Width = 224
224 Align = alLeft 224 Align = alLeft
@@ -283,18 +283,18 @@ object frmTracker: TfrmTracker
283 end 283 end
284 object InstrumentTabSheet: TTabSheet 284 object InstrumentTabSheet: TTabSheet
285 Caption = 'Instruments' 285 Caption = 'Instruments'
286 ClientHeight = 440 286 ClientHeight = 412
287 ClientWidth = 975 287 ClientWidth = 960
288 ParentFont = False 288 ParentFont = False
289 object PaintBox1: TPaintBox 289 object PaintBox1: TPaintBox
290 AnchorSideTop.Control = FlowPanel1 290 AnchorSideTop.Control = FlowPanel1
291 AnchorSideTop.Side = asrBottom 291 AnchorSideTop.Side = asrBottom
292 AnchorSideBottom.Side = asrBottom 292 AnchorSideBottom.Side = asrBottom
293 Left = 0 293 Left = 0
294 Height = 35 294 Height = 7
295 Hint = 'Preview of how the resulting waveform will look with envelope applied' 295 Hint = 'Preview of how the resulting waveform will look with envelope applied'
296 Top = 405 296 Top = 405
297 Width = 975 297 Width = 960
298 Align = alClient 298 Align = alClient
299 Color = clBlack 299 Color = clBlack
300 ParentColor = False 300 ParentColor = False
@@ -306,7 +306,7 @@ object frmTracker: TfrmTracker
306 Left = 0 306 Left = 0
307 Height = 405 307 Height = 405
308 Top = 0 308 Top = 0
309 Width = 975 309 Width = 960
310 Align = alTop 310 Align = alTop
311 AutoSize = True 311 AutoSize = True
312 BevelOuter = bvNone 312 BevelOuter = bvNone
@@ -906,16 +906,16 @@ object frmTracker: TfrmTracker
906 end 906 end
907 object WavesTabSheet: TTabSheet 907 object WavesTabSheet: TTabSheet
908 Caption = 'Waves' 908 Caption = 'Waves'
909 ClientHeight = 440 909 ClientHeight = 412
910 ClientWidth = 975 910 ClientWidth = 960
911 ParentFont = False 911 ParentFont = False
912 object WaveEditPaintBox: TPaintBox 912 object WaveEditPaintBox: TPaintBox
913 AnchorSideTop.Control = WaveEditGroupBox 913 AnchorSideTop.Control = WaveEditGroupBox
914 AnchorSideTop.Side = asrBottom 914 AnchorSideTop.Side = asrBottom
915 Left = 0 915 Left = 0
916 Height = 280 916 Height = 252
917 Top = 160 917 Top = 160
918 Width = 975 918 Width = 960
919 Align = alBottom 919 Align = alBottom
920 Anchors = [akTop, akLeft, akRight, akBottom] 920 Anchors = [akTop, akLeft, akRight, akBottom]
921 BorderSpacing.Top = 13 921 BorderSpacing.Top = 13
@@ -980,17 +980,17 @@ object frmTracker: TfrmTracker
980 end 980 end
981 object CommentsTabSheet: TTabSheet 981 object CommentsTabSheet: TTabSheet
982 Caption = 'Comments' 982 Caption = 'Comments'
983 ClientHeight = 440 983 ClientHeight = 412
984 ClientWidth = 975 984 ClientWidth = 960
985 ParentFont = False 985 ParentFont = False
986 object CommentMemo: TMemo 986 object CommentMemo: TMemo
987 AnchorSideTop.Control = Label17 987 AnchorSideTop.Control = Label17
988 AnchorSideTop.Side = asrBottom 988 AnchorSideTop.Side = asrBottom
989 Left = 0 989 Left = 0
990 Height = 404 990 Height = 376
991 Hint = 'The comments section for your song. Greetings/links/etc' 991 Hint = 'The comments section for your song. Greetings/links/etc'
992 Top = 36 992 Top = 36
993 Width = 975 993 Width = 960
994 Align = alBottom 994 Align = alBottom
995 Anchors = [akTop, akLeft, akRight, akBottom] 995 Anchors = [akTop, akLeft, akRight, akBottom]
996 BorderSpacing.Top = 13 996 BorderSpacing.Top = 13
@@ -1011,16 +1011,16 @@ object frmTracker: TfrmTracker
1011 end 1011 end
1012 object RoutinesTabSheet: TTabSheet 1012 object RoutinesTabSheet: TTabSheet
1013 Caption = 'Routines' 1013 Caption = 'Routines'
1014 ClientHeight = 440 1014 ClientHeight = 412
1015 ClientWidth = 975 1015 ClientWidth = 960
1016 ParentFont = False 1016 ParentFont = False
1017 inline RoutineSynedit: TSynEdit 1017 inline RoutineSynedit: TSynEdit
1018 AnchorSideTop.Control = Label19 1018 AnchorSideTop.Control = Label19
1019 AnchorSideTop.Side = asrBottom 1019 AnchorSideTop.Side = asrBottom
1020 Left = 0 1020 Left = 0
1021 Height = 312 1021 Height = 284
1022 Top = 128 1022 Top = 128
1023 Width = 975 1023 Width = 960
1024 Align = alBottom 1024 Align = alBottom
1025 BorderSpacing.Top = 13 1025 BorderSpacing.Top = 13
1026 Anchors = [akTop, akLeft, akRight, akBottom] 1026 Anchors = [akTop, akLeft, akRight, akBottom]
@@ -1557,17 +1557,17 @@ object frmTracker: TfrmTracker
1557 Left = 0 1557 Left = 0
1558 Height = 178 1558 Height = 178
1559 Top = 25 1559 Top = 25
1560 Width = 1181 1560 Width = 1166
1561 Align = alTop 1561 Align = alTop
1562 BevelOuter = bvNone 1562 BevelOuter = bvNone
1563 ChildSizing.HorizontalSpacing = 10 1563 ChildSizing.HorizontalSpacing = 10
1564 ClientHeight = 178 1564 ClientHeight = 178
1565 ClientWidth = 1181 1565 ClientWidth = 1166
1566 ParentFont = False 1566 ParentFont = False
1567 TabOrder = 3 1567 TabOrder = 3
1568 object LEDMeter1: TLEDMeter 1568 object LEDMeter1: TLEDMeter
1569 AnchorSideRight.Side = asrBottom 1569 AnchorSideRight.Side = asrBottom
1570 Left = 736 1570 Left = 721
1571 Height = 178 1571 Height = 178
1572 Top = 0 1572 Top = 0
1573 Width = 50 1573 Width = 50
@@ -1591,7 +1591,7 @@ object frmTracker: TfrmTracker
1591 end 1591 end
1592 object LEDMeter2: TLEDMeter 1592 object LEDMeter2: TLEDMeter
1593 AnchorSideRight.Side = asrBottom 1593 AnchorSideRight.Side = asrBottom
1594 Left = 686 1594 Left = 671
1595 Height = 178 1595 Height = 178
1596 Top = 0 1596 Top = 0
1597 Width = 50 1597 Width = 50
@@ -1614,7 +1614,7 @@ object frmTracker: TfrmTracker
1614 Section3Value = 80 1614 Section3Value = 80
1615 end 1615 end
1616 object Panel6: TPanel 1616 object Panel6: TPanel
1617 Left = 787 1617 Left = 772
1618 Height = 178 1618 Height = 178
1619 Top = 0 1619 Top = 0
1620 Width = 394 1620 Width = 394
@@ -1666,8 +1666,8 @@ object frmTracker: TfrmTracker
1666 object StatusBar1: TStatusBar 1666 object StatusBar1: TStatusBar
1667 Left = 0 1667 Left = 0
1668 Height = 23 1668 Height = 23
1669 Top = 671 1669 Top = 643
1670 Width = 1181 1670 Width = 1166
1671 AutoHint = True 1671 AutoHint = True
1672 Panels = < 1672 Panels = <
1673 item 1673 item
@@ -1688,7 +1688,7 @@ object frmTracker: TfrmTracker
1688 Left = 0 1688 Left = 0
1689 Height = 25 1689 Height = 25
1690 Top = 0 1690 Top = 0
1691 Width = 1181 1691 Width = 1166
1692 AutoSize = True 1692 AutoSize = True
1693 Caption = 'ToolBar1' 1693 Caption = 'ToolBar1'
1694 EdgeBorders = [ebBottom] 1694 EdgeBorders = [ebBottom]
Modifiedtrackergrid.pas +4−2
@@ -611,14 +611,16 @@ begin
611 end; 611 end;
612 612
613 Invalidate 613 Invalidate
614 SaveUndoState;
614 end; 615 end;
615 616
616 procedure TTrackerGrid.OpenEffectEditor; 617 procedure TTrackerGrid.OpenEffectEditor;
617 begin 618 begin
618 inherited DblClick;
619
620 frmEffectEditor.Cell := @Patterns[Cursor.X]^[Cursor.Y]; 619 frmEffectEditor.Cell := @Patterns[Cursor.X]^[Cursor.Y];
621 frmEffectEditor.ShowModal; 620 frmEffectEditor.ShowModal;
621
622 Invalidate;
623 SaveUndoState;
622 end; 624 end;
623 625
624 procedure TTrackerGrid.EraseSelection; 626 procedure TTrackerGrid.EraseSelection;