Examples, FontEnum: removed LRS file and fixed encoding related issues

git-svn-id: trunk@39622 -
2025-04-06 07:58:07 +02:00 · 2012-12-22 21:12:10 +00:00 · 2012-12-22 21:12:10 +00:00 · 8092042547
commit 8092042547
parent 5b55b8bf05
6 changed files with 34 additions and 102 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -4207,7 +4207,6 @@ examples/fbadmin/formunit.pas svneol=native#text/plain
 examples/fontenum/fontenumeration.lpi svneol=native#text/plain
 examples/fontenum/fontenumeration.lpr svneol=native#text/pascal
 examples/fontenum/mainunit.lfm svneol=native#text/plain
-examples/fontenum/mainunit.lrs svneol=native#text/pascal
 examples/fontenum/mainunit.pas svneol=native#text/pascal
 examples/fpdocmanager/FPDocManager.lpi svneol=native#text/plain
 examples/fpdocmanager/FPDocManager.lpr svneol=native#text/plain
--- a/examples/fontenum/fontenumeration.lpi
+++ b/examples/fontenum/fontenumeration.lpi
@ -8,9 +8,10 @@
        <SaveOnlyProjectUnits Value="True"/>
        <LRSInOutputDirectory Value="False"/>
      </Flags>
+      <SessionStorage Value="InProjectDir"/>
      <MainUnit Value="0"/>
      <Title Value="project1"/>
-      <ActiveWindowIndexAtStart Value="0"/>
+      <ResourceType Value="res"/>
    </General>
    <BuildModes Count="1">
      <Item1 Name="default" Default="True"/>
@ -38,21 +39,14 @@
        <Filename Value="fontenumeration.lpr"/>
        <IsPartOfProject Value="True"/>
        <UnitName Value="fontenumeration"/>
-        <TopLine Value="1"/>
-        <CursorPos X="44" Y="15"/>
-        <UsageCount Value="158"/>
      </Unit0>
      <Unit1>
        <Filename Value="mainunit.pas"/>
        <IsPartOfProject Value="True"/>
        <ComponentName Value="frmMain"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
        <UnitName Value="mainunit"/>
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="47" Y="9"/>
-        <UsageCount Value="158"/>
-        <Loaded Value="True"/>
      </Unit1>
    </Units>
  </ProjectOptions>
@ -80,5 +74,4 @@
      </Item2>
    </Exceptions>
  </Debugging>
-  <EditorMacros Count="0"/>
 </CONFIG>
--- a/examples/fontenum/fontenumeration.lpr
+++ b/examples/fontenum/fontenumeration.lpr
@ -8,7 +8,6 @@ uses
  { add your units here }, mainunit;

 begin
-  Application.Title:='project1';
  Application.Initialize;
  Application.CreateForm(TfrmMain, frmMain);
  Application.Run;
--- a/examples/fontenum/mainunit.lfm
+++ b/examples/fontenum/mainunit.lfm
@ -7,62 +7,59 @@ object frmMain: TfrmMain
  VertScrollBar.Page = 439
  ActiveControl = lbFamily
  Caption = 'frmMain'
+  ClientHeight = 440
+  ClientWidth = 714
  OnCloseQuery = FormCloseQuery
  OnCreate = FormCreate
  OnShow = FormShow
  ShowHint = True
+  LCLVersion = '1.1'
  object Label3: TLabel
    Left = 548
    Height = 13
    Top = 257
-    Width = 29
+    Width = 24
    Caption = 'Filtro'
-    Color = clNone
    ParentColor = False
  end
  object Label4: TLabel
    Left = 216
    Height = 13
    Top = 16
-    Width = 73
+    Width = 62
    Caption = 'Face font list'
-    Color = clNone
    ParentColor = False
  end
  object Label5: TLabel
    Left = 424
    Height = 13
    Top = 11
-    Width = 35
+    Width = 29
    Caption = 'Styles'
