Skip to content

Commit

Permalink
Added in Config-form: Use libraries from system vs libraries from Str…
Browse files Browse the repository at this point in the history
…umpract release. (5)
  • Loading branch information
fredvs committed Apr 18, 2022
1 parent a70ebff commit c4d21ac
Show file tree
Hide file tree
Showing 6 changed files with 225 additions and 40 deletions.
2 changes: 1 addition & 1 deletion src/drums.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ procedure tdrumsfo.loadsoundlib(const Sender: TObject);
begin
allok := False;
resulib := -1;
ordir := msestring(IncludeTrailingBackslash(ExtractFilePath(ParamStr(0))));
ordir := msestring(IncludeTrailingBackslash(ExtractFilePath(ParamStr(0)))) ;

{$IFDEF Windows}
{$if defined(cpu64)}
Expand Down
44 changes: 44 additions & 0 deletions src/errorform.mfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
object errorfo: terrorfo
bounds_x = 482
bounds_y = 282
bounds_cx = 390
bounds_cy = 104
bounds_cxmin = 390
bounds_cymin = 104
bounds_cxmax = 390
bounds_cymax = 104
container.frame.localprops = []
container.frame.localprops1 = []
container.bounds = (
0
0
390
104
)
optionswindow = [wo_notaskbar, wo_rounded]
windowopacity = -Inf
moduleclassname = 'tmseform'
object tlabel1: tlabel
bounds_x = 85
bounds_y = 24
bounds_cx = 229
bounds_cy = 19
caption = 'Some libraries did not load...'
font.height = 16
font.name = 'stf_default'
font.localprops = [flp_height]
reffontheight = 19
end
object tlabel2: tlabel
taborder = 1
bounds_x = 81
bounds_y = 56
bounds_cx = 241
bounds_cy = 19
caption = 'The application will terminate.'
font.height = 16
font.name = 'stf_default'
font.localprops = [flp_height]
reffontheight = 19
end
end
18 changes: 18 additions & 0 deletions src/errorform.pas
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
unit errorform;
{$ifdef FPC}{$mode objfpc}{$h+}{$endif}
interface
uses
msetypes, mseglob, mseguiglob, mseguiintf, mseapplication, msestat, msemenus,
msegui,msegraphics, msegraphutils, mseevent, mseclasses, msewidgets, mseforms,
msesimplewidgets;
type
terrorfo = class(tmseform)
tlabel1: tlabel;
tlabel2: tlabel;
end;
var
errorfo: terrorfo;
implementation
uses
errorform_mfm;
end.
52 changes: 52 additions & 0 deletions src/errorform_mfm.pas
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
unit errorform_mfm;
{$ifdef FPC}{$mode objfpc}{$h+}{$endif}

interface

implementation
uses
mseclasses,errorform;

