Commit fa2f647e authored by Martin Schreiber's avatar Martin Schreiber

* README.TXT hit for crossarm debugger timeout.

+ Project storage load/save component store and layout options.
parent 2d4828f9
......@@ -356,7 +356,8 @@ REMOTEUSER pi
<your crossfpc directory>/eabihf/lib
Press F9 and hope the best. ;-)
If there is a debugger timout at startup enlarge the
'Project'-'Options'-'Target'-'Wait before connect' value.
Have a lot of fun!
......
......@@ -311,7 +311,9 @@ type
const ascopy: boolean = false): boolean;
procedure saveproject(aname: filenamety; const ascopy: boolean = false);
procedure savewindowlayout(const astream: ttextstream);
procedure savewindowlayout(const awriter: tstatwriter);
procedure loadwindowlayout(const astream: ttextstream);
procedure loadwindowlayout(const areader: tstatreader);
procedure sourcechanged(const sender: tsourcepage);
function opensource(const filekind: filekindty; const addtoproject: boolean;
......@@ -2963,49 +2965,62 @@ begin
end;
end;
procedure tmainfo.savewindowlayout(const astream: ttextstream);
var
statwriter: tstatwriter;
procedure tmainfo.savewindowlayout(const awriter: tstatwriter);
begin
statwriter:= tstatwriter.create(astream,ce_utf8);
try
statwriter.setsection('breakpoints');
awriter.setsection('breakpoints');
beginpanelplacement();
try
panelform.updatestat(statwriter);
statwriter.setsection('layout');
mainfo.projectstatfile.updatestat('windowlayout',statwriter);
panelform.updatestat(awriter);
awriter.setsection('layout');
mainfo.projectstatfile.updatestat('windowlayout',awriter);
finally
endpanelplacement();
end;
end;
procedure tmainfo.savewindowlayout(const astream: ttextstream);
var
statwriter: tstatwriter;
begin
statwriter:= tstatwriter.create(astream,ce_utf8);
try
savewindowlayout(statwriter);
finally
statwriter.free;
end;
end;
procedure tmainfo.loadwindowlayout(const astream: ttextstream);
var
statreader: tstatreader;
procedure tmainfo.loadwindowlayout(const areader: tstatreader);
begin
statreader:= tstatreader.create(astream,ce_utf8);
try
beginpanelplacement();
statreader.setsection('breakpoints');
panelform.updatestat(statreader);
statreader.setsection('layout');
try
areader.setsection('breakpoints');
panelform.updatestat(areader);
areader.setsection('layout');
projectstatfile.options:= projectstatfile.options +
[sfo_nodata,sfo_nooptions];
flayoutloading:= true;
projectstatfile.readstat('windowlayout',statreader);
projectstatfile.readstat('windowlayout',areader);
finally
flayoutloading:= false;
projectstatfile.options:= projectstatfile.options -
[sfo_nodata,sfo_nooptions];
statreader.free;
endpanelplacement();
end;
end;
procedure tmainfo.loadwindowlayout(const astream: ttextstream);
var
statreader: tstatreader;
begin
statreader:= tstatreader.create(astream,ce_utf8);
try
loadwindowlayout(statreader);
finally
statreader.free;
end;
end;
procedure tmainfo.loadwindowlayoutexe(const sender: TObject);
var
str1: ttextstream;
......
......@@ -6240,9 +6240,9 @@ object projectoptionsfo: tprojectoptionsfo
144
2
)
taborder = 9
taborder = 10
bounds_x = 15
bounds_y = 244
bounds_y = 268
bounds_cx = 158
bounds_cy = 16
end
......@@ -6297,6 +6297,40 @@ object projectoptionsfo: tprojectoptionsfo
bounds_cx = 202
bounds_cy = 16
end
object settingscomponentstore: tbooleanedit
optionsskin = [osk_nolayoutcx, osk_nolayoutcy]
frame.caption = 'Load/save component store'
frame.localprops = []
frame.localprops1 = []
frame.outerframe = (
0
1
178
2
)
taborder = 9
bounds_x = 15
bounds_y = 244
bounds_cx = 192
bounds_cy = 16
end
object settingslayout: tbooleanedit
optionsskin = [osk_nolayoutcx, osk_nolayoutcy]
frame.caption = 'Load/save layout'
frame.localprops = []
frame.localprops1 = []
frame.outerframe = (
0
1
108
2
)
taborder = 11
bounds_x = 15
bounds_y = 292
bounds_cx = 122
bounds_cy = 16
end
end
end
end
......
......@@ -526,7 +526,9 @@ type
fsettingstemplates: boolean;
fsettingstools: boolean;
fsettingsstorage: boolean;
fsettingscomponentstore: boolean;
fsettingsprojecttree: boolean;
fsettingslayout: boolean;
fsettingsautoload: boolean;
fsettingsautosave: boolean;
// fmoduleoptions: integerarty;
......@@ -574,8 +576,12 @@ type
write fsettingstools;
property settingsstorage: boolean read fsettingsstorage
write fsettingsstorage;
property settingscomponentstore: boolean read fsettingscomponentstore
write fsettingscomponentstore;
property settingsprojecttree: boolean read fsettingsprojecttree
write fsettingsprojecttree;
property settingslayout: boolean read fsettingslayout
write fsettingslayout;
property settingsautoload: boolean read fsettingsautoload
write fsettingsautoload;
property settingsautosave: boolean read fsettingsautosave
......@@ -911,6 +917,8 @@ type
settingstools: tbooleanedit;
settingstemplates: tbooleanedit;
tsimplewidget1: tsimplewidget;
settingscomponentstore: tbooleanedit;
settingslayout: tbooleanedit;
procedure acttiveselectondataentered(const sender: TObject);
procedure colonshowhint(const sender: tdatacol; const arow: Integer;
var info: hintinfoty);
......@@ -2647,7 +2655,9 @@ type
settingstemplates: boolean;
settingstools: boolean;
settingsstorage: boolean;
settingscomponentstore: boolean;
settingsprojecttree: boolean;
settingslayout: boolean;
settingsautoload: boolean;
settingsautosave: boolean;
projectfilename: filenamety;
......@@ -2667,7 +2677,9 @@ begin
settingstemplates:= fo.settingstemplates.value;
settingstools:= fo.settingstools.value;
settingsstorage:= fo.settingsstorage.value;
settingscomponentstore:= fo.settingscomponentstore.value;
settingsprojecttree:= fo.settingsprojecttree.value;
settingslayout:= fo.settingslayout.value;
settingsautoload:= fo.settingsautoload.value;
settingsautosave:= fo.settingsautosave.value;
end
......@@ -2679,7 +2691,9 @@ begin
settingstemplates:= projectoptions.o.settingstemplates;
settingstools:= projectoptions.o.settingstools;
settingsstorage:= projectoptions.o.settingsstorage;
settingscomponentstore:= projectoptions.o.settingscomponentstore;
settingsprojecttree:= projectoptions.o.settingsprojecttree;
settingslayout:= projectoptions.o.settingslayout;
settingsautoload:= projectoptions.o.settingsautoload;
settingsautosave:= projectoptions.o.settingsautosave;
end;
......@@ -2700,7 +2714,9 @@ begin
fo.settingstemplates.value:= settingstemplates;
fo.settingstools.value:= settingstools;
fo.settingsstorage.value:= settingsstorage;
fo.settingscomponentstore.value:= settingscomponentstore;
fo.settingsprojecttree.value:= settingsprojecttree;
fo.settingslayout.value:= settingslayout;
fo.settingsautoload.value:= settingsautoload;
fo.settingsautosave.value:= settingsautosave;
end;
......@@ -2716,7 +2732,9 @@ begin
projectoptions.o.settingstemplates:= settingstemplates;
projectoptions.o.settingstools:= settingstools;
projectoptions.o.settingsstorage:= settingsstorage;
projectoptions.o.settingscomponentstore:= settingscomponentstore;
projectoptions.o.settingsprojecttree:= settingsprojecttree;
projectoptions.o.settingslayout:= settingslayout;
projectoptions.o.settingsautoload:= settingsautoload;
projectoptions.o.settingsautosave:= settingsautosave;
end;
......@@ -2784,6 +2802,12 @@ begin
try
read1:= tstatreader.create(fname1,ce_utf8);
try
if projectoptions.o.settingscomponentstore then begin
componentstorefo.updatestat(read1);
end;
if projectoptions.o.settingslayout then begin
mainfo.loadwindowlayout(read1);
end;
read1.setsection('projectoptions');
if projectoptions.o.settingsprojecttree then begin
projecttree.updatestat(read1);
......@@ -2845,6 +2869,12 @@ begin
formtoprojectoptions(sender);
end;
disabled:= getdisabledoptions;
if o.settingscomponentstore then begin
componentstorefo.updatestat(stat1);
end;
if o.settingslayout then begin
mainfo.savewindowlayout(stat1);
end;
stat1.setsection('projectoptions');
if o.settingsprojecttree then begin
projecttree.updatestat(stat1);
......@@ -2857,7 +2887,9 @@ begin
o.settingstemplates:= false;
o.settingstools:= false;
o.settingsstorage:= false;
o.settingscomponentstore:= false;
o.settingsprojecttree:= false;
o.settingslayout:= false;
o.settingsautoload:= false;
o.settingsautosave:= false;
end;
......
......@@ -8,8 +8,8 @@ uses
mseclasses,projectoptionsform;
const
objdata: record size: integer; data: array[0..180254] of byte end =
(size: 180255; data: (
objdata: record size: integer; data: array[0..180733] of byte end =
(size: 180734; data: (
84,80,70,48,17,116,112,114,111,106,101,99,116,111,112,116,105,111,110,115,
102,111,16,112,114,111,106,101,99,116,111,112,116,105,111,110,115,102,111,13,
111,112,116,105,111,110,115,119,105,100,103,101,116,11,13,111,119,95,97,114,
......@@ -8945,8 +8945,8 @@ const
102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,0,17,102,
114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,0,16,102,
114,97,109,101,46,111,117,116,101,114,102,114,97,109,101,1,2,0,2,1,
3,144,0,2,2,0,8,116,97,98,111,114,100,101,114,2,9,8,98,111,
117,110,100,115,95,120,2,15,8,98,111,117,110,100,115,95,121,3,244,0,
3,144,0,2,2,0,8,116,97,98,111,114,100,101,114,2,10,8,98,111,
117,110,100,115,95,120,2,15,8,98,111,117,110,100,115,95,121,3,12,1,
9,98,111,117,110,100,115,95,99,120,3,158,0,9,98,111,117,110,100,115,
95,99,121,2,16,0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,
14,115,101,116,116,105,110,103,115,109,97,99,114,111,115,11,111,112,116,105,
......@@ -8984,45 +8984,69 @@ const
101,1,2,0,2,1,3,188,0,2,2,0,8,116,97,98,111,114,100,101,
114,2,6,8,98,111,117,110,100,115,95,120,2,15,8,98,111,117,110,100,
115,95,121,3,172,0,9,98,111,117,110,100,115,95,99,120,3,202,0,9,
98,111,117,110,100,115,95,99,121,2,16,0,0,0,0,0,9,116,115,116,
97,116,102,105,108,101,9,115,116,97,116,102,105,108,101,49,8,102,105,108,
101,110,97,109,101,6,13,111,112,116,105,111,110,115,102,111,46,115,116,97,
7,111,112,116,105,111,110,115,11,10,115,102,111,95,109,101,109,111,114,121,
0,4,108,101,102,116,3,144,0,3,116,111,112,3,24,2,0,0,16,116,
115,116,114,105,110,103,99,111,110,116,97,105,110,101,114,1,99,12,115,116,
114,105,110,103,115,46,100,97,116,97,1,6,44,87,114,111,110,103,32,101,
110,99,111,100,105,110,103,32,99,97,110,32,100,97,109,97,103,101,32,121,
111,117,114,32,115,111,117,114,99,101,32,102,105,108,101,115,46,6,30,68,
111,32,121,111,117,32,119,105,115,104,32,116,111,32,115,101,116,32,101,110,
99,111,100,105,110,103,32,116,111,6,15,42,42,42,32,87,65,82,78,73,
78,71,32,42,42,42,6,6,72,97,110,103,117,112,6,9,73,110,116,101,
114,114,117,112,116,6,4,81,117,105,116,6,19,73,108,108,101,103,97,108,
32,105,110,115,116,114,117,99,116,105,111,110,6,10,84,114,97,99,101,32,
116,114,97,112,6,5,65,98,111,114,116,6,9,66,85,83,32,101,114,114,
111,114,6,24,70,108,111,97,116,105,110,103,45,112,111,105,110,116,32,101,
120,99,101,112,116,105,111,110,6,4,75,105,108,108,6,21,85,115,101,114,
45,100,101,102,105,110,101,100,32,115,105,103,110,97,108,32,49,6,22,83,
101,103,109,101,110,116,97,116,105,111,110,32,118,105,111,108,97,116,105,111,
110,6,21,85,115,101,114,45,100,101,102,105,110,101,100,32,115,105,103,110,
97,108,32,50,6,11,66,114,111,107,101,110,32,112,105,112,101,6,11,65,
108,97,114,109,32,99,108,111,99,107,6,11,84,101,114,109,105,110,97,116,
105,111,110,6,11,83,116,97,99,107,32,102,97,117,108,116,6,24,67,104,
105,108,100,32,115,116,97,116,117,115,32,104,97,115,32,99,104,97,110,103,
101,100,6,8,67,111,110,116,105,110,117,101,6,17,83,116,111,112,44,32,
117,110,98,108,111,99,107,97,98,108,101,6,13,75,101,121,98,111,97,114,
100,32,115,116,111,112,6,24,66,97,99,107,103,114,111,117,110,100,32,114,
101,97,100,32,102,114,111,109,32,116,116,121,6,23,66,97,99,107,103,114,
111,117,110,100,32,119,114,105,116,101,32,116,111,32,116,116,121,6,26,85,
114,103,101,110,116,32,99,111,110,100,105,116,105,111,110,32,111,110,32,115,
111,99,107,101,116,6,18,67,80,85,32,108,105,109,105,116,32,101,120,99,
101,101,100,101,100,6,24,70,105,108,101,32,115,105,122,101,32,108,105,109,
105,116,32,101,120,99,101,101,100,101,100,6,19,86,105,114,116,117,97,108,
32,97,108,97,114,109,32,99,108,111,99,107,6,21,80,114,111,102,105,108,
105,110,103,32,97,108,97,114,109,32,99,108,111,99,107,6,18,87,105,110,
100,111,119,32,115,105,122,101,32,99,104,97,110,103,101,6,16,73,47,79,
32,110,111,119,32,112,111,115,115,105,98,108,101,6,21,80,111,119,101,114,
32,102,97,105,108,117,114,101,32,114,101,115,116,97,114,116,0,4,108,101,
102,116,3,216,0,3,116,111,112,3,24,2,0,0,0)
98,111,117,110,100,115,95,99,121,2,16,0,0,12,116,98,111,111,108,101,
97,110,101,100,105,116,22,115,101,116,116,105,110,103,115,99,111,109,112,111,
110,101,110,116,115,116,111,114,101,11,111,112,116,105,111,110,115,115,107,105,
110,11,14,111,115,107,95,110,111,108,97,121,111,117,116,99,120,14,111,115,
107,95,110,111,108,97,121,111,117,116,99,121,0,13,102,114,97,109,101,46,
99,97,112,116,105,111,110,6,25,76,111,97,100,47,115,97,118,101,32,99,
111,109,112,111,110,101,110,116,32,115,116,111,114,101,16,102,114,97,109,101,
46,108,111,99,97,108,112,114,111,112,115,11,0,17,102,114,97,109,101,46,
108,111,99,97,108,112,114,111,112,115,49,11,0,16,102,114,97,109,101,46,
111,117,116,101,114,102,114,97,109,101,1,2,0,2,1,3,178,0,2,2,
0,8,116,97,98,111,114,100,101,114,2,9,8,98,111,117,110,100,115,95,
120,2,15,8,98,111,117,110,100,115,95,121,3,244,0,9,98,111,117,110,
100,115,95,99,120,3,192,0,9,98,111,117,110,100,115,95,99,121,2,16,
0,0,12,116,98,111,111,108,101,97,110,101,100,105,116,14,115,101,116,116,
105,110,103,115,108,97,121,111,117,116,11,111,112,116,105,111,110,115,115,107,
105,110,11,14,111,115,107,95,110,111,108,97,121,111,117,116,99,120,14,111,
115,107,95,110,111,108,97,121,111,117,116,99,121,0,13,102,114,97,109,101,
46,99,97,112,116,105,111,110,6,16,76,111,97,100,47,115,97,118,101,32,
108,97,121,111,117,116,16,102,114,97,109,101,46,108,111,99,97,108,112,114,
111,112,115,11,0,17,102,114,97,109,101,46,108,111,99,97,108,112,114,111,
112,115,49,11,0,16,102,114,97,109,101,46,111,117,116,101,114,102,114,97,
109,101,1,2,0,2,1,2,108,2,2,0,8,116,97,98,111,114,100,101,
114,2,11,8,98,111,117,110,100,115,95,120,2,15,8,98,111,117,110,100,
115,95,121,3,36,1,9,98,111,117,110,100,115,95,99,120,2,122,9,98,
111,117,110,100,115,95,99,121,2,16,0,0,0,0,0,9,116,115,116,97,
116,102,105,108,101,9,115,116,97,116,102,105,108,101,49,8,102,105,108,101,
110,97,109,101,6,13,111,112,116,105,111,110,115,102,111,46,115,116,97,7,
111,112,116,105,111,110,115,11,10,115,102,111,95,109,101,109,111,114,121,0,
4,108,101,102,116,3,144,0,3,116,111,112,3,24,2,0,0,16,116,115,
116,114,105,110,103,99,111,110,116,97,105,110,101,114,1,99,12,115,116,114,
105,110,103,115,46,100,97,116,97,1,6,44,87,114,111,110,103,32,101,110,
99,111,100,105,110,103,32,99,97,110,32,100,97,109,97,103,101,32,121,111,
117,114,32,115,111,117,114,99,101,32,102,105,108,101,115,46,6,30,68,111,
32,121,111,117,32,119,105,115,104,32,116,111,32,115,101,116,32,101,110,99,
111,100,105,110,103,32,116,111,6,15,42,42,42,32,87,65,82,78,73,78,
71,32,42,42,42,6,6,72,97,110,103,117,112,6,9,73,110,116,101,114,
114,117,112,116,6,4,81,117,105,116,6,19,73,108,108,101,103,97,108,32,
105,110,115,116,114,117,99,116,105,111,110,6,10,84,114,97,99,101,32,116,
114,97,112,6,5,65,98,111,114,116,6,9,66,85,83,32,101,114,114,111,
114,6,24,70,108,111,97,116,105,110,103,45,112,111,105,110,116,32,101,120,
99,101,112,116,105,111,110,6,4,75,105,108,108,6,21,85,115,101,114,45,
100,101,102,105,110,101,100,32,115,105,103,110,97,108,32,49,6,22,83,101,
103,109,101,110,116,97,116,105,111,110,32,118,105,111,108,97,116,105,111,110,
6,21,85,115,101,114,45,100,101,102,105,110,101,100,32,115,105,103,110,97,
108,32,50,6,11,66,114,111,107,101,110,32,112,105,112,101,6,11,65,108,
97,114,109,32,99,108,111,99,107,6,11,84,101,114,109,105,110,97,116,105,
111,110,6,11,83,116,97,99,107,32,102,97,117,108,116,6,24,67,104,105,
108,100,32,115,116,97,116,117,115,32,104,97,115,32,99,104,97,110,103,101,
100,6,8,67,111,110,116,105,110,117,101,6,17,83,116,111,112,44,32,117,
110,98,108,111,99,107,97,98,108,101,6,13,75,101,121,98,111,97,114,100,
32,115,116,111,112,6,24,66,97,99,107,103,114,111,117,110,100,32,114,101,
97,100,32,102,114,111,109,32,116,116,121,6,23,66,97,99,107,103,114,111,
117,110,100,32,119,114,105,116,101,32,116,111,32,116,116,121,6,26,85,114,
103,101,110,116,32,99,111,110,100,105,116,105,111,110,32,111,110,32,115,111,
99,107,101,116,6,18,67,80,85,32,108,105,109,105,116,32,101,120,99,101,
101,100,101,100,6,24,70,105,108,101,32,115,105,122,101,32,108,105,109,105,
116,32,101,120,99,101,101,100,101,100,6,19,86,105,114,116,117,97,108,32,
97,108,97,114,109,32,99,108,111,99,107,6,21,80,114,111,102,105,108,105,
110,103,32,97,108,97,114,109,32,99,108,111,99,107,6,18,87,105,110,100,
111,119,32,115,105,122,101,32,99,104,97,110,103,101,6,16,73,47,79,32,
110,111,119,32,112,111,115,115,105,98,108,101,6,21,80,111,119,101,114,32,
102,97,105,108,117,114,101,32,114,101,115,116,97,114,116,0,4,108,101,102,
116,3,216,0,3,116,111,112,3,24,2,0,0,0)
);
initialization
......
......@@ -19,8 +19,6 @@ order16=0
order17=0
order18=0
[projectoptions]
projectdir=/home/mse/packs/standard/git/mseide-msegui/apps/ide/templates
projectfilename=/home/mse/packs/standard/git/mseide-msegui/apps/ide/templates/default.prj
mainfile=${PROJECTNAME}.pas
targetfile=${PROJECTNAME}${EXEEXT}
messageoutputfile=
......@@ -411,9 +409,6 @@ files=
(
a=0,4132,6,Text Files
)
[componentstore]
storedir=/home/mse/packs/standard/git/mseide-msegui/apps/ide/compstore/
filename=
[components]
[selecteditpage]
colwidth=100
......@@ -826,26 +821,20 @@ windowlayout=530
width3=185
sortdescend3=0
[componentstorefo.storefiledialog]
filenames=1
/home/mse/packs/standard/git/mseide-msegui/apps/ide/compstore/
filecolwidth=0
x=0
y=0
cx=0
cy=0
lastdir=/home/mse/packs/standard/git/mseide-msegui/apps/ide/compstore/
filehistory=0
filefilterindex=0
filefilter=
[componentstorefo.groupfiledialog]
filenames=1
/home/mse/packs/standard/git/mseide-msegui/apps/ide/compstore/
filecolwidth=0
x=0
y=0
cx=0
cy=0
lastdir=/home/mse/packs/standard/git/mseide-msegui/apps/ide/compstore/
filehistory=0
filefilterindex=0
filefilter=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment