Merged revision(s) 56223 #748967367b, 56225-56228 #e96879b669-#e96879b669 from trunk:

examples/treeview: Use default font (instead of MS SansSerif)
........
examples/ResizeImageDemo: remove unit Windows from "uses".
........
examples/dbeditmask: Fix crash due to incorrect dateseparator in some countries. Use default font instead of MS SansSerif.
........
examples/componentstreaming: Preving explaining labels reaching beyond form borders.
........
Examples/synedit1: Fix compilation issue
........

git-svn-id: branches/fixes_1_8@56245 -
This commit is contained in:
maxim 2017-10-30 21:39:04 +00:00
parent 30f547a480
commit 0d9d5836a6
11 changed files with 47 additions and 52 deletions

View File

@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="9"/> <Version Value="10"/>
<General> <General>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<Title Value="project1"/> <Title Value="project1"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
<Icon Value="0"/>
</General> </General>
<i18n> <i18n>
<EnableI18N LFM="False"/> <EnableI18N LFM="False"/>
</i18n> </i18n>
<VersionInfo>
<StringTable ProductVersion=""/>
</VersionInfo>
<BuildModes Count="1"> <BuildModes Count="1">
<Item1 Name="Default" Default="True"/> <Item1 Name="Default" Default="True"/>
</BuildModes> </BuildModes>

View File

@ -11,7 +11,7 @@ object Form1: TForm1
OnCreate = FormCreate OnCreate = FormCreate
OnResize = FormResize OnResize = FormResize
ShowHint = True ShowHint = True
LCLVersion = '1.5' LCLVersion = '1.9.0.0'
object Pnl1: TPanel object Pnl1: TPanel
Left = 0 Left = 0
Height = 63 Height = 63
@ -23,25 +23,25 @@ object Form1: TForm1
TabOrder = 0 TabOrder = 0
object CheckBoxImage: TCheckBox object CheckBoxImage: TCheckBox
Left = 168 Left = 168
Height = 22 Height = 19
Top = 0 Top = 0
Width = 167 Width = 144
Caption = 'Redraw on Image resize' Caption = 'Redraw on Image resize'
TabOrder = 0 TabOrder = 0
end end
object CheckBoxPanel: TCheckBox object CheckBoxPanel: TCheckBox
Left = 168 Left = 168
Height = 22 Height = 19
Top = 16 Top = 16
Width = 160 Width = 140
Caption = 'Redraw on Panel resize' Caption = 'Redraw on Panel resize'
TabOrder = 1 TabOrder = 1
end end
object CheckBoxForm: TCheckBox object CheckBoxForm: TCheckBox
Left = 168 Left = 168
Height = 22 Height = 19
Top = 32 Top = 32
Width = 160 Width = 139
Caption = 'Redraw on Form resize' Caption = 'Redraw on Form resize'
TabOrder = 2 TabOrder = 2
end end

View File

@ -13,7 +13,7 @@ unit Unit1;
interface interface
uses uses
{$ifdef Windows} Windows, {$Endif}SysUtils, Forms, Graphics, ExtCtrls, StdCtrls; SysUtils, Forms, Graphics, ExtCtrls, StdCtrls;
type type

View File