const
objdata: record size: integer; data: array[0..695] of byte end =
(size: 696; data: (
84,80,70,48,8,116,101,114,114,111,114,102,111,7,101,114,114,111,114,102,
111,8,98,111,117,110,100,115,95,120,3,226,1,8,98,111,117,110,100,115,
95,121,3,26,1,9,98,111,117,110,100,115,95,99,120,3,134,1,9,98,
111,117,110,100,115,95,99,121,2,104,12,98,111,117,110,100,115,95,99,120,
109,105,110,3,134,1,12,98,111,117,110,100,115,95,99,121,109,105,110,2,
104,12,98,111,117,110,100,115,95,99,120,109,97,120,3,134,1,12,98,111,
117,110,100,115,95,99,121,109,97,120,2,104,26,99,111,110,116,97,105,110,
101,114,46,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,
0,27,99,111,110,116,97,105,110,101,114,46,102,114,97,109,101,46,108,111,
99,97,108,112,114,111,112,115,49,11,0,16,99,111,110,116,97,105,110,101,
114,46,98,111,117,110,100,115,1,2,0,2,0,3,134,1,2,104,0,13,
111,112,116,105,111,110,115,119,105,110,100,111,119,11,12,119,111,95,110,111,
116,97,115,107,98,97,114,10,119,111,95,114,111,117,110,100,101,100,0,13,
119,105,110,100,111,119,111,112,97,99,105,116,121,5,0,0,0,0,0,0,
0,128,255,255,15,109,111,100,117,108,101,99,108,97,115,115,110,97,109,101,
6,8,116,109,115,101,102,111,114,109,0,6,116,108,97,98,101,108,7,116,
108,97,98,101,108,49,8,98,111,117,110,100,115,95,120,2,85,8,98,111,
117,110,100,115,95,121,2,24,9,98,111,117,110,100,115,95,99,120,3,229,
0,9,98,111,117,110,100,115,95,99,121,2,19,7,99,97,112,116,105,111,
110,6,30,83,111,109,101,32,108,105,98,114,97,114,105,101,115,32,100,105,
100,32,110,111,116,32,108,111,97,100,46,46,46,11,102,111,110,116,46,104,
101,105,103,104,116,2,16,9,102,111,110,116,46,110,97,109,101,6,11,115,
116,102,95,100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,
108,112,114,111,112,115,11,10,102,108,112,95,104,101,105,103,104,116,0,13,
114,101,102,102,111,110,116,104,101,105,103,104,116,2,19,0,0,6,116,108,
97,98,101,108,7,116,108,97,98,101,108,50,8,116,97,98,111,114,100,101,
114,2,1,8,98,111,117,110,100,115,95,120,2,81,8,98,111,117,110,100,
115,95,121,2,56,9,98,111,117,110,100,115,95,99,120,3,241,0,9,98,
111,117,110,100,115,95,99,121,2,19,7,99,97,112,116,105,111,110,6,31,
84,104,101,32,97,112,112,108,105,99,97,116,105,111,110,32,119,105,108,108,
32,116,101,114,109,105,110,97,116,101,46,11,102,111,110,116,46,104,101,105,
103,104,116,2,16,9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,
95,100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,108,112,
114,111,112,115,11,10,102,108,112,95,104,101,105,103,104,116,0,13,114,101,
102,102,111,110,116,104,101,105,103,104,116,2,19,0,0,0)
);

initialization
registerobjectdata(@objdata,terrorfo,'');
end.
19 changes: 19 additions & 0 deletions src/main.pas
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ tmainfo = class(tmainform)
implementation

uses
errorform,
findmessage,
infos,
conflang,
Expand Down Expand Up @@ -6769,6 +6770,19 @@ procedure tmainfo.onclose(const Sender: TObject);

procedure tmainfo.ontimertransp(const Sender: TObject);
begin

if allok = False then
begin
windowopacity := 1;
application.processmessages;
application.createform(terrorfo, errorfo);
errorfo.show;
application.processmessages;
sleep(2000);
//application.processmessages;
application.terminate;
end;

windowopacity := windowopacity + 0.1;
//{
dockpanel1fo.windowopacity := dockpanel1fo.windowopacity + 0.1;
Expand Down Expand Up @@ -6798,7 +6812,10 @@ recorderfo.windowopacity := recorderfo.windowopacity + 0.1;
//}

if windowopacity = 1 then
begin
ttimer1.Enabled := False;

end;

end;

Expand Down Expand Up @@ -6956,6 +6973,7 @@ procedure tmainfo.onactiv(const Sender: TObject);
x: integer;
oldlang: msestring;
begin

oncreatedform(Sender);

if isactivated = False then
Expand All @@ -6980,6 +6998,7 @@ procedure tmainfo.onactiv(const Sender: TObject);
end;
if mainfo.drumsvisible.value = 1 then
drumsfo.visible := true;

end;

end.
Expand Down
Loading

0 comments on commit c4d21ac

Please sign in to comment.