Commit 2d0656f

Nick committed on
WIP color stuf
commit 2d0656fc6195a7961c236c95ba88e02c56792cc9 parent c15e978
2 changed files +435−98
Modifiedoptions.lfm +402−97
@@ -1,31 +1,22 @@
1 object frmOptions: TfrmOptions 1 object frmOptions: TfrmOptions
2 Left = 1806 2 Left = 1947
3 Height = 641 3 Height = 683
4 Top = 123 4 Top = 135
5 Width = 305 5 Width = 927
6 BorderStyle = bsDialog 6 BorderStyle = bsDialog
7 Caption = 'Options' 7 Caption = 'Options'
8 ClientHeight = 641 8 ClientHeight = 683
9 ClientWidth = 305 9 ClientWidth = 927
10 OnClose = FormClose 10 OnClose = FormClose
11 OnCreate = FormCreate 11 OnCreate = FormCreate
12 Position = poMainFormCenter 12 Position = poMainFormCenter
13 LCLVersion = '2.0.11.0' 13 LCLVersion = '2.0.12.0'
14 object Label1: TLabel
15 Left = 14
16 Height = 15
17 Top = 14
18 Width = 119
19 Caption = 'Pattern editor font size'
20 ParentColor = False
21 ParentFont = False
22 end
23 object Button1: TButton 14 object Button1: TButton
24 AnchorSideRight.Side = asrBottom 15 AnchorSideRight.Side = asrBottom
25 AnchorSideBottom.Side = asrBottom 16 AnchorSideBottom.Side = asrBottom
26 Left = 169 17 Left = 791
27 Height = 25 18 Height = 25
28 Top = 602 19 Top = 644
29 Width = 123 20 Width = 123
30 Anchors = [akRight, akBottom] 21 Anchors = [akRight, akBottom]
31 Caption = 'OK' 22 Caption = 'OK'
@@ -33,43 +24,23 @@ object frmOptions: TfrmOptions
33 ParentFont = False 24 ParentFont = False
34 TabOrder = 0 25 TabOrder = 0
35 end 26 end
36 object FontSizeSpinner: TSpinEdit
37 Left = 155
38 Height = 23
39 Top = 9
40 Width = 123
41 ParentFont = False
42 TabOrder = 1
43 Value = 12
44 end
45 object ScopesCheck: TCheckBox
46 Left = 14
47 Height = 19
48 Top = 40
49 Width = 149
50 Alignment = taLeftJustify
51 Caption = 'Scopes (Uses More CPU)'
52 Checked = True
53 ParentFont = False
54 State = cbChecked
55 TabOrder = 2
56 end
57 object KeymapGroupBox: TGroupBox 27 object KeymapGroupBox: TGroupBox
58 Left = 14 28 Left = 14
59 Height = 418 29 Height = 433
60 Top = 175 30 Top = 200
61 Width = 279 31 Width = 282
62 Caption = 'Custom key map' 32 Caption = 'Custom key map'
63 ClientHeight = 398 33 ClientHeight = 413
64 ClientWidth = 275 34 ClientWidth = 278
65 Enabled = False 35 Enabled = False
66 ParentFont = False 36 ParentFont = False
67 TabOrder = 3 37 TabOrder = 1
68 object KeyMapStringGrid: TStringGrid 38 object KeyMapStringGrid: TStringGrid
39 AnchorSideBottom.Control = Button5
69 Left = 5 40 Left = 5
70 Height = 328 41 Height = 343
71 Top = 5 42 Top = 5
72 Width = 265 43 Width = 268
73 Align = alClient 44 Align = alClient
74 BorderSpacing.Bottom = 60 45 BorderSpacing.Bottom = 60
75 BorderSpacing.Around = 5 46 BorderSpacing.Around = 5
@@ -90,94 +61,428 @@ object frmOptions: TfrmOptions
90 OnValidateEntry = KeyMapStringGridValidateEntry 61 OnValidateEntry = KeyMapStringGridValidateEntry
91 end 62 end
92 object Button2: TButton 63 object Button2: TButton
93 Left = 8 64 AnchorSideBottom.Side = asrBottom
65 Left = 9
94 Height = 25 66 Height = 25
95 Top = 362 67 Top = 377
96 Width = 131 68 Width = 131
69 Anchors = [akBottom]
97 Caption = 'Load' 70 Caption = 'Load'
98 OnClick = Button2Click 71 OnClick = Button2Click
99 ParentFont = False 72 ParentFont = False
100 TabOrder = 1 73 TabOrder = 1
101 end 74 end
102 object Button3: TButton 75 object Button3: TButton
103 Left = 144 76 AnchorSideBottom.Side = asrBottom
77 Left = 143
104 Height = 25 78 Height = 25
105 Top = 362 79 Top = 377
106 Width = 126 80 Width = 126
81 Anchors = [akBottom]
107 Caption = 'Save' 82 Caption = 'Save'
108 OnClick = Button3Click 83 OnClick = Button3Click
109 ParentFont = False 84 ParentFont = False
110 TabOrder = 2 85 TabOrder = 2
111 end 86 end
112 object Button4: TButton 87 object Button4: TButton
113 Left = 240 88 AnchorSideRight.Control = Button3
89 AnchorSideRight.Side = asrBottom
90 AnchorSideBottom.Control = Button3
91 Left = 239
114 Height = 25 92 Height = 25
115 Top = 336 93 Top = 352
116 Width = 30 94 Width = 30
95 Anchors = [akRight, akBottom]
117 Caption = '-' 96 Caption = '-'
118 OnClick = Button4Click 97 OnClick = Button4Click
119 ParentFont = False 98 ParentFont = False
120 TabOrder = 3 99 TabOrder = 3
121 end 100 end
122 object Button5: TButton 101 object Button5: TButton
123 Left = 208 102 AnchorSideRight.Control = Button4
103 AnchorSideBottom.Control = Button3
104 Left = 209
124 Height = 25 105 Height = 25
125 Top = 336 106 Top = 352
126 Width = 30 107 Width = 30
108 Anchors = [akRight, akBottom]
127 Caption = '+' 109 Caption = '+'
128 OnClick = Button5Click 110 OnClick = Button5Click
129 ParentFont = False 111 ParentFont = False
130 TabOrder = 4 112 TabOrder = 4
131 end 113 end
132 end 114 end
133 object KeymapCheckbox: TCheckBox 115 object OptionsGroupBox: TGroupBox
134 Left = 14
135 Height = 19
136 Top = 64
137 Width = 127
138 Alignment = taLeftJustify
139 Caption = 'Use custom keymap'
140 OnChange = KeymapCheckboxChange
141 ParentFont = False
142 ParentBidiMode = False
143 TabOrder = 4
144 end
145 object PreviewWhenPlacingCheck: TCheckBox
146 Left = 14 116 Left = 14
147 Height = 19 117 Height = 184
148 Top = 91 118 Top = 8
149 Width = 192 119 Width = 298
150 Alignment = taLeftJustify 120 Caption = 'Options'
151 Caption = 'Play preview when placing notes' 121 ClientHeight = 164
152 ParentFont = False 122 ClientWidth = 294
153 TabOrder = 5 123 TabOrder = 2
124 object ScopesCheck: TCheckBox
125 Left = 14
126 Height = 19
127 Top = 8
128 Width = 149
129 Alignment = taLeftJustify
130 Caption = 'Scopes (Uses More CPU)'
131 Checked = True
132 ParentFont = False
133 State = cbChecked
134 TabOrder = 0
135 end
136 object KeymapCheckbox: TCheckBox
137 Left = 14
138 Height = 19
139 Top = 40
140 Width = 127
141 Alignment = taLeftJustify
142 Caption = 'Use custom keymap'
143 OnChange = KeymapCheckboxChange
144 ParentFont = False
145 ParentBidiMode = False
146 TabOrder = 1
147 end
148 object PreviewWhenPlacingCheck: TCheckBox
149 Left = 14
150 Height = 19
151 Top = 72
152 Width = 192
153 Alignment = taLeftJustify
154 Caption = 'Play preview when placing notes'
155 ParentFont = False
156 TabOrder = 2
157 end
158 object PreviewWhenBumpingCheck: TCheckBox
159 Left = 14
160 Height = 19
161 Top = 104
162 Width = 254
163 Alignment = taLeftJustify
164 Caption = 'Play preview when bumping notes up/down'
165 ParentFont = False
166 TabOrder = 3
167 end
168 object DisplayHexRowNumbersCheck: TCheckBox
169 Left = 14
170 Height = 19
171 Top = 136
172 Width = 262
173 Alignment = taLeftJustify
174 Caption = 'Display row numbers in hexadecimal notation'
175 ParentFont = False
176 TabOrder = 4
177 end
154 end 178 end
155 object PreviewWhenBumpingCheck: TCheckBox 179 object CustomizationGroupBox: TGroupBox
156 Left = 14 180 Left = 320
157 Height = 19 181 Height = 512
158 Top = 119 182 Top = 8
159 Width = 254 183 Width = 297
160 Alignment = taLeftJustify 184 Caption = 'Customization'
161 Caption = 'Play preview when bumping notes up/down' 185 ClientHeight = 492
162 ParentFont = False 186 ClientWidth = 293
163 TabOrder = 6 187 TabOrder = 3
188 object Label1: TLabel
189 Left = 14
190 Height = 15
191 Top = 14
192 Width = 119
193 Caption = 'Pattern editor font size'
194 ParentColor = False
195 ParentFont = False
196 end
197 object FontSizeSpinner: TSpinEdit
198 Left = 155
199 Height = 23
200 Top = 9
201 Width = 123
202 ParentFont = False
203 TabOrder = 0
204 Value = 12
205 end
206 object ColorButton1: TColorButton
207 Left = 155
208 Height = 25
209 Top = 40
210 Width = 123
211 BorderWidth = 2
212 ButtonColorSize = 16
213 ButtonColor = 8342016
214 end
215 object Label2: TLabel
216 Left = 16
217 Height = 15
218 Top = 40
219 Width = 79
220 Caption = 'Note text color'
221 ParentColor = False
222 end
223 object ColorButton2: TColorButton
224 Left = 155
225 Height = 25
226 Top = 72
227 Width = 123
228 BorderWidth = 2
229 ButtonColorSize = 16
230 ButtonColor = 8355584
231 end
232 object ColorButton3: TColorButton
233 Left = 155
234 Height = 25
235 Top = 104
236 Width = 123
237 BorderWidth = 2
238 ButtonColorSize = 16
239 ButtonColor = 4145020
240 end
241 object ColorButton4: TColorButton
242 Left = 155
243 Height = 25
244 Top = 136
245 Width = 123
246 BorderWidth = 2
247 ButtonColorSize = 16
248 ButtonColor = 25186
249 end
250 object ColorButton5: TColorButton
251 Left = 155
252 Height = 25
253 Top = 168
254 Width = 123
255 BorderWidth = 2
256 ButtonColorSize = 16
257 ButtonColor = 32550
258 end
259 object ColorButton6: TColorButton
260 Left = 155
261 Height = 25
262 Top = 200
263 Width = 123
264 BorderWidth = 2
265 ButtonColorSize = 16
266 ButtonColor = 8355584
267 end
268 object ColorButton7: TColorButton
269 Left = 155
270 Height = 25
271 Top = 232
272 Width = 123
273 BorderWidth = 2
274 ButtonColorSize = 16
275 ButtonColor = 127
276 end
277 object Label3: TLabel
278 Left = 16
279 Height = 15
280 Top = 72
281 Width = 111
282 Caption = 'Instrument text color'
283 ParentColor = False
284 end
285 object Label4: TLabel
286 Left = 16
287 Height = 15
288 Top = 104
289 Width = 114
290 Caption = 'Misc. effect text color'
291 ParentColor = False
292 end
293 object Label5: TLabel
294 Left = 16
295 Height = 15
296 Top = 136
297 Width = 113
298 Caption = 'Pitch effect text color'
299 ParentColor = False
300 end
301 object Label6: TLabel
302 Left = 16
303 Height = 15
304 Top = 168
305 Width = 126
306 Caption = 'Volume effect text color'
307 ParentColor = False
308 end
309 object Label7: TLabel
310 Left = 16
311 Height = 15
312 Top = 200
313 Width = 130
314 Caption = 'Panning effect text color'
315 ParentColor = False
316 end
317 object Label8: TLabel
318 Left = 16
319 Height = 15
320 Top = 232
321 Width = 113
322 Caption = 'Song effect text color'
323 ParentColor = False
324 end
325 object ColorButton8: TColorButton
326 Left = 155
327 Height = 25
328 Top = 264
329 Width = 123
330 BorderWidth = 2
331 ButtonColorSize = 16
332 ButtonColor = 13687777
333 end
334 object ColorButton9: TColorButton
335 Left = 155
336 Height = 25
337 Top = 296
338 Width = 123
339 BorderWidth = 2
340 ButtonColorSize = 16
341 ButtonColor = 8034729
342 end
343 object ColorButton10: TColorButton
344 Left = 155
345 Height = 25
346 Top = 328
347 Width = 123
348 BorderWidth = 2
349 ButtonColorSize = 16
350 ButtonColor = 10400960
351 end
352 object ColorButton11: TColorButton
353 Left = 155
354 Height = 25
355 Top = 360
356 Width = 123
357 BorderWidth = 2
358 ButtonColorSize = 16
359 ButtonColor = 12833240
360 end
361 object ColorButton12: TColorButton
362 Left = 155
363 Height = 25
364 Top = 392
365 Width = 123
366 BorderWidth = 2
367 ButtonColorSize = 16
368 ButtonColor = 11912654
369 end
370 object Label9: TLabel
371 Left = 16
372 Height = 15
373 Top = 264
374 Width = 64
375 Caption = 'Background'
376 ParentColor = False
377 end
378 object Label10: TLabel
379 Left = 16
380 Height = 15
381 Top = 296
382 Width = 63
383 Caption = 'Highlighted'
384 ParentColor = False
385 end
386 object Label11: TLabel
387 Left = 16
388 Height = 15
389 Top = 328
390 Width = 44
391 Caption = 'Selected'
392 ParentColor = False
393 end
394 object Label12: TLabel
395 Left = 16
396 Height = 15
397 Top = 360
398 Width = 87
399 Caption = 'Every fourth row'
400 ParentColor = False
401 end
402 object Label13: TLabel
403 Left = 14
404 Height = 15
405 Top = 392
406 Width = 102
407 Caption = 'Every sixteenth row'
408 ParentColor = False
409 end
410 object ColorButton13: TColorButton
411 Left = 155
412 Height = 25
413 Top = 424
414 Width = 123
415 BorderWidth = 2
416 ButtonColorSize = 16
417 ButtonColor = clGray
418 end
419 object ColorButton14: TColorButton
420 Left = 155
421 Height = 25
422 Top = 456
423 Width = 123
424 BorderWidth = 2
425 ButtonColorSize = 16
426 ButtonColor = 11253692
427 end
428 object Label14: TLabel
429 Left = 14
430 Height = 15
431 Top = 424
432 Width = 24
433 Caption = 'Dots'
434 ParentColor = False
435 end
436 object Label15: TLabel
437 Left = 16
438 Height = 15
439 Top = 456
440 Width = 42
441 Caption = 'Dividers'
442 ParentColor = False
443 end
164 end 444 end
165 object DisplayHexRowNumbersCheck: TCheckBox 445 object Panel1: TPanel
166 Left = 14 446 Left = 632
167 Height = 19 447 Height = 625
168 Top = 147 448 Top = 8
169 Width = 262 449 Width = 282
170 Alignment = taLeftJustify 450 BevelWidth = 3
171 Caption = 'Display row numbers in hexadecimal notation' 451 TabOrder = 4
172 ParentFont = False
173 TabOrder = 7
174 end 452 end
175 object SaveDialog1: TSaveDialog 453 object SaveDialog1: TSaveDialog
176 Left = 240 454 Left = 56
177 Top = 48 455 Top = 640
178 end 456 end
179 object OpenDialog1: TOpenDialog 457 object OpenDialog1: TOpenDialog
180 Left = 184 458 Left = 16
181 Top = 48 459 Top = 640
460 end
461 object ColorDialog1: TColorDialog
462 Color = clBlack
463 CustomColors.Strings = (
464 'ColorA=000000'
465 'ColorB=000080'
466 'ColorC=008000'
467 'ColorD=008080'
468 'ColorE=800000'
469 'ColorF=800080'
470 'ColorG=808000'
471 'ColorH=808080'
472 'ColorI=C0C0C0'
473 'ColorJ=0000FF'
474 'ColorK=00FF00'
475 'ColorL=00FFFF'
476 'ColorM=FF0000'
477 'ColorN=FF00FF'
478 'ColorO=FFFF00'
479 'ColorP=FFFFFF'
480 'ColorQ=C0DCC0'
481 'ColorR=F0CAA6'
482 'ColorS=F0FBFF'
483 'ColorT=A4A0A0'
484 )
485 Left = 96
486 Top = 640
182 end 487 end
183 end 488 end
Modifiedoptions.pas +33−1
@@ -6,7 +6,7 @@ interface
6 6
7 uses 7 uses
8 Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Spin, Grids, 8 Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, Spin, Grids,
9 LCLProc, Constants, Keymap, hUGESettings; 9 LCLProc, Buttons, ExtCtrls, Constants, Keymap, hUGESettings;
10 10
11 type 11 type
12 12
@@ -18,7 +18,39 @@ type
18 Button3: TButton; 18 Button3: TButton;
19 Button4: TButton; 19 Button4: TButton;
20 Button5: TButton; 20 Button5: TButton;
21 ColorButton1: TColorButton;
22 ColorButton10: TColorButton;
23 ColorButton11: TColorButton;
24 ColorButton12: TColorButton;
25 ColorButton13: TColorButton;
26 ColorButton14: TColorButton;
27 ColorButton2: TColorButton;
28 ColorButton3: TColorButton;
29 ColorButton4: TColorButton;
30 ColorButton5: TColorButton;
31 ColorButton6: TColorButton;
32 ColorButton7: TColorButton;
33 ColorButton8: TColorButton;
34 ColorButton9: TColorButton;
35 ColorDialog1: TColorDialog;
21 DisplayHexRowNumbersCheck: TCheckBox; 36 DisplayHexRowNumbersCheck: TCheckBox;
37 CustomizationGroupBox: TGroupBox;
38 Label10: TLabel;
39 Label11: TLabel;
40 Label12: TLabel;
41 Label13: TLabel;
42 Label14: TLabel;
43 Label15: TLabel;
44 Label2: TLabel;
45 Label3: TLabel;
46 Label4: TLabel;
47 Label5: TLabel;
48 Label6: TLabel;
49 Label7: TLabel;
50 Label8: TLabel;
51 Label9: TLabel;
52 OptionsGroupBox: TGroupBox;
53 Panel1: TPanel;
22 PreviewWhenPlacingCheck: TCheckBox; 54 PreviewWhenPlacingCheck: TCheckBox;
23 PreviewWhenBumpingCheck: TCheckBox; 55 PreviewWhenBumpingCheck: TCheckBox;
24 KeymapCheckbox: TCheckBox; 56 KeymapCheckbox: TCheckBox;