designer: add chat and change compilaion rule

Carlos Picanco
1 parent 15518a42
Showing 4 changed files with 26 additions and 21 deletions Show diff stats
experiment_designer/experiment_designer.lpi
experiment_designer/form_main.lfm
experiment_designer/form_main.pas
experiment_designer/lib/x86_64-linux/experiment_designer.compiled
@@ -9,6 +9,7 @@
       <Title Value="experiment_designer"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
+      <Icon Value="0"/>
     </General>
     <i18n>
       <EnableI18N LFM="False"/>
@@ -29,18 +30,11 @@
             <OtherUnitFiles Value="../experiment_runner/units"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
-          <CodeGeneration>
-            <SmartLinkUnit Value="True"/>
-            <Optimizations>
-              <OptimizationLevel Value="3"/>
-            </Optimizations>
-          </CodeGeneration>
           <Linking>
             <Debugging>
               <GenerateDebugInfo Value="False"/>
               <StripSymbols Value="True"/>
             </Debugging>
-            <LinkSmart Value="True"/>
             <Options>
               <Win32>
                 <GraphicApplication Value="True"/>
@@ -83,15 +77,11 @@
             <OtherUnitFiles Value="../experiment_runner/units"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
-          <CodeGeneration>
-            <SmartLinkUnit Value="True"/>
-          </CodeGeneration>
           <Linking>
             <Debugging>
               <GenerateDebugInfo Value="False"/>
               <StripSymbols Value="True"/>
             </Debugging>
-            <LinkSmart Value="True"/>
             <Options>
               <Win32>
                 <GraphicApplication Value="True"/>
@@ -18,7 +18,7 @@ object FormDesigner: TFormDesigner
   LCLVersion = '1.6.2.0'
   object PageControl: TPageControl
     Left = 0
-    Height = 744
+    Height = 765
     Top = 0
     Width = 643
     ActivePage = TabSheetExperiment
@@ -32,7 +32,7 @@ object FormDesigner: TFormDesigner
       ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 711
+      ClientHeight = 732
       ClientWidth = 637
       object GBConditions: TGroupBox
         Left = 0
@@ -111,7 +111,7 @@ object FormDesigner: TFormDesigner
       end
       object CGGlobal: TCheckGroup
         Left = 0
-        Height = 113
+        Height = 134
         Hint = 'Aplicáveis ao longo de todo o experimento'
         Top = 376
         Width = 637
@@ -125,24 +125,26 @@ object FormDesigner: TFormDesigner
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 96
+        ClientHeight = 117
         ClientWidth = 633
         Items.Strings = (
           'Enviar histórico do bate-papo a novos participantes'
           'Gerar participantes automaticamente'
           'Habilitar matrix para o pesquisador jogar'
           'Habilitar bate-papo para o pesquisador'
+          'Habilitar bate-papo'
         )
+        OnClick = CGGlobalClick
         OnItemClick = CGGlobalItemClick
         TabOrder = 3
         Data = {
-          0400000002030202
+          050000000202020202
         }
       end
       object RGPoints: TRadioGroup
         Left = 0
         Height = 59
-        Top = 494
+        Top = 515
         Width = 637
         AutoFill = True
         Caption = 'Tipo de pontuação Individual'
@@ -166,7 +168,7 @@ object FormDesigner: TFormDesigner
       object GBMatrix: TGroupBox
         Left = 0
         Height = 143
-        Top = 558
+        Top = 579
         Width = 637
         Caption = 'Tipo da Matrix'
         ChildSizing.LeftRightSpacing = 5
@@ -247,7 +249,7 @@ object FormDesigner: TFormDesigner
       ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 711
+      ClientHeight = 732
       ClientWidth = 637
       object ComboCurrentCondition: TComboBox
         Left = 0
@@ -652,7 +654,7 @@ object FormDesigner: TFormDesigner
       ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 711
+      ClientHeight = 732
       ClientWidth = 637
       Enabled = False
       object RGContingencyType: TRadioGroup
@@ -134,6 +134,7 @@ type
     procedure BtnReorderCondClick(Sender: TObject);
     procedure BtnReorderContingencyClick(Sender: TObject);
     procedure ButtonPreviewMessageClick(Sender: TObject);
+    procedure CGGlobalClick(Sender: TObject);
     procedure CGGlobalItemClick(Sender: TObject; Index: integer);
     procedure CheckBoxImutableMessageChange(Sender: TObject);
     procedure ChkMatrixTypeClick(Sender: TObject);
@@ -1052,6 +1053,8 @@ begin
     WriteBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, CGGlobal.Checked[1]);
     WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, CGGlobal.Checked[2]);
     WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[3]);
