- Added build modes

- Fixed Login Form layout
- Fixed compilation with FPC 2.5.1
This commit is contained in:
Andreas Schneider 2010-12-25 14:43:17 +01:00
parent 49599fdcf4
commit d158c28452
3 changed files with 172 additions and 85 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<Version Value="7"/>
<Version Value="9"/>
<General>
<Flags>
<MainUnitHasUsesSectionForAllUnits Value="False"/>
@ -9,7 +9,6 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<TargetFileExt Value=".exe"/>
<Title Value="CentrED"/>
<ResourceType Value="res"/>
<Icon Value="0"/>
@ -20,8 +19,109 @@
<MinorVersionNr Value="6"/>
<RevisionNr Value="1"/>
<BuildNr Value="209"/>
<StringTable Comments="" CompanyName="AKS DataBasis" FileDescription="UO CentrED" FileVersion="0.6.1.209" InternalName="CentrED" LegalCopyright="Andreas Schneider" LegalTrademarks="" OriginalFilename="CentrED.exe" ProductName="CentrED" ProductVersion="0.6.1.209"/>
<StringTable CompanyName="AKS DataBasis" FileDescription="UO CentrED" InternalName="CentrED" LegalCopyright="Andreas Schneider" OriginalFilename="CentrED.exe" ProductName="CentrED"/>
</VersionInfo>
<BuildModes Count="3">
<Item1 Name="default" Default="True"/>
<Item2 Name="Release Win32">
<CompilerOptions>
<Version Value="9"/>
<Target>
<Filename Value="../bin/CentrED"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
<OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging;../Imaging/JpegLib;../Imaging/ZLib;Tools"/>
<UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
<SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType);..;../UOLib;../MulProvider;../Imaging;../Imaging/JpegLib;../Imaging/ZLib;Tools"/>
<LCLWidgetType Value="win32"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<CStyleOperator Value="False"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<TargetCPU Value="i386"/>
<TargetOS Value="win32"/>
<Optimizations>
<OptimizationLevel Value="3"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
<UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
<Other>
<CompilerMessages>
<IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-FE../bin/
-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item2>
<Item3 Name="Release Linux GTK2 x86">
<CompilerOptions>
<Version Value="9"/>
<Target>
<Filename Value="../bin/CentrED"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
<OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging;../Imaging/JpegLib;../Imaging/ZLib;Tools"/>
<UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
<SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType);..;../UOLib;../MulProvider;../Imaging;../Imaging/JpegLib;../Imaging/ZLib;Tools"/>
<LCLWidgetType Value="gtk2"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<CStyleOperator Value="False"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<TargetCPU Value="i386"/>
<TargetOS Value="linux"/>
<Optimizations>
<OptimizationLevel Value="3"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
<UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
<Other>
<CompilerMessages>
<IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-FE../bin/
-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item3>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@ -327,39 +427,31 @@
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="8"/>
<Version Value="9"/>
<Target>
<Filename Value="../bin/CentrED"/>
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)/;../Imaging/;../"/>
<OtherUnitFiles Value="../;../UOLib/;../MulProvider/;../Imaging/;../Imaging/JpegLib/;../Imaging/ZLib/;Tools/"/>
<IncludeFiles Value="$(ProjOutDir);../Imaging;.."/>
<OtherUnitFiles Value="..;../UOLib;../MulProvider;../Imaging;../Imaging/JpegLib;../Imaging/ZLib;Tools"/>
<UnitOutputDirectory Value="../obj/$(TargetCPU)-$(TargetOS)"/>
<SrcPath Value="$(LazarusDir)/lcl/;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)/;../;../UOLib/;../MulProvider/;../Imaging/;../Imaging/JpegLib/;../Imaging/ZLib/;Tools/"/>
<SrcPath Value="$(LazarusDir)/lcl;$(LazarusDir)/lcl/interfaces/$(LCLWidgetType);..;../UOLib;../MulProvider;../Imaging;../Imaging/JpegLib;../Imaging/ZLib;Tools"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<CStyleOperator Value="False"/>
<UseAnsiStrings Value="True"/>
</SyntaxOptions>
</Parsing>
<CodeGeneration>
<SmartLinkUnit Value="True"/>
<Optimizations>
<OptimizationLevel Value="3"/>
<OptimizationLevel Value="0"/>
</Optimizations>
</CodeGeneration>
<Linking>
<Debugging>
<UseLineInfoUnit Value="False"/>
<StripSymbols Value="True"/>
<GenerateDwarf Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
<Options>
<Win32>
<GraphicApplication Value="True"/>
</Win32>
</Options>
</Linking>
<Other>
<CompilerMessages>