-    Color = clNone
    ParentColor = False
  end
  object Sizes: TLabel
    Left = 648
    Height = 13
    Top = 11
-    Width = 31
+    Width = 24
    Caption = 'Sizes'
-    Color = clNone
    ParentColor = False
  end
  object lblCharset: TLabel
    Left = 424
    Height = 13
    Top = 176
-    Width = 57
+    Width = 48
    Caption = 'lblCharset'
-    Color = clNone
    ParentColor = False
  end
  object Label6: TLabel
    Left = 11
    Height = 13
    Top = 16
-    Width = 29
+    Width = 24
    Caption = 'Filter'
-    Color = clNone
    ParentColor = False
  end
  object lbFamily: TListBox
@ -70,17 +67,16 @@ object frmMain: TfrmMain
    Height = 272
    Top = 32
    Width = 200
+    ItemHeight = 0
    OnClick = lbFamilyClick
    TabOrder = 0
-    TopIndex = -1
  end
  object cbCharset: TComboBox
    Left = 8
    Height = 21
    Top = 37
    Width = 194
-    AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
-    MaxLength = 0
+    ItemHeight = 13
    TabOrder = 1
    Text = 'ANSI_CHARSET'
  end
@ -99,34 +95,34 @@ object frmMain: TfrmMain
    Height = 128
    Top = 32
    Width = 208
+    ItemHeight = 0
    OnClick = lbStylesClick
    TabOrder = 3
-    TopIndex = -1
  end
  object lbSizes: TListBox
    Left = 640
    Height = 272
    Top = 32
    Width = 56
+    ItemHeight = 0
    OnClick = lbSizesClick
    TabOrder = 4
-    TopIndex = -1
  end
  object lbCharset: TListBox
    Left = 424
    Height = 112
    Top = 192
    Width = 208
+    ItemHeight = 0
    OnClick = lbCharsetClick
    TabOrder = 5
-    TopIndex = -1
  end
  object cbPitch: TComboBox
    Left = 8
    Height = 21
    Top = 61
    Width = 194
-    AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+    ItemHeight = 13
    ItemIndex = 0
    Items.Strings = (
      'DEFAULT_PITCH'
@ -134,7 +130,6 @@ object frmMain: TfrmMain
      'VARIABLE_PITCH'
      'MONO_FONT'
    )
-    MaxLength = 0
    TabOrder = 6
    Text = 'DEFAULT_PITCH'
  end
@ -150,17 +145,17 @@ object frmMain: TfrmMain
  end
  object chkStrike: TCheckBox
    Left = 591
-    Height = 20
+    Height = 17
    Top = 312
-    Width = 72
+    Width = 61
    Caption = 'Strikeout'
    TabOrder = 8
  end
  object chkUnderLine: TCheckBox
    Left = 592
-    Height = 20
+    Height = 17
    Top = 336
-    Width = 81
+    Width = 66
    Caption = 'UnderLine'
    TabOrder = 9
  end
@ -182,17 +177,18 @@ object frmMain: TfrmMain
    AutoFillColumns = True
    ColCount = 1
    DefaultRowHeight = 17
-    FixedColor = clBtnFace
    FixedCols = 0
    FixedRows = 0
    Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
-    RowCount = 5
-    ScrollBars = ssAutoBoth
    TabOrder = 11
-    TabStop = True
+    ColWidths = (
+      364
+    )
  end
  object FontDialog1: TFontDialog
    Title = 'Select a font'
+    MinFontSize = 0
+    MaxFontSize = 0
    left = 312
    top = 384
  end
--- a/examples/fontenum/mainunit.lrs
+++ b/examples/fontenum/mainunit.lrs
@ -1,54 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrmMain','FORMDATA',[
-  'TPF0'#8'TfrmMain'#7'frmMain'#4'Left'#2'!'#6'Height'#3#184#1#3'Top'#2't'#5'Wi'
-  +'dth'#3#202#2#18'HorzScrollBar.Page'#3#201#2#18'VertScrollBar.Page'#3#183#1
-  +#13'ActiveControl'#7#8'lbFamily'#7'Caption'#6#7'frmMain'#12'OnCloseQuery'#7
-  +#14'FormCloseQuery'#8'OnCreate'#7#10'FormCreate'#6'OnShow'#7#8'FormShow'#8'S'
-  +'howHint'#9#0#6'TLabel'#6'Label3'#4'Left'#3'$'#2#6'Height'#2#13#3'Top'#3#1#1
-  +#5'Width'#2#29#7'Caption'#6#6'Filtro'#5'Color'#7#6'clNone'#11'ParentColor'#8
-  +#0#0#6'TLabel'#6'Label4'#4'Left'#3#216#0#6'Height'#2#13#3'Top'#2#16#5'Width'
-  +#2'I'#7'Caption'#6#14'Face font list'#5'Color'#7#6'clNone'#11'ParentColor'#8
-  +#0#0#6'TLabel'#6'Label5'#4'Left'#3#168#1#6'Height'#2#13#3'Top'#2#11#5'Width'
-  +#2'#'#7'Caption'#6#6'Styles'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TL'
-  +'abel'#5'Sizes'#4'Left'#3#136#2#6'Height'#2#13#3'Top'#2#11#5'Width'#2#31#7'C'
-  +'aption'#6#5'Sizes'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#10
-  +'lblCharset'#4'Left'#3#168#1#6'Height'#2#13#3'Top'#3#176#0#5'Width'#2'9'#7'C'
-  +'aption'#6#10'lblCharset'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabe'
-  +'l'#6'Label6'#4'Left'#2#11#6'Height'#2#13#3'Top'#2#16#5'Width'#2#29#7'Captio'
-  +'n'#6#6'Filter'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#8'TListBox'#8'lbF'
-  +'amily'#4'Left'#3#216#0#6'Height'#3#16#1#3'Top'#2' '#5'Width'#3#200#0#7'OnCl'
-  +'ick'#7#13'lbFamilyClick'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#9'TComboBox'
-  +#9'cbCharset'#4'Left'#2#8#6'Height'#2#21#3'Top'#2'%'#5'Width'#3#194#0#16'Aut'
-  +'oCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'M'
-  +'axLength'#2#0#8'TabOrder'#2#1#4'Text'#6#12'ANSI_CHARSET'#0#0#7'TButton'#7'B'
-  +'utton2'#4'Left'#2#8#6'Height'#2#25#3'Top'#2'`'#5'Width'#2'K'#25'BorderSpaci'
-  +'ng.InnerBorder'#2#4#7'Caption'#6#12'apply filter'#7'OnClick'#7#12'Button2Cl'
-  +'ick'#8'TabOrder'#2#2#0#0#8'TListBox'#8'lbStyles'#4'Left'#3#168#1#6'Height'#3
-  +#128#0#3'Top'#2' '#5'Width'#3#208#0#7'OnClick'#7#13'lbStylesClick'#8'TabOrde'
-  +'r'#2#3#8'TopIndex'#2#255#0#0#8'TListBox'#7'lbSizes'#4'Left'#3#128#2#6'Heigh'
-  +'t'#3#16#1#3'Top'#2' '#5'Width'#2'8'#7'OnClick'#7#12'lbSizesClick'#8'TabOrde'
-  +'r'#2#4#8'TopIndex'#2#255#0#0#8'TListBox'#9'lbCharset'#4'Left'#3#168#1#6'Hei'
-  +'ght'#2'p'#3'Top'#3#192#0#5'Width'#3#208#0#7'OnClick'#7#14'lbCharsetClick'#8
-  +'TabOrder'#2#5#8'TopIndex'#2#255#0#0#9'TComboBox'#7'cbPitch'#4'Left'#2#8#6'H'
-  +'eight'#2#21#3'Top'#2'='#5'Width'#3#194#0#16'AutoCompleteText'#11#22'cbactEn'
-  +'dOfLineComplete'#20'cbactSearchAscending'#0#9'ItemIndex'#2#0#13'Items.Strin'
-  +'gs'#1#6#13'DEFAULT_PITCH'#6#11'FIXED_PITCH'#6#14'VARIABLE_PITCH'#6#9'MONO_F'
-  +'ONT'#0#9'MaxLength'#2#0#8'TabOrder'#2#6#4'Text'#6#13'DEFAULT_PITCH'#0#0#7'T'
-  +'Button'#10'BtnFontDlg'#4'Left'#2'8'#6'Height'#2'('#3'Top'#3'p'#1#5'Width'#3
-  +#152#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#8'Font Dlg'#7'OnClick'
-  +#7#15'BtnFontDlgClick'#8'TabOrder'#2#7#0#0#9'TCheckBox'#9'chkStrike'#4'Left'
-  +#3'O'#2#6'Height'#2#20#3'Top'#3'8'#1#5'Width'#2'H'#7'Caption'#6#9'Strikeout'
-  +#8'TabOrder'#2#8#0#0#9'TCheckBox'#12'chkUnderLine'#4'Left'#3'P'#2#6'Height'#2
-  +#20#3'Top'#3'P'#1#5'Width'#2'Q'#7'Caption'#6#9'UnderLine'#8'TabOrder'#2#9#0#0
-  +#7'TButton'#7'Button1'#4'Left'#2'8'#6'Height'#2')'#3'Top'#3'8'#1#5'Width'#3
-  +#153#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#17'Reset Sample Text'#7
-  +'OnClick'#7#12'Button1Click'#8'TabOrder'#2#10#0#0#11'TStringGrid'#4'grid'#4
-  +'Left'#3#216#0#6'Height'#2'x'#3'Top'#3'8'#1#5'Width'#3'p'#1#15'AutoFillColum'
-  +'ns'#9#8'ColCount'#2#1#16'DefaultRowHeight'#2#17#10'FixedColor'#7#9'clBtnFac'
-  +'e'#9'FixedCols'#2#0#9'FixedRows'#2#0#7'Options'#11#15'goFixedVertLine'#15'g'
-  +'oFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#9'goEditing'
-  +#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabO'
-  +'rder'#2#11#7'TabStop'#9#0#0#11'TFontDialog'#11'FontDialog1'#5'Title'#6#13'S'
-  +'elect a font'#4'left'#3'8'#1#3'top'#3#128#1#0#0#0
-]);
--- a/examples/fontenum/mainunit.pas
+++ b/examples/fontenum/mainunit.pas
@ -71,6 +71,8 @@ var
 implementation
 {.$define Debug}

+{$R *.lfm}
+
 { TfrmMain }
 var
  LStyles,
@ -353,9 +355,9 @@ begin
  L := TStringList.Create;
  L.Add('abcdefhijklmnopqrstuvwxyz');
  L.Add('ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-  L.Add('01234567891   ¢£¤¥§');
-  L.Add('àáâãäåæçèéêëìíîïðñòóôõöøùúûü');
-  L.add('ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÕØÙÚÛÜÝß');
+  L.Add('01234567891   ўЈ¤Ґ§');
+  L.Add('абвгдежзийклмнопрстуфхцшщъыь');
+  L.add('АБВГДЕЖЗИЙКЛМНОПРСТУФХХШЩЪЫЬЭЯ');
  grid.Cols[0] := L;
  l.Free;
 end;
@ -574,11 +576,8 @@ end;
 procedure TfrmMain.UpdateFont(F: TFont);
 begin
  grid.Font := F;
-  grid.DefaultRowHeight := grid.canvas.textHeight('Áj') + 5;
+  grid.DefaultRowHeight := grid.canvas.textHeight('Бj') + 5;
 end;

-initialization
-  {$I mainunit.lrs}
-
 end.