+    WriteBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, CGGlobal.Checked[4]);
+
     case RGPoints.ItemIndex of
       0: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True);
       1: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, False);
@@ -1071,6 +1074,8 @@ begin
       CGGlobal.Checked[1] := ReadBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, False);
       CGGlobal.Checked[2] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, False);
       CGGlobal.Checked[3] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, False);
+      CGGlobal.Checked[4] := ReadBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, False);
+
       if ReadBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True) then
         RGPoints.ItemIndex := 0
       else
@@ -1891,6 +1896,11 @@ begin
       CreateMessage(i);
 end;
  
+procedure TFormDesigner.CGGlobalClick(Sender: TObject);
+begin
+
+end;
+
 procedure TFormDesigner.CGGlobalItemClick(Sender: TObject; Index: integer);
 begin
   if not FLoading then
@@ -1908,6 +1918,9 @@ begin
  
           if Index = 3 then
             WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[Index]);
+
+          if Index = 4 then
+            WriteBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, CGGlobal.Checked[Index]);
         end;
 end;
  
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
-  <Params Value=" -MObjFPC -Scghi -CX -Cg -O3 -Xs -XX -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
+  <Params Value=" -MObjFPC -Scghi -Cg -O1 -Xs -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
 </CONFIG>
...	...	@@ -9,6 +9,7 @@
9	9	<Title Value="experiment_designer"/>
10	10	<ResourceType Value="res"/>
11	11	<UseXPManifest Value="True"/>
	12	+ <Icon Value="0"/>
12	13	</General>
13	14	<i18n>
14	15	<EnableI18N LFM="False"/>
...	...	@@ -29,18 +30,11 @@
29	30	<OtherUnitFiles Value="../experiment_runner/units"/>
30	31	<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
31	32	</SearchPaths>
32		- <CodeGeneration>
33		- <SmartLinkUnit Value="True"/>
34		- <Optimizations>
35		- <OptimizationLevel Value="3"/>
36		- </Optimizations>
37		- </CodeGeneration>
38	33	<Linking>
39	34	<Debugging>
40	35	<GenerateDebugInfo Value="False"/>
41	36	<StripSymbols Value="True"/>
42	37	</Debugging>
43		- <LinkSmart Value="True"/>
44	38	<Options>
45	39	<Win32>
46	40	<GraphicApplication Value="True"/>
...	...	@@ -83,15 +77,11 @@
83	77	<OtherUnitFiles Value="../experiment_runner/units"/>
84	78	<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
85	79	</SearchPaths>
86		- <CodeGeneration>
87		- <SmartLinkUnit Value="True"/>
88		- </CodeGeneration>
89	80	<Linking>
90	81	<Debugging>
91	82	<GenerateDebugInfo Value="False"/>
92	83	<StripSymbols Value="True"/>
93	84	</Debugging>
94		- <LinkSmart Value="True"/>
95	85	<Options>
96	86	<Win32>
97	87	<GraphicApplication Value="True"/>
...	...
...	...	@@ -18,7 +18,7 @@ object FormDesigner: TFormDesigner
18	18	LCLVersion = '1.6.2.0'
19	19	object PageControl: TPageControl
20	20	Left = 0
21		- Height = 744
	21	+ Height = 765
22	22	Top = 0
23	23	Width = 643
24	24	ActivePage = TabSheetExperiment
...	...	@@ -32,7 +32,7 @@ object FormDesigner: TFormDesigner
32	32	ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
33	33	ChildSizing.Layout = cclLeftToRightThenTopToBottom
34	34	ChildSizing.ControlsPerLine = 1
35		- ClientHeight = 711
	35	+ ClientHeight = 732
36	36	ClientWidth = 637
37	37	object GBConditions: TGroupBox
38	38	Left = 0
...	...	@@ -111,7 +111,7 @@ object FormDesigner: TFormDesigner
111	111	end
112	112	object CGGlobal: TCheckGroup
113	113	Left = 0
114		- Height = 113
	114	+ Height = 134
115	115	Hint = 'Aplicáveis ao longo de todo o experimento'
116	116	Top = 376
117	117	Width = 637
...	...	@@ -125,24 +125,26 @@ object FormDesigner: TFormDesigner
125	125	ChildSizing.ShrinkVertical = crsScaleChilds
126	126	ChildSizing.Layout = cclLeftToRightThenTopToBottom
127	127	ChildSizing.ControlsPerLine = 1
128		- ClientHeight = 96
	128	+ ClientHeight = 117
129	129	ClientWidth = 633
130	130	Items.Strings = (
131	131	'Enviar histórico do bate-papo a novos participantes'
132	132	'Gerar participantes automaticamente'
133	133	'Habilitar matrix para o pesquisador jogar'
134	134	'Habilitar bate-papo para o pesquisador'
	135	+ 'Habilitar bate-papo'
135	136	)
	137	+ OnClick = CGGlobalClick
136	138	OnItemClick = CGGlobalItemClick
137	139	TabOrder = 3
138	140	Data = {
139		- 0400000002030202
	141	+ 050000000202020202
140	142	}
141	143	end
142	144	object RGPoints: TRadioGroup
143	145	Left = 0
144	146	Height = 59
145		- Top = 494
	147	+ Top = 515
146	148	Width = 637
147	149	AutoFill = True
148	150	Caption = 'Tipo de pontuação Individual'
...	...	@@ -166,7 +168,7 @@ object FormDesigner: TFormDesigner
166	168	object GBMatrix: TGroupBox
167	169	Left = 0
168	170	Height = 143
169		- Top = 558
	171	+ Top = 579
170	172	Width = 637
171	173	Caption = 'Tipo da Matrix'
172	174	ChildSizing.LeftRightSpacing = 5
...	...	@@ -247,7 +249,7 @@ object FormDesigner: TFormDesigner
247	249	ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
248	250	ChildSizing.Layout = cclLeftToRightThenTopToBottom
249	251	ChildSizing.ControlsPerLine = 1
250		- ClientHeight = 711
	252	+ ClientHeight = 732
251	253	ClientWidth = 637
252	254	object ComboCurrentCondition: TComboBox
253	255	Left = 0
...	...	@@ -652,7 +654,7 @@ object FormDesigner: TFormDesigner
652	654	ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
653	655	ChildSizing.Layout = cclLeftToRightThenTopToBottom
654	656	ChildSizing.ControlsPerLine = 1
655		- ClientHeight = 711
	657	+ ClientHeight = 732
656	658	ClientWidth = 637
657	659	Enabled = False
658	660	object RGContingencyType: TRadioGroup
...	...
...	...	@@ -134,6 +134,7 @@ type
134	134	procedure BtnReorderCondClick(Sender: TObject);
135	135	procedure BtnReorderContingencyClick(Sender: TObject);
136	136	procedure ButtonPreviewMessageClick(Sender: TObject);
	137	+ procedure CGGlobalClick(Sender: TObject);
137	138	procedure CGGlobalItemClick(Sender: TObject; Index: integer);
138	139	procedure CheckBoxImutableMessageChange(Sender: TObject);
139	140	procedure ChkMatrixTypeClick(Sender: TObject);
...	...	@@ -1052,6 +1053,8 @@ begin
1052	1053	WriteBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, CGGlobal.Checked[1]);
1053	1054	WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, CGGlobal.Checked[2]);
1054	1055	WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[3]);
	1056	+ WriteBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, CGGlobal.Checked[4]);
	1057	+
1055	1058	case RGPoints.ItemIndex of
1056	1059	0: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True);
1057	1060	1: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, False);
...	...	@@ -1071,6 +1074,8 @@ begin
1071	1074	CGGlobal.Checked[1] := ReadBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, False);
1072	1075	CGGlobal.Checked[2] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, False);
1073	1076	CGGlobal.Checked[3] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, False);
	1077	+ CGGlobal.Checked[4] := ReadBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, False);
	1078	+
1074	1079	if ReadBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True) then
1075	1080	RGPoints.ItemIndex := 0
1076	1081	else
...	...	@@ -1891,6 +1896,11 @@ begin
1891	1896	CreateMessage(i);
1892	1897	end;
1893	1898
	1899	+procedure TFormDesigner.CGGlobalClick(Sender: TObject);
	1900	+begin
	1901	+
	1902	+end;
	1903	+
1894	1904	procedure TFormDesigner.CGGlobalItemClick(Sender: TObject; Index: integer);
1895	1905	begin
1896	1906	if not FLoading then
...	...	@@ -1908,6 +1918,9 @@ begin
1908	1918
1909	1919	if Index = 3 then
1910	1920	WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[Index]);
	1921	+
	1922	+ if Index = 4 then
	1923	+ WriteBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, CGGlobal.Checked[Index]);
1911	1924	end;
1912	1925	end;
1913	1926
...	...
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<CONFIG>
3	3	<Compiler Value="/usr/bin/fpc" Date="1449313866"/>
4		- <Params Value=" -MObjFPC -Scghi -CX -Cg -O3 -Xs -XX -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
	4	+ <Params Value=" -MObjFPC -Scghi -Cg -O1 -Xs -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
5	5	</CONFIG>
...	...