educationlaz: fixed compilation and fixed handling new IDE filter

git-svn-id: trunk@23314 -
2025-11-04 10:39:53 +01:00 · 2009-12-28 12:00:33 +00:00 · 2009-12-28 12:00:33 +00:00 · b52661b103
commit b52661b103
parent 2871bcfd3b
5 changed files with 116 additions and 48 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -723,6 +723,7 @@ components/education/edupkgsystem.lfm svneol=native#text/plain
 components/education/edupkgsystem.lrs svneol=native#text/plain
 components/education/edupkgsystem.pas svneol=native#text/plain
 components/education/edupropsevents.lfm svneol=native#text/plain
+components/education/edupropsevents.lrs svneol=native#text/plain
 components/education/edupropsevents.pas svneol=native#text/plain
 components/filebrowser/frmconfigfilebrowser.lfm svneol=native#text/plain
 components/filebrowser/frmconfigfilebrowser.lrs svneol=native#text/pascal
--- a/components/education/eduoptions.pas
+++ b/components/education/eduoptions.pas
@ -87,9 +87,6 @@ resourcestring
  ersRdBtnFull = 'Show All';
  ersEnableEduCheckBoxCaption = 'Enable education settings';

-
-
-
 const
  DefaultEduOptionsFilename = 'education.xml';

@ -148,7 +145,7 @@ type
    property ChangeStep: integer read FChangeStep write SetChangeStep;
  end;

-  TEduOptions = class(TAbstractIDEOptions)
+  TEduOptions = class(TAbstractIDEEnvironmentOptions)
  private
    FEnabled: boolean;
    FFilename: string;
@ -161,6 +158,7 @@ type
    constructor Create;
    destructor Destroy; override;
    class function GetGroupCaption: string; override;
+    class function GetInstance: TAbstractIDEOptions; override;
    property Root: TEduOptionsNode read FRoot;
    function Load(Config: TConfigStorage): TModalResult; virtual;
    function Save(Config: TConfigStorage): TModalResult; virtual;
@ -353,6 +351,11 @@ begin
  Result:=EduRSEducation;
 end;

+class function TEduOptions.GetInstance: TAbstractIDEOptions;
+begin
+  Result:=EducationOptions;
+end;
+
 function TEduOptions.Load(Config: TConfigStorage): TModalResult;
 begin
  FEnabled:=Config.GetValue('Enabled',false);
--- a/components/education/edupropsevents.lfm
+++ b/components/education/edupropsevents.lfm
@ -4,26 +4,27 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
  ClientHeight = 393
  ClientWidth = 456
  TabOrder = 0
-  DesignLeft = 713
-  DesignTop = 9
+  DesignLeft = 415
+  DesignTop = 302
  object OptsPanel: TPanel[0]
-    Left = 8
+    Left = 0
    Height = 128
    Top = 0
-    Width = 440
-    Align = alCustom
+    Width = 456
+    Align = alTop
    ChildSizing.Layout = cclTopToBottomThenLeftToRight
    ChildSizing.ControlsPerLine = 2
    ClientHeight = 128
-    ClientWidth = 440
+    ClientWidth = 456
    TabOrder = 0
    object rdGrpProps: TRadioGroup
-      Left = 24
-      Height = 105
-      Top = 8
+      Left = 7
+      Height = 114
+      Top = 7
      Width = 185
-      Align = alCustom
+      Align = alLeft
      AutoFill = True
+      BorderSpacing.Around = 6
      Caption = 'rdGrpProps'
      ChildSizing.LeftRightSpacing = 6
      ChildSizing.TopBottomSpacing = 6
@ -33,7 +34,7 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
      ChildSizing.ShrinkVertical = crsScaleChilds
      ChildSizing.Layout = cclLeftToRightThenTopToBottom
      ChildSizing.ControlsPerLine = 1
-      ClientHeight = 87
+      ClientHeight = 95
      ClientWidth = 181
      OnClick = rdGrpPropsClick
      TabOrder = 0
@ -44,7 +45,9 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
        Width = 165
        Align = alCustom
        Caption = 'PropsMinRadioBtn'
+        Checked = True
        OnClick = PropsMinRadioBtnClick
+        State = cbChecked
        TabOrder = 0
        TabStop = False
      end
@ -71,12 +74,13 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
      end
    end
    object rdGrpEvents: TRadioGroup
-      Left = 224
-      Height = 105
-      Top = 8
+      Left = 198
+      Height = 114
+      Top = 7
      Width = 185
-      Align = alCustom
+      Align = alLeft
      AutoFill = True
+      BorderSpacing.Around = 6
      Caption = 'rdGrpEvents'
      ChildSizing.LeftRightSpacing = 6
      ChildSizing.TopBottomSpacing = 6
@ -86,7 +90,7 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
      ChildSizing.ShrinkVertical = crsScaleChilds
      ChildSizing.Layout = cclLeftToRightThenTopToBottom
      ChildSizing.ControlsPerLine = 1
