diff --git a/experiment_designer/experiment_designer.lpi b/experiment_designer/experiment_designer.lpi index e006ce6..3eb508c 100644 --- a/experiment_designer/experiment_designer.lpi +++ b/experiment_designer/experiment_designer.lpi @@ -9,6 +9,7 @@ <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"/> diff --git a/experiment_designer/form_main.lfm b/experiment_designer/form_main.lfm index c3c9a2b..1a188cd 100644 --- a/experiment_designer/form_main.lfm +++ b/experiment_designer/form_main.lfm @@ -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 diff --git a/experiment_designer/form_main.pas b/experiment_designer/form_main.pas index 68b3afb..ff5beda 100644 --- a/experiment_designer/form_main.pas +++ b/experiment_designer/form_main.pas @@ -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; diff --git a/experiment_designer/lib/x86_64-linux/experiment_designer.compiled b/experiment_designer/lib/x86_64-linux/experiment_designer.compiled index b8458ed..a131589 100644 --- a/experiment_designer/lib/x86_64-linux/experiment_designer.compiled +++ b/experiment_designer/lib/x86_64-linux/experiment_designer.compiled @@ -1,5 +1,5 @@ <?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> -- libgit2 0.21.2