Commit `ce24f3a`

Nick Faro committed on Dec 7, 2023

Reject importing instruments that are of the wrong type

commit ce24f3ab58720344d277e0c5c78bd5584139b25e parent 657229f

3 changed files +555−547

Modifiedsrc/hUGEDriver +1−1

`@@ -1 +1 @@`
1	`Subproject commit 13a26513498637baee9997bd3cad9476224db723`	1	`Subproject commit f879bf3f755a68aec6729c481a80c648e1753c40`

Modifiedsrc/tracker.lfm +543−545

 object frmTracker: TfrmTracker
-  Left = 571
+  Left = 1826
-  Height = 1049
+  Height = 819
-  Top = 149
+  Top = 188
-  Width = 1667
+  Width = 1301
   AllowDropFiles = True
   Caption = 'hUGETracker'
-  ClientHeight = 1023
+  ClientHeight = 798
-  ClientWidth = 1667
+  ClientWidth = 1301
-  DesignTimePPI = 123
   KeyPreview = True
   Menu = MainMenu1
   OnCloseQuery = FormCloseQuery
   LCLVersion = '2.2.7.0'
   object TreeView1: TTreeView
     Left = 0
-    Height = 881
+    Height = 684
-    Top = 116
+    Top = 93
-    Width = 247
+    Width = 193
     Align = alLeft
     ParentFont = False
     ReadOnly = True
     }
   end
   object Splitter1: TSplitter
-    Left = 247
+    Left = 193
-    Height = 881
+    Height = 684
-    Top = 116
+    Top = 93
-    Width = 6
+    Width = 5
   end
   object Panel1: TPanel
-    Left = 253
+    Left = 198
-    Height = 881
+    Height = 684
-    Top = 116
+    Top = 93
-    Width = 1414
+    Width = 1103
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 881
+    ClientHeight = 684
-    ClientWidth = 1414
+    ClientWidth = 1103
     ParentFont = False
     TabOrder = 2
     object PageControl1: TPageControl
       Left = 0
-      Height = 881
+      Height = 684
       Top = 0
-      Width = 1414
+      Width = 1103
-      ActivePage = PatternTabSheet
+      ActivePage = GeneralTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 1
+      TabIndex = 0
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
-        ClientHeight = 841
+        ClientHeight = 649
-        ClientWidth = 1408
+        ClientWidth = 1097
         ParentFont = False
         object SongInformationGroupbox: TGroupBox
-          Left = 10
+          Left = 8
-          Height = 246
+          Height = 192
-          Top = 10
+          Top = 8
-          Width = 381
+          Width = 297
           Caption = 'Song information'
-          ClientHeight = 242
+          ClientHeight = 173
-          ClientWidth = 377
+          ClientWidth = 293
           ParentFont = False
           TabOrder = 0
           object Label15: TLabel
-            Left = 10
+            Left = 8
-            Height = 22
+            Height = 17
-            Top = 20
+            Top = 16
-            Width = 36
+            Width = 28
             Caption = 'Song'
             ParentColor = False
             ParentFont = False
           end
           object Label16: TLabel
-            Left = 9
+            Left = 7
-            Height = 22
+            Height = 17
-            Top = 62
+            Top = 48
-            Width = 39
+            Width = 30
             Caption = 'Artist'
             ParentColor = False
             ParentFont = False
           end
           object SongEdit: TEdit
-            Left = 72
+            Left = 56
-            Height = 32
+            Height = 27
             Hint = 'The name of your composition'
-            Top = 10
+            Top = 8
-            Width = 277
+            Width = 216
             MaxLength = 255
             OnChange = SongEditChange
             ParentFont = False
             TabOrder = 0
           end
           object ArtistEdit: TEdit
-            Left = 72
+            Left = 56
-            Height = 32
+            Height = 27
             Hint = 'Your name or handle'
-            Top = 51
+            Top = 40
-            Width = 277
+            Width = 216
             MaxLength = 255
             OnChange = ArtistEditChange
             ParentFont = False
             TabOrder = 1
           end
           object Label21: TLabel
-            Left = 10
+            Left = 8
-            Height = 22
+            Height = 17
-            Top = 100
+            Top = 78
-            Width = 153
+            Width = 120
             Caption = 'Tempo (ticks per row)'
             ParentColor = False
             ParentFont = False
           end
           object TicksPerRowSpinEdit: TSpinEdit
-            Left = 170
+            Left = 133
-            Height = 32
+            Height = 27
             Hint = 'How many ticks should happen before the row changes. Higher means slower.'
-            Top = 92
+            Top = 72
-            Width = 64
+            Width = 50
             MaxValue = 20
             MinValue = 1
             OnChange = TicksPerRowSpinEditChange
             Value = 7
           end
           object TimerEnabledCheckBox: TCheckBox
-            Left = 9
+            Left = 7
-            Height = 24
+            Height = 21
             Hint = 'Enable the GB hardware timer. This allows for more fine-grained tempo control.'
-            Top = 184
+            Top = 144
-            Width = 215
+            Width = 171
             Caption = 'Enable timer-based tempo'
             OnChange = TimerEnabledCheckBoxChange
             TabOrder = 3
           end
           object TimerTempoLabel: TLabel
-            Left = 10
+            Left = 8
-            Height = 22
+            Height = 17
-            Top = 144
+            Top = 112
-            Width = 154
+            Width = 120
             Caption = 'Tempo (timer divider)'
             Enabled = False
             ParentColor = False
           end
           object TimerDividerSpinEdit: TSpinEdit
-            Left = 170
+            Left = 133
-            Height = 32
+            Height = 27
             Hint = 'The "modulo" value for the GB hardware timer. Higher means faster.'
-            Top = 138
+            Top = 108
-            Width = 64
+            Width = 50
             Enabled = False
             MaxValue = 255
             OnChange = TimerDividerSpinEditChange
             TabOrder = 4
           end
           object TempoBPMLabel: TLabel
-            Left = 246
+            Left = 192
-            Height = 22
+            Height = 17
-            Top = 123
+            Top = 96
-            Width = 120
+            Width = 94
             Caption = 'TempoBPMLabel'
             ParentColor = False
           end
       end
       object PatternTabSheet: TTabSheet
         Caption = 'Patterns'
-        ClientHeight = 841
+        ClientHeight = 649
-        ClientWidth = 1408
+        ClientWidth = 1097
         ParentFont = False
         object Panel3: TPanel
-          Left = 293
+          Left = 229
-          Height = 841
+          Height = 649
           Top = 0