View File

@ -1,15 +1,14 @@
object frmLogin: TfrmLogin
Left = 290
Height = 266
Top = 171
Width = 481
Height = 250
Top = 201
Width = 483
ActiveControl = btnOK
AutoSize = True
BorderIcons = [biSystemMenu]
BorderStyle = bsDialog
Caption = 'UO CentrED'
ClientHeight = 266
ClientWidth = 481
ClientHeight = 250
ClientWidth = 483
Font.Height = -11
OnClose = FormClose
OnCreate = FormCreate
@ -25,9 +24,9 @@ object frmLogin: TfrmLogin
AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom
Left = 0
Height = 19
Top = 239
Width = 481
Height = 1
Top = 249
Width = 483
Alignment = taCenter
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 8
@ -39,15 +38,15 @@ object frmLogin: TfrmLogin
AnchorSideRight.Control = gbActions
AnchorSideBottom.Side = asrCenter
Left = 8
Height = 128
Height = 138
Top = 4
Width = 314
Width = 316
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Left = 8
BorderSpacing.Top = 4
BorderSpacing.Right = 8
Caption = 'Connection'
ClientHeight = 114
ClientHeight = 120
ClientWidth = 312
TabOrder = 0
object lblHost: TLabel
@ -57,7 +56,7 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrCenter
Left = 32
Height = 14
Top = 10
Top = 11
Width = 28
BorderSpacing.Left = 8
Caption = 'Host:'
@ -70,8 +69,8 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrCenter
Left = 32
Height = 14
Top = 46
Width = 58
Top = 49
Width = 55
BorderSpacing.Left = 8
Caption = 'Username:'
ParentColor = False
@ -83,8 +82,8 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrCenter
Left = 32
Height = 14
Top = 81
Width = 54
Top = 86
Width = 53
BorderSpacing.Left = 8
Caption = 'Password:'
ParentColor = False
@ -95,7 +94,7 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrCenter
Left = 8
Height = 16
Top = 9
Top = 10
Width = 16
AutoSize = True
BorderSpacing.Left = 8
@ -191,7 +190,7 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrCenter
Left = 8
Height = 16
Top = 45
Top = 48
Width = 16
AutoSize = True
Picture.Data = {
@ -286,7 +285,7 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrCenter
Left = 8
Height = 16
Top = 80
Top = 85
Width = 16
AutoSize = True
Picture.Data = {
@ -370,10 +369,10 @@ object frmLogin: TfrmLogin
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = gbConnection
AnchorSideRight.Control = edPort
Left = 98
Height = 19
Left = 95
Height = 21
Top = 8
Width = 143
Width = 146
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8
BorderSpacing.Top = 8
@ -386,10 +385,10 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edPort
AnchorSideRight.Side = asrBottom
Left = 98
Height = 19
Top = 44
Width = 206
Left = 95
Height = 21
Top = 46
Width = 209
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 17
TabOrder = 2
@ -400,10 +399,10 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = edUsername
AnchorSideRight.Side = asrBottom
Left = 98
Height = 19
Top = 79
Width = 206
Left = 95
Height = 21
Top = 83
Width = 209
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 16
BorderSpacing.Bottom = 16
@ -420,7 +419,7 @@ object frmLogin: TfrmLogin
AnchorSideBottom.Control = edHost
AnchorSideBottom.Side = asrBottom
Left = 249
Height = 19
Height = 21
Top = 8
Width = 55
Anchors = [akTop, akRight, akBottom]
@ -438,17 +437,15 @@ object frmLogin: TfrmLogin
AnchorSideTop.Control = gbConnection
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 330
Height = 78
Top = 12
Left = 332
Height = 92
Top = 4
Width = 143
Anchors = [akTop, akLeft, akRight]
AutoSize = True
Anchors = [akTop, akRight]
BorderSpacing.Left = 8
BorderSpacing.Top = 8
BorderSpacing.Right = 8
ClientHeight = 76
ClientWidth = 141
ClientHeight = 74
ClientWidth = 139
TabOrder = 2
object btnOK: TButton
AnchorSideLeft.Control = gbActions
@ -458,7 +455,8 @@ object frmLogin: TfrmLogin
Left = 8
Height = 25
Top = 8
Width = 125
Width = 123
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 8
BorderSpacing.InnerBorder = 4
Caption = '&OK'
@ -475,7 +473,7 @@ object frmLogin: TfrmLogin
Left = 8
Height = 25
Top = 41
Width = 125
Width = 123
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Bottom = 8
BorderSpacing.InnerBorder = 4
@ -493,13 +491,12 @@ object frmLogin: TfrmLogin
AnchorSideRight.Side = asrBottom
Left = 8
Height = 95
Top = 136
Width = 314
Top = 146
Width = 316
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 4
Caption = 'Data files'
ClientHeight = 81
ClientHeight = 77
ClientWidth = 312
TabOrder = 1
object lblData: TLabel
@ -508,7 +505,7 @@ object frmLogin: TfrmLogin
AnchorSideRight.Control = gbData
AnchorSideRight.Side = asrBottom
Left = 8
Height = 46
Height = 40
Top = 4
Width = 296
Anchors = [akTop, akLeft, akRight]
@ -524,12 +521,13 @@ object frmLogin: TfrmLogin
AnchorSideTop.Control = lblData
AnchorSideTop.Side = asrBottom
Left = 8
Height = 19
Top = 54
Height = 21
Top = 48
Width = 272
ShowHidden = False
ButtonWidth = 23
NumGlyphs = 1
AutoSize = False
BorderSpacing.Top = 4
BorderSpacing.Bottom = 8
MaxLength = 0
@ -542,28 +540,26 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = gbActions
AnchorSideRight.Side = asrBottom
Left = 330
Height = 85
Top = 98
Left = 332
Height = 81
Top = 104
Width = 143
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 8
Caption = 'Profiles'
ClientHeight = 71
ClientWidth = 141
ClientHeight = 63
ClientWidth = 139
TabOrder = 3
object btnSaveProfile: TSpeedButton
AnchorSideTop.Control = btnDeleteProfile
AnchorSideRight.Control = btnDeleteProfile
Left = 81
Left = 79
Height = 22
Hint = 'Save profile'
Top = 41
Top = 33
Width = 22
Anchors = [akTop, akRight]
BorderSpacing.Right = 8
Color = clBtnFace
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000BA6A36FFB969
@ -611,15 +607,14 @@ object frmLogin: TfrmLogin
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cbProfile
AnchorSideRight.Side = asrBottom
Left = 111
Left = 109
Height = 22
Hint = 'Delete profile'
Top = 41
Top = 33
Width = 22
Anchors = [akTop, akRight]
BorderSpacing.Top = 8
BorderSpacing.Bottom = 8
Color = clBtnFace
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000000000000000
@ -668,14 +663,14 @@ object frmLogin: TfrmLogin
AnchorSideRight.Control = gbProfiles
AnchorSideRight.Side = asrBottom
Left = 8
Height = 29
Height = 21
Top = 4
Width = 125
Width = 123
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 8
BorderSpacing.Top = 4
BorderSpacing.Right = 8
ItemHeight = 0
ItemHeight = 13
OnChange = cbProfileChange
Style = csDropDownList
TabOrder = 0

View File

@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
* Portions Copyright 2009 Andreas Schneider
* Portions Copyright 2010 Andreas Schneider
*)
unit UCacheManager;
@ -43,7 +43,7 @@ type
{ TCacheManager }
generic TCacheManager<T> = class
type public
public type
{ Types }
TRemoveObjectEvent = procedure(AObject: T) of object;
@ -53,7 +53,7 @@ type
Obj: T;
Next: PCacheEntry;
end;
var protected
protected
{ Members }
FSize: Integer;
FFirst: PCacheEntry;