-      ClientHeight = 87
+      ClientHeight = 95
      ClientWidth = 181
      TabOrder = 1
      object EventsMinRadioBtn: TRadioButton
@ -96,7 +100,9 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
        Width = 160
        Align = alCustom
        Caption = 'EventsMinRadioBtn'
+        Checked = True
        OnClick = EventsMinRadioBtnClick
+        State = cbChecked
        TabOrder = 0
      end
      object EventsExtRadioBtn: TRadioButton
@ -122,47 +128,50 @@ inherited EduPropsEventsFrame: TEduPropsEventsFrame
    end
  end
  object grpBoxEvents: TGroupBox[1]
-    Left = 32
+    Left = 0
    Height = 65
-    Top = 288
-    Width = 392
+    Top = 256
+    Width = 456
+    Align = alTop
    Caption = 'grpBoxEvents'
-    ClientHeight = 47
-    ClientWidth = 388
+    ClientHeight = 46
+    ClientWidth = 452
    TabOrder = 1
-    object stTextEvents: TStaticText
+    object stTextEvents: TLabel
      Left = 14
-      Height = 25
+      Height = 18
      Top = 8
-      Width = 369
+      Width = 81
      Caption = 'stTextEvents'
-      TabOrder = 0
+      ParentColor = False
    end
  end
  object grpBoxProps: TGroupBox[2]
-    Left = 32
+    Left = 0
    Height = 128
-    Top = 144
-    Width = 392
+    Top = 128
+    Width = 456
+    Align = alTop
    Caption = 'grpBoxProps'
-    ClientHeight = 110
-    ClientWidth = 388
+    ClientHeight = 109
+    ClientWidth = 452
    TabOrder = 2
-    object stTextProps: TStaticText
+    object stTextProps: TLabel
      Left = 14
-      Height = 25
+      Height = 18
      Top = 8
-      Width = 368
+      Width = 74
      Caption = 'stTextProps'
-      TabOrder = 0
+      ParentColor = False
    end
-    object stTextProps2: TStaticText
+    object stTextProps2: TLabel
+      AnchorSideTop.Side = asrBottom
      Left = 14
-      Height = 64
+      Height = 18
      Top = 40
-      Width = 368
+      Width = 82
      Caption = 'stTextProps2'
-      TabOrder = 1
+      ParentColor = False
    end
  end
 end