-          Width = 1115
+          Width = 868
           Align = alClient
-          ClientHeight = 841
+          ClientHeight = 649
-          ClientWidth = 1115
+          ClientWidth = 868
           ParentFont = False
           TabOrder = 0
           object HeaderControl1: THeaderControl
             Left = 1
-            Height = 38
+            Height = 30
             Hint = 'Left click to mute, right click to solo'
             Top = 1
-            Width = 1113
+            Width = 866
             DragReorder = False
             Images = ImageList2
             Sections = <
               item
                 Alignment = taLeftJustify
-                Width = 41
+                Width = 32
                 Visible = True
               end
               item
                 Alignment = taCenter
                 ImageIndex = 1
                 Text = 'Duty 1'
-                Width = 170
+                Width = 133
                 Visible = True
               end
               item
                 Alignment = taCenter
                 ImageIndex = 1
                 Text = 'Duty 2'
-                Width = 170
+                Width = 133
                 Visible = True
               end
               item
                 Alignment = taCenter
                 ImageIndex = 1
                 Text = 'Wave'
-                Width = 170
+                Width = 133
                 Visible = True
               end
               item
                 Alignment = taCenter
                 ImageIndex = 1
                 Text = 'Noise'
-                Width = 170
+                Width = 133
                 Visible = True
               end>
             OnSectionClick = HeaderControl1SectionClick
           end
           object ScrollBox1: TScrollBox
             Left = 1
-            Height = 801
+            Height = 617
-            Top = 39
+            Top = 31
-            Width = 1113
+            Width = 866
-            HorzScrollBar.Increment = 4
+            HorzScrollBar.Increment = 3
-            HorzScrollBar.Page = 41
+            HorzScrollBar.Page = 32
             HorzScrollBar.Smooth = True
             HorzScrollBar.Tracking = True
-            VertScrollBar.Increment = 6
+            VertScrollBar.Increment = 5
-            VertScrollBar.Page = 64
+            VertScrollBar.Page = 50
             VertScrollBar.Smooth = True
             VertScrollBar.Tracking = True
             Align = alClient
             BorderStyle = bsNone
-            ClientHeight = 801
+            ClientHeight = 617
-            ClientWidth = 1113
+            ClientWidth = 866
             ParentFont = False
             TabOrder = 1
             OnMouseWheelDown = ScrollBox1MouseWheelDown
             OnMouseWheelUp = ScrollBox1MouseWheelUp
             object RowNumberStringGrid: TStringGrid
               Left = 0
-              Height = 801
+              Height = 617
               Top = 0
-              Width = 41
+              Width = 32
               Align = alLeft
               BorderStyle = bsNone
               ColCount = 1
-              DefaultColWidth = 41
+              DefaultColWidth = 32
               Enabled = False
               ParentFont = False
               RowCount = 64
         end
         object OrderEditStringGrid: TStringGrid
           Left = 0
-          Height = 841
+          Height = 649
           Top = 0
-          Width = 287
+          Width = 224
           Align = alLeft
           AutoEdit = False
           AutoFillColumns = True
           Columns = <
             item
               Alignment = taCenter
-              MinSize = 42
+              MinSize = 33
-              MaxSize = 42
+              MaxSize = 33
               Title.Caption = 'Dty1'
-              Width = 47
+              Width = 35
             end
             item
               Alignment = taCenter
-              MinSize = 42
+              MinSize = 33
-              MaxSize = 42
+              MaxSize = 33
               Title.Caption = 'Dty2'
-              Width = 47
+              Width = 35
             end
             item
               Alignment = taCenter
-              MinSize = 42
+              MinSize = 33
-              MaxSize = 42
+              MaxSize = 33
               Title.Caption = 'Wav'
-              Width = 47
+              Width = 35
             end
             item
               Alignment = taCenter
-              MinSize = 42
+              MinSize = 33
-              MaxSize = 42
+              MaxSize = 33
               Title.Caption = 'Nse'
-              Width = 47
+              Width = 38
             end>
-          DefaultColWidth = 22
+          DefaultColWidth = 17
-          DefaultRowHeight = 27
+          DefaultRowHeight = 21
           ExtendedSelect = False
           Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goRangeSelect, goRowMoving, goEditing, goTabs, goSmoothScroll, goFixedRowNumbering, goRowHighlight]
           ParentFont = False
           OnMouseDown = OrderEditStringGridMouseDown
           OnValidateEntry = OrderEditStringGridValidateEntry
           ColWidths = (
-            82
+            64
-            47
+            35
-            47
+            35
-            47
+            35
-            47
+            38
           )
         end
         object Splitter2: TSplitter
-          Left = 287
+          Left = 224
-          Height = 841
+          Height = 649
           Top = 0
-          Width = 6
+          Width = 5
         end
       end
       object InstrumentTabSheet: TTabSheet
         Caption = 'Instruments'
-        ClientHeight = 841
+        ClientHeight = 649
-        ClientWidth = 1408
+        ClientWidth = 1097
         ParentFont = False
         object FlowPanel1: TFlowPanel
           Left = 0
-          Height = 841
+          Height = 649
           Top = 0
-          Width = 1203
+          Width = 937
           Align = alClient
           AutoSize = True
           BevelOuter = bvNone
           ParentFont = False
           TabOrder = 0
           object InstrumentGroupBox: TGroupBox
-            Left = 9
+            Left = 7
-            Height = 350
+            Height = 273
-            Top = 9
+            Top = 7
-            Width = 359
+            Width = 280
             Anchors = []
-            BorderSpacing.Left = 9
+            BorderSpacing.Left = 7
-            BorderSpacing.Top = 9
+            BorderSpacing.Top = 7
-            BorderSpacing.Right = 9
+            BorderSpacing.Right = 7
-            BorderSpacing.Bottom = 9
+            BorderSpacing.Bottom = 7
             Caption = 'Instrument'
-            ClientHeight = 326
+            ClientHeight = 269
-            ClientWidth = 355
+            ClientWidth = 276
             ParentFont = False
             TabOrder = 0
             object InstrumentNumberSpinner: TSpinEdit
-              Left = 102
+              Left = 80
-              Height = 32
+              Height = 27
               Hint = 'What instrument to edit'
-              Top = 49
+              Top = 38
-              Width = 240
+              Width = 187
               MaxValue = 15
               MinValue = 1
               OnChange = InstrumentNumberSpinnerChange
               Value = 1
             end
             object Label1: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 59
+              Top = 46
-              Width = 83
+              Width = 62
               Caption = 'Instrument'
               ParentColor = False
               ParentFont = False
             end
             object Label2: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 100
+              Top = 78
-              Width = 44
+              Width = 34
               Caption = 'Name'
               ParentColor = False
               ParentFont = False
             end
             object InstrumentNameEdit: TEdit
-              Left = 102
+              Left = 80
-              Height = 32
+              Height = 27
               Hint = 'The name of the instrument'
-              Top = 90
+              Top = 70
-              Width = 240
+              Width = 187
               MaxLength = 255
               OnChange = InstrumentNameEditChange
               ParentFont = False
               TabOrder = 1
             end
             object Label3: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 20
+              Top = 16
-              Width = 63
+              Width = 50
               Caption = 'Channel'
               Font.Style = [fsBold]
               ParentColor = False
               ParentFont = False
             end
             object InstrumentTypeCombobox: TComboBox
-              Left = 102
+              Left = 80
-              Height = 30
+              Height = 25
               Hint = 'What type of channel this instrument will be played on'
-              Top = 10
+              Top = 8
-              Width = 237
+              Width = 185
               ItemHeight = 0
               ItemIndex = 0
               Items.Strings = (
               Text = 'Square'
             end
             object LengthEnabledCheckbox: TCheckBox
-              Left = 15
+              Left = 12
-              Height = 24
+              Height = 21
               Hint = 'Cut the sound after a certain length of time'
-              Top = 151
+              Top = 118
-              Width = 75
+              Width = 61
               Caption = 'Length'
               OnChange = LengthEnabledCheckboxChange
               ParentFont = False
               TabOrder = 3
             end
             object InstrumentImportButton: TButton
-              Left = 15
+              Left = 12
-              Height = 32
+              Height = 25
               Hint = 'Import an instrument'
-              Top = 277
+              Top = 216
-              Width = 149
+              Width = 116
               Caption = 'Import'
               OnClick = InstrumentImportButtonClick
               ParentFont = False
               TabOrder = 4
             end
             object InstrumentExportButton: TButton
-              Left = 191
+              Left = 149
-              Height = 32
+              Height = 25
               Hint = 'Export an instrument'
-              Top = 277
+              Top = 216
-              Width = 149
+              Width = 116
               Caption = 'Export'
               OnClick = InstrumentExportButtonClick
               ParentFont = False
             end
             object TestOctave5Button: TButton
               Tag = 5
-              Left = 182
+              Left = 142
-              Height = 32
+              Height = 25
               Hint = 'Test out the instrument with a C-5 note'
-              Top = 187
+              Top = 146
-              Width = 35
+              Width = 27
               Caption = '5'
               OnClick = TestOctaveButtonClick
               ParentFont = False
               TabOrder = 6
             end
             object LengthTrackbar: TTrackBar
-              Left = 97
+              Left = 76
-              Height = 55
+              Height = 43
-              Top = 144
+              Top = 112
-              Width = 242
+              Width = 189
               Max = 63
               OnChange = LengthSpinnerChange
               Position = 0
               TabOrder = 7
             end
             object Label14: TLabel
-              Left = 15
+              Left = 12
-              Height = 22
+              Height = 17
-              Top = 195
+              Top = 152
-              Width = 85
+              Width = 66
               Caption = 'Test octave:'
               ParentColor = False
               ParentFont = False
             end
             object TestOctave5Button1: TButton
               Tag = 4
-              Left = 141
+              Left = 110
-              Height = 32
+              Height = 25
               Hint = 'Test out the instrument with a C-4 note'
-              Top = 187
+              Top = 146
-              Width = 35
+              Width = 27
               Caption = '4'
               OnClick = TestOctaveButtonClick
               ParentFont = False
             end
             object TestOctave5Button2: TButton
               Tag = 3
-              Left = 100
+              Left = 78
-              Height = 32
+              Height = 25
               Hint = 'Test out the instrument with a C-3 note'
-              Top = 187
+              Top = 146
-              Width = 35
+              Width = 27
               Caption = '3'
               OnClick = TestOctaveButtonClick
               ParentFont = False
             end
             object TestOctave5Button3: TButton
               Tag = 6
-              Left = 223
+              Left = 174
-              Height = 32
+              Height = 25
               Hint = 'Test out the instrument with a C-6 note'
-              Top = 187
+              Top = 146
-              Width = 35
+              Width = 27
               Caption = '6'
               OnClick = TestOctaveButtonClick
               ParentFont = False
             end
             object TestOctave5Button4: TButton
               Tag = 7
-              Left = 264
+              Left = 206
-              Height = 32
+              Height = 25
               Hint = 'Test out the instrument with a C-7 note'
-              Top = 187
+              Top = 146
-              Width = 35
+              Width = 27
               Caption = '7'
               OnClick = TestOctaveButtonClick
               ParentFont = False
             end
             object TestOctave5Button5: TButton
               Tag = 8
-              Left = 305
+              Left = 238
-              Height = 32
+              Height = 25
               Hint = 'Test out the instrument with a C-8 note'
-              Top = 187
+              Top = 146
-              Width = 35
+              Width = 27
               Caption = '8'
               OnClick = TestOctaveButtonClick
               ParentFont = False
               TabOrder = 12
             end
             object EnableSubpatternCheckbox: TCheckBox
-              Left = 15
+              Left = 12
-              Height = 24
+              Height = 21
-              Top = 236
+              Top = 184
-              Width = 158
+              Width = 125
               Caption = 'Enable subpattern'
               OnChange = EnableSubpatternCheckboxChange
               TabOrder = 13
             end
           end
           object EnvelopeGroupBox: TGroupBox
-            Left = 386
+            Left = 301
-            Height = 174
+            Height = 136
-            Top = 9
+            Top = 7
-            Width = 746
+            Width = 582
             Anchors = []
-            BorderSpacing.Left = 9
+            BorderSpacing.Left = 7
-            BorderSpacing.Top = 9
+            BorderSpacing.Top = 7
-            BorderSpacing.Right = 9
+            BorderSpacing.Right = 7
-            BorderSpacing.Bottom = 9
+            BorderSpacing.Bottom = 7
             Caption = 'Envelope'
-            ClientHeight = 150
+            ClientHeight = 132
-            ClientWidth = 742
+            ClientWidth = 578
             ParentFont = False
             TabOrder = 1
             object Label4: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 20
+              Top = 16
-              Width = 64
+              Width = 49
               Caption = 'Start vol.'
               ParentColor = False
               ParentFont = False
             end
             object Label5: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 69
+              Top = 54
-              Width = 66
+              Width = 51
               Caption = 'Direction'
               ParentColor = False
               ParentFont = False
             end
             object DirectionComboBox: TComboBox
-              Left = 105
+              Left = 82
-              Height = 30
+              Height = 25
               Hint = 'Whether to fade the sound in or out'
-              Top = 59
+              Top = 46
-              Width = 254
+              Width = 198
               ItemHeight = 0
               ItemIndex = 1
               Items.Strings = (
               Text = 'Down'
             end
             object Label6: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 115
+              Top = 90
-              Width = 57
+              Width = 43
               Caption = 'Change'
               ParentColor = False
               ParentFont = False
             end
             object Panel5: TPanel
-              Left = 384
+              Left = 300
-              Height = 133
+              Height = 104
               Top = 0
-              Width = 346
+              Width = 270
               BevelOuter = bvLowered
-              ClientHeight = 133
+              ClientHeight = 100
-              ClientWidth = 346
+              ClientWidth = 266
               ParentFont = False
               TabOrder = 1
               object EnvelopePaintbox: TPaintBox
                 Left = 1
-                Height = 131
+                Height = 98
                 Hint = 'Preview of the volume envelope'
                 Top = 1
-                Width = 344
+                Width = 264
                 Align = alClient
                 ParentFont = False
                 OnPaint = EnvelopePaintboxPaint
               end
             end
             object StartVolTrackbar: TTrackBar
-              Left = 105
+              Left = 82
-              Height = 55
+              Height = 43
-              Top = 10
+              Top = 8
-              Width = 251
+              Width = 196
               Max = 15
               OnChange = StartVolSpinnerChange
               Position = 0
               TabOrder = 2
             end
             object EnvChangeTrackbar: TTrackBar
-              Left = 105
+              Left = 82
-              Height = 55
+              Height = 43
-              Top = 105
+              Top = 82
-              Width = 251
+              Width = 196
               Max = 7
               OnChange = EnvChangeSpinnerChange
               Position = 0
             end
           end
           object SquareGroupBox: TGroupBox
-            Left = 9
+            Left = 7
-            Height = 217
+            Height = 169
-            Top = 377
+            Top = 294
-            Width = 409
+            Width = 319
             Anchors = []
-            BorderSpacing.Left = 9
+            BorderSpacing.Left = 7
-            BorderSpacing.Top = 9
+            BorderSpacing.Top = 7
-            BorderSpacing.Right = 9
+            BorderSpacing.Right = 7
-            BorderSpacing.Bottom = 9
+            BorderSpacing.Bottom = 7
             Caption = 'Square'
-            ClientHeight = 193
+            ClientHeight = 165
-            ClientWidth = 405
+            ClientWidth = 315
             ParentFont = False
             TabOrder = 2
             object Label7: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 20
+              Top = 16
-              Width = 84
+              Width = 65
               Caption = 'Sweep time'
               ParentColor = False
               ParentFont = False
             end
             object SweepTimeCombobox: TComboBox
-              Left = 133
+              Left = 104
-              Height = 30
+              Height = 25
               Hint = 'How long to sweep'
-              Top = 10
+              Top = 8
-              Width = 256
+              Width = 200
               ItemHeight = 0
               ItemIndex = 0
               Items.Strings = (
               Text = 'Off - no frequency change'
             end
             object SweepDirectionCombobox: TComboBox
-              Left = 133
+              Left = 104
-              Height = 30
+              Height = 25
               Hint = 'The direction of the sweep'
-              Top = 51
+              Top = 40
-              Width = 256
+              Width = 200
               ItemHeight = 0
               ItemIndex = 1
               Items.Strings = (
               Text = 'Down'
             end
             object Label8: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 62
+              Top = 48
-              Width = 115
+              Width = 89
               Caption = 'Sweep direction'
               ParentColor = False
               ParentFont = False
             end
             object Label9: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 113
+              Top = 88
-              Width = 78
+              Width = 62
               Caption = 'Sweep size'
               ParentColor = False
               ParentFont = False
             end
             object Label10: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 154
+              Top = 120
-              Width = 35
+              Width = 26
               Caption = 'Duty'
               ParentColor = False
               ParentFont = False
             end
             object DutyCombobox: TComboBox
-              Left = 133
+              Left = 104
-              Height = 30
+              Height = 25
               Hint = 'Which duty cycle to use (changes timbre of wave)'
-              Top = 144
+              Top = 112
-              Width = 256
+              Width = 200
               ItemHeight = 0
               ItemIndex = 2
               Items.Strings = (
               Text = '50% (square)'
             end
             object SweepSizeTrackbar: TTrackBar
-              Left = 135
+              Left = 105
-              Height = 55
+              Height = 43
-              Top = 102
+              Top = 80
-              Width = 251
+              Width = 196
               Max = 7
               OnChange = SweepSizeSpinnerChange
               Position = 0
             end
           end
           object WaveGroupBox: TGroupBox
-            Left = 436
+            Left = 340
-            Height = 217
+            Height = 169
-            Top = 377
+            Top = 294
-            Width = 381
+            Width = 297
             Anchors = []
-            BorderSpacing.Left = 9
+            BorderSpacing.Left = 7
-            BorderSpacing.Top = 9
+            BorderSpacing.Top = 7
-            BorderSpacing.Right = 9
+            BorderSpacing.Right = 7
-            BorderSpacing.Bottom = 9
+            BorderSpacing.Bottom = 7
             Caption = 'Wave'
-            ClientHeight = 193
+            ClientHeight = 165
-            ClientWidth = 377
+            ClientWidth = 293
             ParentFont = False
             TabOrder = 3
             object Label11: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 20
+              Top = 16
-              Width = 55
+              Width = 42
               Caption = 'Volume'
               ParentColor = False
               ParentFont = False
             end
             object Label12: TLabel
-              Left = 10
+              Left = 8
-              Height = 22
+              Height = 17
-              Top = 62
+              Top = 48
-              Width = 74
+              Width = 58
               Caption = 'Waveform'
               ParentColor = False
               ParentFont = False
             end
             object WaveformCombobox: TComboBox
-              Left = 133
+              Left = 104
-              Height = 30
+              Height = 25
               Hint = 'Which waveform is associated with this instrument'
-              Top = 51
+              Top = 40
-              Width = 226
+              Width = 176
               ItemHeight = 0
               ItemIndex = 0
               Items.Strings = (
               Text = 'Wave #0'
             end
             object Panel4: TPanel
-              Left = 10
+              Left = 8
-              Height = 76
+              Height = 59
-              Top = 102
+              Top = 80
-              Width = 348
+              Width = 272
               BevelOuter = bvLowered
-              ClientHeight = 76
+              ClientHeight = 55
-              ClientWidth = 348
+              ClientWidth = 268
               ParentFont = False
               TabOrder = 1
               object WavePaintbox: TPaintBox
                 Left = 1
-                Height = 74
+                Height = 53
                 Hint = 'Preview of the waveform associated with this instrument'
                 Top = 1
-                Width = 346
+                Width = 266
                 Align = alClient
                 Color = clBlack
                 ParentColor = False
               end
             end
             object WaveVolumeCombobox: TComboBox
-              Left = 133
+              Left = 104
-              Height = 30
+              Height = 25
               Hint = 'The initial volume of the wave'
-              Top = 10
+              Top = 8
-              Width = 226
+              Width = 176
               ItemHeight = 0
               ItemIndex = 1
               Items.Strings = (
             end
           end
           object NoiseGroupBox: TGroupBox
-            Left = 835
+            Left = 651
-            Height = 76
+            Height = 59
-            Top = 377
+            Top = 294
-            Width = 304
+            Width = 237
             Anchors = []
-            BorderSpacing.Left = 9
+            BorderSpacing.Left = 7
-            BorderSpacing.Top = 9
+            BorderSpacing.Top = 7
-            BorderSpacing.Right = 9
+            BorderSpacing.Right = 7
-            BorderSpacing.Bottom = 9
+            BorderSpacing.Bottom = 7
             Caption = 'Noise'
-            ClientHeight = 52
+            ClientHeight = 40
-            ClientWidth = 300
+            ClientWidth = 233
             ParentFont = False
             TabOrder = 4
             object SevenBitCounterCheckbox: TCheckBox
-              Left = 10
+              Left = 8
-              Height = 24
+              Height = 21
               Hint = 'Select LFSR width. When checked, output will sound like a tone rather than noise'
-              Top = 10
+              Top = 8
-              Width = 290
+              Width = 224
               Alignment = taLeftJustify
               Caption = '7 bit counter (more tone-like output)'
               OnChange = SevenBitCounterCheckboxChange
           end
         end
         object SubpatternGroupBox: TGroupBox
-          Left = 1203
+          Left = 937
-          Height = 832
+          Height = 642
-          Top = 9
+          Top = 7
-          Width = 205
+          Width = 160
           Align = alRight
           Anchors = []
-          BorderSpacing.Top = 9
+          BorderSpacing.Top = 7
           Caption = 'Subpattern'
-          ClientHeight = 808
+          ClientHeight = 623
-          ClientWidth = 201
+          ClientWidth = 156
           TabOrder = 1
           object ScrollBox2: TScrollBox
             Left = 0
-            Height = 808
+            Height = 623
             Top = 0
-            Width = 201
+            Width = 156
-            HorzScrollBar.Increment = 4
+            HorzScrollBar.Increment = 3
-            HorzScrollBar.Page = 41
+            HorzScrollBar.Page = 32
             HorzScrollBar.Smooth = True
             HorzScrollBar.Tracking = True
-            VertScrollBar.Increment = 6
+            VertScrollBar.Increment = 5
-            VertScrollBar.Page = 64
+            VertScrollBar.Page = 50
             VertScrollBar.Smooth = True
             VertScrollBar.Tracking = True
             Align = alClient
             BorderStyle = bsNone
-            ClientHeight = 808
+            ClientHeight = 623
-            ClientWidth = 201
+            ClientWidth = 156
             TabOrder = 0
             OnMouseWheelDown = ScrollBox1MouseWheelDown
             OnMouseWheelUp = ScrollBox1MouseWheelUp
             object RowNumberStringGrid1: TStringGrid
-              Left = 160
+              Left = 124
-              Height = 808
+              Height = 623
               Top = 0
-              Width = 41
+              Width = 32
               Align = alRight
               BorderStyle = bsNone
               ColCount = 1
-              DefaultColWidth = 41
+              DefaultColWidth = 32
               Enabled = False
               ParentFont = False
               RowCount = 32
       end
       object WavesTabSheet: TTabSheet
         Caption = 'Waves'
-        ClientHeight = 841
+        ClientHeight = 649
-        ClientWidth = 1408
+        ClientWidth = 1097
         ParentFont = False
         object WaveEditPaintBox: TPaintBox
           AnchorSideTop.Control = WaveEditGroupBox
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 636
+          Height = 489
-          Top = 205
+          Top = 160
-          Width = 1408
+          Width = 1097
           Align = alBottom
           Anchors = [akTop, akLeft, akRight, akBottom]
-          BorderSpacing.Top = 17
+          BorderSpacing.Top = 13
           ParentFont = False
           PopupMenu = WaveEditPopup
           OnMouseDown = WaveEditPaintBoxMouseDown
           OnPaint = WaveEditPaintBoxPaint
         end
         object WaveEditGroupBox: TGroupBox
-          Left = 10
+          Left = 8
-          Height = 178
+          Height = 139
-          Top = 10
+          Top = 8
-          Width = 728
+          Width = 568
           Caption = 'Wave Editor'
-          ClientHeight = 174
+          ClientHeight = 135
-          ClientWidth = 724
+          ClientWidth = 564
           ParentFont = False
           TabOrder = 0
           object Label20: TLabel
-            Left = 20
+            Left = 16
-            Height = 22
+            Height = 17
-            Top = 20
+            Top = 16
-            Width = 40
+            Width = 31
             Caption = 'Wave'
             ParentColor = False
             ParentFont = False
           end
           object WaveEditNumberSpinner: TSpinEdit
-            Left = 82
+            Left = 64
-            Height = 32
+            Height = 27
-            Top = 10
+            Top = 8
-            Width = 102
+            Width = 80
             MaxValue = 15
             OnChange = WaveEditNumberSpinnerChange
             ParentFont = False
             TabOrder = 0
           end
           object ImportWaveButton: TButton
-            Left = 20
+            Left = 16
-            Height = 32
+            Height = 25
             Hint = 'Import a wave'
-            Top = 62
+            Top = 48
-            Width = 188
+            Width = 147
             Caption = 'Import'
             OnClick = ImportWaveButtonClick
             ParentFont = False
             TabOrder = 1
           end
           object ExportWaveButton: TButton
-            Left = 20
+            Left = 16
-            Height = 32
+            Height = 25
             Hint = 'Export a wave'
-            Top = 102
+            Top = 80
-            Width = 188
+            Width = 147
             Caption = 'Export'
             OnClick = ExportWaveButtonClick
             ParentFont = False
             TabOrder = 2
           end
           object HexWaveEdit: TEdit
-            Left = 369
+            Left = 288
-            Height = 32
+            Height = 27
-            Top = 10
+            Top = 8
-            Width = 338
+            Width = 264
             MaxLength = 32
             OnChange = HexWaveEditEditingDone
             OnEditingDone = HexWaveEditEditingDone
             TabOrder = 3
           end
           object Label13: TLabel
-            Left = 226
+            Left = 176
-            Height = 22
+            Height = 17
-            Top = 20
+            Top = 16
-            Width = 140
+            Width = 108
             Caption = 'Hex representation'
             ParentColor = False
             ParentFont = False
           end
           object PlayWaveWhileDrawingCheckbox: TCheckBox
-            Left = 226
+            Left = 176
-            Height = 24
+            Height = 21
-            Top = 51
+            Top = 40
-            Width = 201
+            Width = 158
             Caption = 'Play wave while drawing'
             ParentFont = False
             TabOrder = 4
       end
       object CommentsTabSheet: TTabSheet
         Caption = 'Comments'
-        ClientHeight = 841
+        ClientHeight = 649
-        ClientWidth = 1408
+        ClientWidth = 1097
         ParentFont = False
         object CommentMemo: TMemo
           AnchorSideTop.Control = Label17
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 792
+          Height = 611
           Hint = 'The comments section for your song. Greetings/links/etc'
-          Top = 49
+          Top = 38
-          Width = 1408
+          Width = 1097
           Align = alBottom
           Anchors = [akTop, akLeft, akRight, akBottom]
-          BorderSpacing.Top = 17
+          BorderSpacing.Top = 13
           MaxLength = 255
           OnChange = CommentMemoChange
           ParentFont = False
           TabOrder = 0
         end
         object Label17: TLabel
-          Left = 10
+          Left = 8
-          Height = 22
+          Height = 17
-          Top = 10
+          Top = 8
-          Width = 463
+          Width = 351
           Caption = 'This is an area to write comments for anyone editing your tune.'
           ParentColor = False
           ParentFont = False
       end
       object RoutinesTabSheet: TTabSheet
         Caption = 'Routines'
-        ClientHeight = 841
+        ClientHeight = 649
-        ClientWidth = 1408
+        ClientWidth = 1097
         ParentFont = False
         inline RoutineSynedit: TSynEdit
           AnchorSideTop.Control = Label19
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 685
+          Height = 528
-          Top = 156
+          Top = 121
-          Width = 1408
+          Width = 1097
           Align = alBottom
-          BorderSpacing.Top = 17
+          BorderSpacing.Top = 13
           Anchors = [akTop, akLeft, akRight, akBottom]
-          Font.Height = -17
+          Font.Height = -13
           Font.Name = 'Courier New'
           Font.Pitch = fpFixed
           Font.Quality = fqNonAntialiased
           ParentColor = False
           ParentFont = False
           TabOrder = 0
-          Gutter.Width = 73
+          Gutter.Width = 57
           Gutter.MouseActions = <>
           RightGutter.Width = 0
           RightGutter.MouseActions = <>
           OnChange = RoutineSyneditChange
           inline SynLeftGutterPartList1: TSynGutterPartList
             object SynGutterMarks1: TSynGutterMarks
-              Width = 31
+              Width = 24
               MouseActions = <>
             end
             object SynGutterLineNumber1: TSynGutterLineNumber
-              Width = 21
+              Width = 17
               MouseActions = <>
               MarkupInfo.Background = clBtnFace
               MarkupInfo.Foreground = clNone
               LeadingZeros = False
             end
             object SynGutterChanges1: TSynGutterChanges
-              Width = 5
+              Width = 4
               MouseActions = <>
               ModifiedColor = 59900
               SavedColor = clGreen
             end
             object SynGutterSeparator1: TSynGutterSeparator
-              Width = 3
+              Width = 2
               MouseActions = <>
               MarkupInfo.Background = clWhite
               MarkupInfo.Foreground = clGray
             end
             object SynGutterCodeFolding1: TSynGutterCodeFolding
-              Width = 13
               MouseActions = <>
               MarkupInfo.Background = clNone
               MarkupInfo.Foreground = clGray
           end
         end
         object Label18: TLabel
-          Left = 10
+          Left = 8
-          Height = 22
+          Height = 17
-          Top = 20
+          Top = 16
-          Width = 58
+          Width = 42
           Caption = 'Routine'
           ParentColor = False
           ParentFont = False
         end
         object RoutineNumberSpinner: TSpinEdit
-          Left = 82
+          Left = 64
-          Height = 32
+          Height = 27
-          Top = 10
+          Top = 8
-          Width = 226
+          Width = 176
           MaxValue = 15
           OnChange = RoutineNumberSpinnerChange
           ParentFont = False
           Value = 1
         end
         object Label19: TLabel
-          Left = 10
+          Left = 8
-          Height = 88
+          Height = 68
-          Top = 51
+          Top = 40
-          Width = 695
+          Width = 531
           Caption = 'Routines are an advanced feature of hUGETracker, and you likely won''t need them at all'#13#10'if you are only interested in composing music. If you want to create a custom effect, or interface'#13#10'with game code that you''re writing a soundtrack for, then routines will come in handy.'#13#10#13#10'Refer to the user manual for more information!'
           ParentColor = False
           ParentFont = False
   end
   object ScopesPanel: TPanel
     Left = 0
-    Height = 82
+    Height = 64
-    Top = 34
+    Top = 29
-    Width = 1667
+    Width = 1301
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 82
+    ClientHeight = 64
-    ClientWidth = 1667
+    ClientWidth = 1301
     ParentFont = False
     TabOrder = 3
     object LEDMeter1: TLEDMeter
       AnchorSideRight.Control = Duty1Visualizer
       Left = 0
-      Height = 41
+      Height = 32
-      Top = 41
+      Top = 32
-      Width = 659
+      Width = 513
       Anchors = [akTop, akLeft, akRight]
       BevelStyle = bvLowered
       Colors.Border = 2168839
     object LEDMeter2: TLEDMeter
       AnchorSideRight.Control = Duty1Visualizer
       Left = 0
-      Height = 41
+      Height = 32
       Top = 0
-      Width = 659
+      Width = 513
       Anchors = [akTop, akLeft, akRight]
       BevelStyle = bvLowered
       Colors.Border = 2168839
       Section3Value = 48
     end
     object Duty1Visualizer: TPaintBox
-      Left = 659
+      Left = 513
-      Height = 82
+      Height = 64
       Top = 0
-      Width = 252
+      Width = 197
       Align = alRight
       ParentFont = False
       OnClick = Duty1VisualizerClick
       OnPaint = Duty1VisualizerPaint
     end
     object Duty2Visualizer: TPaintBox
-      Left = 911
+      Left = 710
-      Height = 82
+      Height = 64
       Top = 0
-      Width = 252
+      Width = 197
       Align = alRight
       ParentFont = False
       OnClick = Duty1VisualizerClick
       OnPaint = Duty2VisualizerPaint
     end
     object WaveVisualizer: TPaintBox
-      Left = 1163
+      Left = 907
-      Height = 82
+      Height = 64
       Top = 0
-      Width = 252
+      Width = 197
       Align = alRight
       ParentFont = False
       OnClick = Duty1VisualizerClick
       OnPaint = WaveVisualizerPaint
     end
     object NoiseVisualizer: TPaintBox
-      Left = 1415
+      Left = 1104
-      Height = 82
+      Height = 64
       Top = 0
-      Width = 252
+      Width = 197
       Align = alRight
       ParentFont = False
       OnClick = Duty1VisualizerClick
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 26
+    Height = 21
-    Top = 997
+    Top = 777
-    Width = 1667
+    Width = 1301
     AutoHint = True
     Panels = <
       item
-        Width = 598
+        Width = 467
       end
       item
-        Width = 256
+        Width = 200
       end
       item
-        Width = 256
+        Width = 200
       end>
     ParentFont = False
     ParentShowHint = False
   end
   object ToolBar1: TToolBar
     Left = 0
-    Height = 34
+    Height = 29
     Top = 0
-    Width = 1667
+    Width = 1301
     AutoSize = True
     Caption = 'ToolBar1'
     EdgeBorders = [ebBottom]
       ParentShowHint = False
     end
     object PanicToolButton: TToolButton
-      Left = 585
+      Left = 495
       Hint = 'Stops all sound output'
       Top = 0
       AutoSize = True
       ShowHint = True
     end
     object ToolButton2: TToolButton
-      Left = 139
+      Left = 119
       Top = 0
       Action = PlayCursorAction
     end
     object ToolButton4: TToolButton
-      Left = 170
+      Left = 148
       Top = 0
       Action = StopAction
     end
     object ExportGBButton: TToolButton
-      Left = 242
+      Left = 214
       Hint = 'Export the song as a standalone ROM'
       Top = 0
       AutoSize = True
       OnClick = ExportGBButtonClick
     end
     object ToolButton8: TToolButton
-      Left = 103
+      Left = 86
-      Height = 28
+      Height = 22
       Top = 0
       Caption = 'ToolButton8'
       Style = tbsDivider
     end
     object ToolButton6: TToolButton
-      Left = 201
+      Left = 177
-      Height = 28
+      Height = 22
       Top = 0
       Caption = 'ToolButton6'
       Style = tbsDivider
     end
     object ToolButton7: TToolButton
-      Left = 1274
+      Left = 1037
-      Height = 28
+      Height = 22
       Top = 0
       Caption = 'ToolButton7'
       Style = tbsSeparator
     end
     object OctaveSpinEdit: TSpinEdit
-      Left = 718
+      Left = 603
-      Height = 32
+      Height = 27
       Hint = 'The octave offset for entering new notes'
       Top = 0
-      Width = 83
+      Width = 65
       MaxValue = 5
       OnChange = OctaveSpinEditChange
       ParentFont = False
       TabOrder = 0
     end
     object ToolButton9: TToolButton
-      Left = 655
+      Left = 554
-      Height = 28
+      Height = 22
       Top = 0
       Caption = 'ToolButton9'
       Style = tbsSeparator
     end
     object Label22: TLabel
-      Left = 663
+      Left = 560
-      Height = 28
+      Height = 22
       Top = 0
-      Width = 55
+      Width = 43
       AutoSize = False
       Caption = 'Octave  '
       Layout = tlCenter
       ParentFont = False
     end
     object Label23: TLabel
-      Left = 801
+      Left = 668
-      Height = 28
+      Height = 22
       Top = 0
-      Width = 90
+      Width = 70
       AutoSize = False
       Caption = '  Instrument  '
       Layout = tlCenter
       ParentFont = False
     end
     object InstrumentComboBox: TComboBox
-      Left = 891
+      Left = 738
-      Height = 30
+      Height = 25
       Hint = 'The selected instrument for new notes'
       Top = 0
-      Width = 274
+      Width = 214
       DropDownCount = 999
       ItemHeight = 0
       ItemIndex = 0
       Text = '(no instrument)'
     end
     object Label24: TLabel
-      Left = 1165
+      Left = 952
-      Height = 28
+      Height = 22
       Top = 0
-      Width = 45
+      Width = 35
       AutoSize = False
       Caption = '  Step  '
       Layout = tlCenter
       ParentFont = False
     end
     object StepSpinEdit: TSpinEdit
-      Left = 1210
+      Left = 987
-      Height = 32
+      Height = 27
       Hint = 'How many rows to step down after entering a new note'
       Top = 0
-      Width = 64
+      Width = 50
       MaxValue = 63
       OnChange = StepSpinEditChange
       ParentFont = False
       TabOrder = 2
     end
     object ToolButton3: TToolButton
-      Left = 108
+      Left = 90
       Top = 0
       Action = PlayStartAction
     end
     object ExportGBSButton: TToolButton
-      Left = 345
+      Left = 299
       Hint = 'Export the song as a GBS soundtrack'
       Top = 0
       Caption = 'Export GBS'
       OnClick = ExportGBSButtonClick
     end
     object ToolButton5: TToolButton
-      Left = 580
+      Left = 491
-      Height = 28
+      Height = 22
       Top = 0
       Caption = 'ToolButton5'
       Style = tbsDivider
     end
     object ToolButton10: TToolButton
-      Left = 456
+      Left = 391
       Hint = 'Export the song as WAV or MP3'
       Top = 0
       Caption = 'Render Song'
       OnClick = ToolButton10Click
     end
     object ToolButton11: TToolButton
-      Left = 237
+      Left = 210
-      Height = 28
+      Height = 22
       Top = 0
       Caption = 'ToolButton11'
       Style = tbsDivider
     end
     object LoopSongToolButton: TToolButton
-      Left = 206
+      Left = 181
       Top = 0
       ImageIndex = 87
       OnClick = LoopSongToolButtonClick
   end
   object MainMenu1: TMainMenu
     Images = ImageList1
-    Left = 51
+    Left = 40
-    Top = 41
+    Top = 32
     object MenuItem1: TMenuItem
       Caption = 'File'
       object MenuItem33: TMenuItem
   end
   object MenuBarActionList: TActionList
     Images = ImageList1
-    Left = 133
+    Left = 104
-    Top = 92
+    Top = 72
     object FileOpen1: TFileOpen
       Category = 'File'
       Caption = '&Open ...'
     end
   end
   object ImageList1: TImageList
-    Left = 195
+    Left = 152
-    Top = 41
+    Top = 32
     Bitmap = {
       4C7A5C0000001000000010000000132900000000000078DAED5D077C1545FE9F
       24A89CA2A814B1DC5FEE3C3D15C1029E200A51BA078228081A44AAC22145448A
   end
   object OpenDialog1: TOpenDialog
     Filter = 'hUGETracker Instruments|*.ugi'
-    Left = 103
+    Left = 80
-    Top = 72
+    Top = 56
   end
   object InstrumentSaveDialog: TSaveDialog
     Filter = 'hUGETracker Instruments|*.ugi'
-    Left = 103
+    Left = 80
-    Top = 72
+    Top = 56
   end
   object OrderEditPopup: TPopupMenu
-    Left = 164
+    Left = 128
-    Top = 51
+    Top = 40
     object MenuItem17: TMenuItem
       Caption = 'Insert new row'
       Hint = 'Insert a new row filled with brand new patterns'
   object ImageList2: TImageList
     Height = 32
     Width = 32
-    Left = 62
+    Left = 48
-    Top = 110
+    Top = 86
     Bitmap = {
       4C7A020000002000000020000000400200000000000078DAED98818EC3200886
       7DF4BED9F666DE6CA54504048BBDE572246659B7F503A4C8BF94662CE77EAD34
     Enabled = False
     Interval = 200
     OnTimer = OscilloscopeUpdateTimerTimer
-    Left = 113
+    Left = 88
-    Top = 62
+    Top = 48
   end
   object GBSSaveDialog: TSaveDialog
     Filter = 'Gameboy Soundtrack|*.gbs'
-    Left = 369
+    Left = 288
-    Top = 31
+    Top = 24
   end
   object WaveSaveDialog: TSaveDialog
     Filter = 'hUGETracker Waves|*.ugw'
-    Left = 472
+    Left = 368
-    Top = 31
+    Top = 24
   end
   object GBSaveDialog: TSaveDialog
     Filter = 'Gameboy ROM|*.gb'
-    Left = 420
+    Left = 328
-    Top = 31
+    Top = 24
   end
   object NoteHaltTimer: TTimer
     Enabled = False
     OnTimer = NoteHaltTimerTimer
-    Left = 103
+    Left = 80
-    Top = 110
+    Top = 86
   end
   object TrackerGridPopup: TPopupMenu
-    Left = 123
+    Left = 96
-    Top = 31
+    Top = 24
     object TrackerPopupEditEffect: TMenuItem
       Caption = 'Edit effect ...'
       OnClick = TrackerPopupEditEffectClick
   object WavSaveDialog: TSaveDialog
     DefaultExt = '.wav'
     Filter = 'Wave files|*.wav'
-    Left = 523
+    Left = 408
-    Top = 31
+    Top = 24
   end
   object SynAnySyn1: TSynAnySyn
     Enabled = False
     Entity = False
     DollarVariables = False
     ActiveDot = False
-    Left = 10
+    Left = 8
-    Top = 110
+    Top = 86
   end
   object MODOpenDialog: TOpenDialog
     DefaultExt = '.mod'
     Filter = 'GBT Player MOD files|*.mod'
-    Left = 605
+    Left = 472
-    Top = 31
+    Top = 24
   end
   object WaveEditPopup: TPopupMenu
-    Left = 10
+    Left = 8
-    Top = 41
+    Top = 32
     object MenuItem37: TMenuItem
       Caption = 'Copy'
       OnClick = MenuItem37Click
   end
   object ShortcutsActionList: TActionList
     Images = ImageList1
-    Left = 267
+    Left = 208
-    Top = 41
+    Top = 32
     object PlayStartAction: TAction
       DisableIfNoHandler = False
       Hint = 'Play song from start'
   end
   object GBDKCSaveDialog: TSaveDialog
     Filter = 'GBDK C File|*.c'
-    Left = 318
+    Left = 248
-    Top = 31
+    Top = 24
   end
   object RGBDSAsmSaveDialog: TSaveDialog
     Filter = 'RGBDS Assembly|*.asm'
-    Left = 349
+    Left = 272
-    Top = 62
+    Top = 48
   end
   object VGMSaveDialog: TSaveDialog
     Filter = 'VGM Rip|*.vgm'
-    Left = 456
+    Left = 356
-    Top = 67
+    Top = 52
   end
   object TBMOpenDialog: TOpenDialog
     DefaultExt = '.tbm'
     Filter = 'TrackerBoy TBM files|*.tbm'
-    Left = 605
+    Left = 472
-    Top = 82
+    Top = 64
   end
 end

Modifiedsrc/tracker.pas +11−1

 procedure TfrmTracker.InstrumentImportButtonClick(Sender: TObject);
 var
   F: file of TInstrument;
+  I: TInstrument;
 begin
   OpenDialog1.Filter := 'hUGETracker instruments|*.ugi';
   if OpenDialog1.Execute then begin
     AssignFile(F, OpenDialog1.FileName);
     Reset(F);
-    Read(F, CurrentInstrument^);
+    Read(F, I);
     CloseFile(F);
+    if CurrentInstrument^.Type_ <> I.Type_ then
+      ShowMessage('The selected instrument is not for this channel type.')
+    else begin
+      CurrentInstrument^ := I;
+      // Refresh the UI
+      LoadInstrument(CurrentInstrumentBank, InstrumentNumberSpinner.Value);
+    end;
   end;
 end;

Commit ce24f3a

Commit `ce24f3a`