@ -2,28 +2,32 @@ object CompStreamDemoForm: TCompStreamDemoForm
Left = 292 Left = 292
Height = 485 Height = 485
Top = 168 Top = 168
Width = 525 Width = 568
HorzScrollBar.Page = 524 HorzScrollBar.Page = 524
VertScrollBar.Page = 484 VertScrollBar.Page = 484
Caption = 'Streaming components example' Caption = 'Streaming components example'
ClientHeight = 485 ClientHeight = 485
ClientWidth = 525 ClientWidth = 568
OnCreate = FormCreate OnCreate = FormCreate
LCLVersion = '0.9.29' LCLVersion = '1.9.0.0'
object Note1Label: TLabel object Note1Label: TLabel
Left = 253 Left = 264
Height = 16 Height = 128
Top = 27 Top = 27
Width = 463 Width = 288
Anchors = [akTop, akLeft, akRight]
AutoSize = False
Caption = 'This example demonstrates, how to stream a component to a stream in binary format ...' Caption = 'This example demonstrates, how to stream a component to a stream in binary format ...'
ParentColor = False ParentColor = False
WordWrap = True WordWrap = True
end end
object Note2Label: TLabel object Note2Label: TLabel
Left = 265 Left = 264
Height = 16 Height = 161
Top = 325 Top = 308
Width = 1269 Width = 290
Anchors = [akTop, akLeft, akRight, akBottom]
AutoSize = False
Caption = '... and how to reconstruct the component from a stream. This technique can be used to save components to disk or to transfer them via network. Of course this also works for your own classes as long as they are descendants of TComponent.' Caption = '... and how to reconstruct the component from a stream. This technique can be used to save components to disk or to transfer them via network. Of course this also works for your own classes as long as they are descendants of TComponent.'
ParentColor = False ParentColor = False
WordWrap = True WordWrap = True
@ -34,7 +38,7 @@ object CompStreamDemoForm: TCompStreamDemoForm
Top = 25 Top = 25
Width = 195 Width = 195
Caption = 'Source' Caption = 'Source'
ClientHeight = 72 ClientHeight = 70
ClientWidth = 191 ClientWidth = 191
TabOrder = 0 TabOrder = 0
object AGroupBox: TGroupBox object AGroupBox: TGroupBox
@ -68,17 +72,17 @@ object CompStreamDemoForm: TCompStreamDemoForm
Left = 15 Left = 15
Height = 132 Height = 132
Top = 170 Top = 170
Width = 496 Width = 539
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
Caption = 'Stream (special characters are shown as hexnumbers)' Caption = 'Stream (special characters are shown as hexnumbers)'
ClientHeight = 114 ClientHeight = 112
ClientWidth = 492 ClientWidth = 535
TabOrder = 3 TabOrder = 3
object StreamMemo: TMemo object StreamMemo: TMemo
Left = 0 Left = 0
Height = 95 Height = 93
Top = 0 Top = 0
Width = 492 Width = 535
Align = alClient Align = alClient
Lines.Strings = ( Lines.Strings = (
'First click on the button above, then on button below' 'First click on the button above, then on button below'
@ -89,8 +93,8 @@ object CompStreamDemoForm: TCompStreamDemoForm
object StreamAsLFMCheckBox: TCheckBox object StreamAsLFMCheckBox: TCheckBox
Left = 0 Left = 0
Height = 19 Height = 19
Top = 95 Top = 93
Width = 492 Width = 535
Align = alBottom Align = alBottom
Caption = 'Show stream in LFM format (text)' Caption = 'Show stream in LFM format (text)'
OnChange = StreamAsLFMCheckBoxChange OnChange = StreamAsLFMCheckBoxChange

View File

@ -8,16 +8,14 @@ object Form1: TForm1
Caption = 'Test DBEdit with mask' Caption = 'Test DBEdit with mask'
ClientHeight = 443 ClientHeight = 443
ClientWidth = 515 ClientWidth = 515
Font.Height = -11
Font.Name = 'MS Sans Serif'
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '1.9.0.0'
object Label3: TLabel object Label3: TLabel
Left = 8 Left = 8
Height = 13 Height = 15
Top = 16 Top = 16
Width = 163 Width = 171
Caption = 'ADate Field - Mask: !99/99/00;1;_' Caption = 'ADate Field - Mask: !99/99/00;1;_'
ParentColor = False ParentColor = False
end end
@ -68,7 +66,7 @@ object Form1: TForm1
end end
object DateEdit: TDBEdit object DateEdit: TDBEdit
Left = 8 Left = 8
Height = 19 Height = 23
Top = 32 Top = 32
Width = 246 Width = 246
CustomEditMask = True CustomEditMask = True
@ -81,16 +79,16 @@ object Form1: TForm1
end end
object ShowLongDateCheckBox: TCheckBox object ShowLongDateCheckBox: TCheckBox
Left = 270 Left = 270
Height = 21 Height = 19
Top = 32 Top = 32
Width = 112 Width = 98
Caption = 'Show Full Date' Caption = 'Show Full Date'
OnChange = ShowLongDateCheckBoxChange OnChange = ShowLongDateCheckBoxChange
TabOrder = 3 TabOrder = 3
end end
object IntEdit: TDBEdit object IntEdit: TDBEdit
Left = 8 Left = 8
Height = 19 Height = 23
Top = 80 Top = 80
Width = 246 Width = 246
CustomEditMask = True CustomEditMask = True
@ -103,15 +101,15 @@ object Form1: TForm1
end end
object Label1: TLabel object Label1: TLabel
Left = 8 Left = 8
Height = 13 Height = 15
Top = 64 Top = 64
Width = 51 Width = 50
Caption = 'AInt Field' Caption = 'AInt Field'
ParentColor = False ParentColor = False
end end
object DBEdit1: TDBEdit object DBEdit1: TDBEdit
Left = 271 Left = 271
Height = 19 Height = 23
Top = 80 Top = 80
Width = 193 Width = 193
CustomEditMask = True CustomEditMask = True
@ -124,9 +122,9 @@ object Form1: TForm1
end end
object Label2: TLabel object Label2: TLabel
Left = 270 Left = 270
Height = 13 Height = 15
Top = 64 Top = 64
Width = 100 Width = 95
Caption = 'AStr Field (Phone)' Caption = 'AStr Field (Phone)'
ParentColor = False ParentColor = False
end end

View File

@ -53,6 +53,7 @@ uses
procedure TForm1.FormCreate(Sender: TObject); procedure TForm1.FormCreate(Sender: TObject);
begin begin
DefaultFormatSettings.ShortDateFormat := 'd/m/yyyy'; DefaultFormatSettings.ShortDateFormat := 'd/m/yyyy';
DefaultFormatSettings.DateSeparator := '/';
if not FileExistsUTF8(Dbf1.TableName) then if not FileExistsUTF8(Dbf1.TableName) then
begin begin
Dbf1.FieldDefs.Clear; Dbf1.FieldDefs.Clear;

View File

@ -59,7 +59,7 @@
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/> <IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Parsing> <Parsing>
<SyntaxOptions> <SyntaxOptions>

Binary file not shown.

View File

@ -23,7 +23,7 @@ program synedit1;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
uses uses
Classes, LazUTF8, Forms, Graphics, SynEdit, SynHighlighterPas; Classes, LazUTF8, Forms, Graphics, Interfaces, SynEdit, SynHighlighterPas;
type type
TForm1 = class(TForm) TForm1 = class(TForm)

View File

@ -53,7 +53,7 @@
<Filename Value="TV_Add_Remove"/> <Filename Value="TV_Add_Remove"/>
</Target> </Target>
<SearchPaths> <SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths> </SearchPaths>
<Linking> <Linking>
<Options> <Options>

View File

@ -7,19 +7,15 @@ object Form1: TForm1
Caption = 'TreeView Example 1' Caption = 'TreeView Example 1'
ClientHeight = 427 ClientHeight = 427
ClientWidth = 455 ClientWidth = 455
Font.Height = -11 LCLVersion = '1.9.0.0'
Font.Name = 'MS Sans Serif'
LCLVersion = '0.9.27'
object tv_eg1: TTreeView object tv_eg1: TTreeView
Left = 0 Left = 0
Height = 427 Height = 427
Top = 0 Top = 0
Width = 196 Width = 196
Align = alLeft Align = alLeft
DefaultItemHeight = 14
HideSelection = False HideSelection = False
Indent = 19 Indent = 19
ParentCtl3D = False
ReadOnly = True ReadOnly = True
TabOrder = 0 TabOrder = 0
Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips] Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips]