Commit 81e72d2

Nick committed on
Improving error message about Pixelite
commit 81e72d2223a5194c5c91643fe11d1c72953d7c1b parent 27a9471
4 changed files +45−35
ModifiedGBEmu.lpi +15−6
@@ -1,13 +1,11 @@
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <CONFIG> 2 <CONFIG>
3 <ProjectOptions> 3 <ProjectOptions>
4 <Version Value="12"/> 4 <Version Value="11"/>
5 <PathDelim Value="\"/> 5 <PathDelim Value="\"/>
6 <General> 6 <General>
7 <Flags>
8 <CompatibilityMode Value="True"/>
9 </Flags>
10 <SessionStorage Value="InProjectDir"/> 7 <SessionStorage Value="InProjectDir"/>
8 <MainUnit Value="0"/>
11 <Title Value="hUGETracker"/> 9 <Title Value="hUGETracker"/>
12 <Scaled Value="True"/> 10 <Scaled Value="True"/>
13 <ResourceType Value="res"/> 11 <ResourceType Value="res"/>
@@ -61,6 +59,18 @@
61 </Options> 59 </Options>
62 </Linking> 60 </Linking>
63 <Other> 61 <Other>
62 <Verbosity>
63 <ShoLineNum Value="True"/>
64 <ShowAll Value="True"/>
65 <ShowDebugInfo Value="True"/>
66 <ShowUsedFiles Value="True"/>
67 <ShowTriedFiles Value="True"/>
68 <ShowCompProc Value="True"/>
69 <ShowCond Value="True"/>
70 <ShowExecInfo Value="True"/>
71 <ShowHintsForUnusedUnitsInMainSrc Value="True"/>
72 <ShowHintsForSenderNotUsed Value="True"/>
73 </Verbosity>
64 <CustomOptions Value="-dBorland -dVer150 -dDelphi7 -dCompiler6_Up -dPUREPASCAL -CfAVX2 -CpCOREAVX2 OpCOREAVX2 -Si -Sv"/> 74 <CustomOptions Value="-dBorland -dVer150 -dDelphi7 -dCompiler6_Up -dPUREPASCAL -CfAVX2 -CpCOREAVX2 OpCOREAVX2 -Si -Sv"/>
65 </Other> 75 </Other>
66 </CompilerOptions> 76 </CompilerOptions>
@@ -74,7 +84,6 @@
74 </Target> 84 </Target>
75 <SearchPaths> 85 <SearchPaths>
76 <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/> 86 <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/>
77 <Libraries Value="linuxlibs"/>
78 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/> 87 <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
79 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/> 88 <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
80 </SearchPaths> 89 </SearchPaths>
@@ -294,7 +303,7 @@
294 </SyntaxOptions> 303 </SyntaxOptions>
295 </Parsing> 304 </Parsing>
296 <CodeGeneration> 305 <CodeGeneration>
297 <TargetCPU Value="x86_64"/> 306 <TargetCPU Value="i386"/>
298 <Optimizations> 307 <Optimizations>
299 <OptimizationLevel Value="0"/> 308 <OptimizationLevel Value="0"/>
300 </Optimizations> 309 </Optimizations>
Modifiedtracker.lfm +25−25
@@ -16,7 +16,7 @@ object frmTracker: TfrmTracker
16 OnShow = FormShow 16 OnShow = FormShow
17 Position = poDefault 17 Position = poDefault
18 ShowHint = True 18 ShowHint = True
19 LCLVersion = '2.1.0.0' 19 LCLVersion = '2.0.6.0'
20 object TreeView1: TTreeView 20 object TreeView1: TTreeView
21 Left = 0 21 Left = 0
22 Height = 820 22 Height = 820
@@ -1859,8 +1859,8 @@ object frmTracker: TfrmTracker
1859 end 1859 end
1860 object MainMenu1: TMainMenu 1860 object MainMenu1: TMainMenu
1861 Images = ImageList1 1861 Images = ImageList1
1862 Left = 616 1862 left = 616
1863 Top = 75 1863 top = 75
1864 object MenuItem1: TMenuItem 1864 object MenuItem1: TMenuItem
1865 Caption = 'File' 1865 Caption = 'File'
1866 object MenuItem12: TMenuItem 1866 object MenuItem12: TMenuItem
@@ -1960,8 +1960,8 @@ object frmTracker: TfrmTracker
1960 end 1960 end
1961 object ActionList1: TActionList 1961 object ActionList1: TActionList
1962 Images = ImageList1 1962 Images = ImageList1
1963 Left = 999 1963 left = 999
1964 Top = 75 1964 top = 75
1965 object FileOpen1: TFileOpen 1965 object FileOpen1: TFileOpen
1966 Category = 'File' 1966 Category = 'File'
1967 Caption = '&Open ...' 1967 Caption = '&Open ...'
@@ -2064,8 +2064,8 @@ object frmTracker: TfrmTracker
2064 end 2064 end
2065 end 2065 end
2066 object ImageList1: TImageList 2066 object ImageList1: TImageList
2067 Left = 233 2067 left = 233
2068 Top = 81 2068 top = 81
2069 Bitmap = { 2069 Bitmap = {
2070 4C694E0000001000000010000000000000000000000000000000000000000000 2070 4C694E0000001000000010000000000000000000000000000000000000000000
2071 0000000000000000000000000000000000000000000000000000000000000000 2071 0000000000000000000000000000000000000000000000000000000000000000
@@ -4568,17 +4568,17 @@ object frmTracker: TfrmTracker
4568 end 4568 end
4569 object OpenDialog1: TOpenDialog 4569 object OpenDialog1: TOpenDialog
4570 Filter = 'hUGETracker Instruments|*.ugi' 4570 Filter = 'hUGETracker Instruments|*.ugi'
4571 Left = 737 4571 left = 737
4572 Top = 75 4572 top = 75
4573 end 4573 end
4574 object InstrumentSaveDialog: TSaveDialog 4574 object InstrumentSaveDialog: TSaveDialog
4575 Filter = 'hUGETracker Instruments|*.ugi' 4575 Filter = 'hUGETracker Instruments|*.ugi'
4576 Left = 600 4576 left = 600
4577 Top = 177 4577 top = 177
4578 end 4578 end
4579 object OrderEditPopup: TPopupMenu 4579 object OrderEditPopup: TPopupMenu
4580 Left = 376 4580 left = 376
4581 Top = 81 4581 top = 81
4582 object MenuItem17: TMenuItem 4582 object MenuItem17: TMenuItem
4583 Caption = 'Insert new row' 4583 Caption = 'Insert new row'
4584 Hint = 'Insert a new row filled with brand new patterns' 4584 Hint = 'Insert a new row filled with brand new patterns'
@@ -4609,8 +4609,8 @@ object frmTracker: TfrmTracker
4609 object ImageList2: TImageList 4609 object ImageList2: TImageList
4610 Height = 32 4610 Height = 32
4611 Width = 32 4611 Width = 32
4612 Left = 233 4612 left = 233
4613 Top = 168 4613 top = 168
4614 Bitmap = { 4614 Bitmap = {
4615 4C69020000002000000020000000000000000000000000000000000000000000 4615 4C69020000002000000020000000000000000000000000000000000000000000
4616 0000000000000000000000000000000000000000000000000000000000000000 4616 0000000000000000000000000000000000000000000000000000000000000000
@@ -4874,28 +4874,28 @@ object frmTracker: TfrmTracker
4874 object OscilloscopeUpdateTimer: TTimer 4874 object OscilloscopeUpdateTimer: TTimer
4875 Interval = 25 4875 Interval = 25
4876 OnTimer = OscilloscopeUpdateTimerTimer 4876 OnTimer = OscilloscopeUpdateTimerTimer
4877 Left = 504 4877 left = 504
4878 Top = 81 4878 top = 81
4879 end 4879 end
4880 object GBSSaveDialog: TSaveDialog 4880 object GBSSaveDialog: TSaveDialog
4881 Filter = 'Gameboy Soundtrack|*.gbs' 4881 Filter = 'Gameboy Soundtrack|*.gbs'
4882 Left = 920 4882 left = 920
4883 Top = 177 4883 top = 177
4884 end 4884 end
4885 object WaveSaveDialog: TSaveDialog 4885 object WaveSaveDialog: TSaveDialog
4886 Filter = 'hUGETracker Waves|*.ugw' 4886 Filter = 'hUGETracker Waves|*.ugw'
4887 Left = 784 4887 left = 784
4888 Top = 168 4888 top = 168
4889 end 4889 end
4890 object GBSaveDialog: TSaveDialog 4890 object GBSaveDialog: TSaveDialog
4891 Filter = 'Gameboy ROM|*.GB' 4891 Filter = 'Gameboy ROM|*.GB'
4892 Left = 457 4892 left = 457
4893 Top = 184 4893 top = 184
4894 end 4894 end
4895 object NoteHaltTimer: TTimer 4895 object NoteHaltTimer: TTimer
4896 Enabled = False 4896 Enabled = False
4897 OnTimer = NoteHaltTimerTimer 4897 OnTimer = NoteHaltTimerTimer
4898 Left = 345 4898 left = 345
4899 Top = 177 4899 top = 177
4900 end 4900 end
4901 end 4901 end
Modifiedtracker.pas +5−4
@@ -885,10 +885,11 @@ var
885 F: file; 885 F: file;
886 Stream: TStream; 886 Stream: TStream;
887 begin 887 begin
888 if Screen.Fonts.IndexOf('Pixelite') < 0 then 888 if Screen.Fonts.IndexOf('PixeliteTTF') < 0 then
889 MessageDlg('Warning', 'You don''t have the Pixelite .TTF file in the same '+ 889 MessageDlg('Warning', 'You don''t have the Pixelite font installed. '+
890 'directory as the program, which means you likely didn''t extract the program before running.'+ 890 'On Windows, this probably means you didn''t extract hUGETracker before running it, '+
891 LineEnding+LineEnding+'Please extract, and restart!', 891 'so please extract the .zip and run again! On Linux, you need to manually install the '+
892 'font file, so please install PixeliteTTF.ttf and relaunch! Thanks.',
892 mtWarning, [mbOk], 0); 893 mtWarning, [mbOk], 0);
893 894
894 ReturnNilIfGrowHeapFails := False; 895 ReturnNilIfGrowHeapFails := False;