--- a/components/education/edupropsevents.lrs
+++ b/components/education/edupropsevents.lrs
@ -0,0 +1,58 @@
+{ This is an automatically generated lazarus resource file }
+
+LazarusResources.Add('TEduPropsEventsFrame','FORMDATA',[
+  'TPF0'#241#20'TEduPropsEventsFrame'#19'EduPropsEventsFrame'#6'Height'#3#137#1
+  +#5'Width'#3#200#1#12'ClientHeight'#3#137#1#11'ClientWidth'#3#200#1#8'TabOrde'
+  +'r'#2#0#10'DesignLeft'#3#159#1#9'DesignTop'#3'.'#1#0#242#2#0#6'TPanel'#9'Opt'
+  +'sPanel'#4'Left'#2#0#6'Height'#3#128#0#3'Top'#2#0#5'Width'#3#200#1#5'Align'#7
+  +#5'alTop'#18'ChildSizing.Layout'#7#29'cclTopToBottomThenLeftToRight'#27'Chil'
+  +'dSizing.ControlsPerLine'#2#2#12'ClientHeight'#3#128#0#11'ClientWidth'#3#200
+  +#1#8'TabOrder'#2#0#0#11'TRadioGroup'#10'rdGrpProps'#4'Left'#2#7#6'Height'#2
+  +'r'#3'Top'#2#7#5'Width'#3#185#0#5'Align'#7#6'alLeft'#8'AutoFill'#9#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#10'rdGrpProps'#28'ChildSizing.LeftRightSpa'
+  +'cing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizo'
+  +'ntal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'c'
+  +'rsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChil'
+  +'ds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layo'
+  +'ut'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1
+  +#12'ClientHeight'#2'_'#11'ClientWidth'#3#181#0#7'OnClick'#7#15'rdGrpPropsCli'
+  +'ck'#8'TabOrder'#2#0#0#12'TRadioButton'#16'PropsMinRadioBtn'#4'Left'#2#14#6
+  +'Height'#2#17#3'Top'#2#8#5'Width'#3#165#0#5'Align'#7#8'alCustom'#7'Caption'#6
+  +#16'PropsMinRadioBtn'#7'Checked'#9#7'OnClick'#7#21'PropsMinRadioBtnClick'#5
+  +'State'#7#9'cbChecked'#8'TabOrder'#2#0#7'TabStop'#8#0#0#12'TRadioButton'#16
+  +'PropsExtRadioBtn'#4'Left'#2#14#6'Height'#2#17#3'Top'#2' '#5'Width'#3#165#0#5
+  +'Align'#7#8'alCustom'#7'Caption'#6#16'PropsExtRadioBtn'#7'OnClick'#7#21'Prop'
+  +'sExtRadioBtnClick'#8'TabOrder'#2#1#7'TabStop'#8#0#0#12'TRadioButton'#17'Pro'
+  +'psFullRadioBtn'#4'Left'#2#14#6'Height'#2#17#3'Top'#2'8'#5'Width'#3#166#0#5
+  +'Align'#7#8'alCustom'#7'Caption'#6#17'PropsFullRadioBtn'#7'OnClick'#7#22'Pro'
+  +'psFullRadioBtnClick'#8'TabOrder'#2#2#0#0#0#11'TRadioGroup'#11'rdGrpEvents'#4
+  +'Left'#3#198#0#6'Height'#2'r'#3'Top'#2#7#5'Width'#3#185#0#5'Align'#7#6'alLef'
+  +'t'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'rdGrpEvents'
+  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
+  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
+  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
+  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
+  +'ilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSi'
+  +'zing.ControlsPerLine'#2#1#12'ClientHeight'#2'_'#11'ClientWidth'#3#181#0#8'T'
+  +'abOrder'#2#1#0#12'TRadioButton'#17'EventsMinRadioBtn'#4'Left'#2#14#6'Height'
+  +#2#17#3'Top'#2#8#5'Width'#3#160#0#5'Align'#7#8'alCustom'#7'Caption'#6#17'Eve'
+  +'ntsMinRadioBtn'#7'Checked'#9#7'OnClick'#7#22'EventsMinRadioBtnClick'#5'Stat'
+  +'e'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioButton'#17'EventsExtRadioBtn'
+  +#4'Left'#2#14#6'Height'#2#17#3'Top'#2' '#5'Width'#3#160#0#5'Align'#7#8'alCus'
+  +'tom'#7'Caption'#6#17'EventsExtRadioBtn'#7'OnClick'#7#22'EventsExtRadioBtnCl'
+  +'ick'#8'TabOrder'#2#1#0#0#12'TRadioButton'#18'EventsFullRadioBtn'#4'Left'#2
+  +#14#6'Height'#2#17#3'Top'#2'8'#5'Width'#3#161#0#5'Align'#7#8'alCustom'#7'Cap'
+  +'tion'#6#18'EventsFullRadioBtn'#7'OnClick'#7#23'EventsFullRadioBtnClick'#8'T'
+  +'abOrder'#2#2#0#0#0#0#242#2#1#9'TGroupBox'#12'grpBoxEvents'#4'Left'#2#0#6'He'
+  +'ight'#2'A'#3'Top'#3#0#1#5'Width'#3#200#1#5'Align'#7#5'alTop'#7'Caption'#6#12
+  +'grpBoxEvents'#12'ClientHeight'#2'.'#11'ClientWidth'#3#196#1#8'TabOrder'#2#1
+  +#0#6'TLabel'#12'stTextEvents'#4'Left'#2#14#6'Height'#2#18#3'Top'#2#8#5'Width'
+  +#2'Q'#7'Caption'#6#12'stTextEvents'#11'ParentColor'#8#0#0#0#242#2#2#9'TGroup'
+  +'Box'#11'grpBoxProps'#4'Left'#2#0#6'Height'#3#128#0#3'Top'#3#128#0#5'Width'#3
+  +#200#1#5'Align'#7#5'alTop'#7'Caption'#6#11'grpBoxProps'#12'ClientHeight'#2'm'
+  +#11'ClientWidth'#3#196#1#8'TabOrder'#2#2#0#6'TLabel'#11'stTextProps'#4'Left'
+  +#2#14#6'Height'#2#18#3'Top'#2#8#5'Width'#2'J'#7'Caption'#6#11'stTextProps'#11
+  +'ParentColor'#8#0#0#6'TLabel'#12'stTextProps2'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2#14#6'Height'#2#18#3'Top'#2'('#5'Width'#2'R'#7'Caption'#6
+  +#12'stTextProps2'#11'ParentColor'#8#0#0#0#0
+]);
--- a/components/education/edupropsevents.pas
+++ b/components/education/edupropsevents.pas
@ -73,9 +73,9 @@ type
    EventsExtRadioBtn: TRadioButton;
    EventsFullRadioBtn: TRadioButton;
    rdGrpEvents: TRadioGroup;
-    stTextEvents: TStaticText;
-    stTextProps2: TStaticText;
-    stTextProps: TStaticText;
+    stTextEvents: TLabel;
+    stTextProps: TLabel;
+    stTextProps2: TLabel;

    procedure EventsExtRadioBtnClick(Sender: TObject);
    procedure EventsFullRadioBtnClick(Sender: TObject);
@ -168,7 +168,6 @@ end;

 { TEduPropsEventsFrame }

-
 procedure TEduPropsEventsFrame.PropsMinRadioBtnClick(Sender: TObject);
 begin
  grpBoxProps.Caption:=ersGrpBoxPropsMin;
@ -213,8 +212,6 @@ begin
    stTextProps2.Visible:=false;
 end;

-
-
 function TEduPropsEventsFrame.GetTitle: String;
 begin
  Result:=ersEduPropsEventsTitle;