diff --git a/components/tvplanit/packages/v103_lazarus.lpk b/components/tvplanit/packages/v103_lazarus.lpk
index d53d71804..8eff49e24 100644
--- a/components/tvplanit/packages/v103_lazarus.lpk
+++ b/components/tvplanit/packages/v103_lazarus.lpk
@@ -13,11 +13,12 @@
+
-
+
@@ -263,6 +264,14 @@
+
+
+
+
+
+
+
+
diff --git a/components/tvplanit/source/vpabout.pas b/components/tvplanit/source/vpabout.pas
index e49dad503..9a952221f 100644
--- a/components/tvplanit/source/vpabout.pas
+++ b/components/tvplanit/source/vpabout.pas
@@ -98,8 +98,10 @@ type
implementation
-{$IFNDEF LCL}
-{$R *.dfm}
+{$IFDEF LCL}
+ {$R *.lfm}
+{$ELSE}
+ {$R *.dfm}
{$ENDIF}
uses
diff --git a/components/tvplanit/source/vpalarmdlg.pas b/components/tvplanit/source/vpalarmdlg.pas
index 288695ccb..5b9e6bece 100644
--- a/components/tvplanit/source/vpalarmdlg.pas
+++ b/components/tvplanit/source/vpalarmdlg.pas
@@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
- LMessages,LCLProc,LCLType,LCLIntf,LResources,
+ LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,Messages,
{$ENDIF}
@@ -95,8 +95,10 @@ type
implementation
-{$IFNDEF LCL}
-{$R *.DFM}
+{$IFDEF LCL}
+ {$R *.LFM}
+{$ELSE}
+ {$R *.DFM}
{$ENDIF}
uses VpSR;
@@ -282,13 +284,6 @@ begin
Self.Height := 210;
OpenItemBtn.SetFocus;
end;
- (*
-initialization
-
-{$IFDEF LCL}
- {$I vpalarmdlg.lrs}
-{$ENDIF}
-*)
end.
diff --git a/components/tvplanit/source/vpbase.pas b/components/tvplanit/source/vpbase.pas
index b312dd410..52f1d2f76 100644
--- a/components/tvplanit/source/vpbase.pas
+++ b/components/tvplanit/source/vpbase.pas
@@ -34,17 +34,18 @@ interface
uses
{$IFDEF LCL}
- LMessages,LCLProc,LCLType, LResources,
+ LMessages, LCLProc, LCLType, LResources,
{$ELSE}
Windows,
{$ENDIF}
- Messages,Classes, Graphics, Controls, Dialogs, Forms, StdCtrls,
+ Messages,
+ Classes, Graphics, Controls, Dialogs, Forms, StdCtrls,
ExtCtrls, SysUtils, VpConst,
VpSR;
const
{Message base}
- Vp_First = WM_USER;//$7DF0; {Sets base for all Vp messages}
+ Vp_First = WM_USER; //$7DF0; {Sets base for all Vp messages}
const
{Custom message types}
@@ -960,13 +961,6 @@ begin
end;
end;
{=====}
- (*
-//soenr ich habe das hinzugefügt
-{$IFDEF FPC}
-initialization
- {$i ../source/vpbase.lrs}
-{$ENDIF}
-*)
end.
diff --git a/components/tvplanit/source/vpbaseds.pas b/components/tvplanit/source/vpbaseds.pas
index 500047397..7efc58d8a 100644
--- a/components/tvplanit/source/vpbaseds.pas
+++ b/components/tvplanit/source/vpbaseds.pas
@@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
- LMessages,LCLProc,LCLIntf,
+ LMessages, LCLProc, LCLIntf,
{$ELSE}
Windows,
{$ENDIF}
@@ -228,7 +228,7 @@ type
procedure DeregisterAllWatchers;
procedure DeregisterWatcher (Watcher : THandle);
- function GetNextID(TableName: string): int64; virtual; abstract;
+ function GetNextID(TableName: string): Integer; virtual; abstract;
property Resources: TVpResources read FResources;
procedure Load; virtual;
procedure LoadEvents; virtual; abstract;
diff --git a/components/tvplanit/source/vpcalendar.pas b/components/tvplanit/source/vpcalendar.pas
index 09a75125c..02652d497 100644
--- a/components/tvplanit/source/vpcalendar.pas
+++ b/components/tvplanit/source/vpcalendar.pas
@@ -26,7 +26,7 @@
{* *}
{* ***** END LICENSE BLOCK ***** *}
-{$I Vp.INC}
+{$I vp.inc}
unit VpCalendar;
{-Calendar component}
@@ -1862,7 +1862,7 @@ procedure TVpCustomCalendar.SetBorderStyle(Value : TBorderStyle);
begin
if Value <> FBorderStyle then begin
FBorderStyle := Value;
- RecreateWnd{$IFDEF LCL}(self){$ENDIF};
+ RecreateWnd(Self); { *Converted from RecreateWnd* }
end;
end;
{=====}
@@ -1986,7 +1986,7 @@ procedure TVpCustomCalendar.SetWantDblClicks(Value : Boolean);
begin
if Value <> FWantDblClicks then begin
FWantDblClicks := Value;
- RecreateWnd{$IFDEF LCL}(Self){$ENDIF};
+ RecreateWnd(Self); { *Converted from RecreateWnd* }
end;
end;
{=====}
diff --git a/components/tvplanit/source/vpconst.pas b/components/tvplanit/source/vpconst.pas
index 0a7cc468c..c84b31607 100644
--- a/components/tvplanit/source/vpconst.pas
+++ b/components/tvplanit/source/vpconst.pas
@@ -29,6 +29,11 @@
{.$I Vp.INC}
unit VpConst;
+
+{$IFDEF FPC}
+ {$MODE Delphi}
+{$ENDIF}
+
{-Versioning defines and methods}
interface
diff --git a/components/tvplanit/source/vpflxdsed1.lfm b/components/tvplanit/source/vpflxdsed1.lfm
index 1e270a614..a44300330 100644
--- a/components/tvplanit/source/vpflxdsed1.lfm
+++ b/components/tvplanit/source/vpflxdsed1.lfm
@@ -14,7 +14,9 @@ object frmFieldMapper: TfrmFieldMapper
OnClose = FormClose
OnShow = FormShow
Position = poScreenCenter
+ LCLVersion = '1.7'
object Panel1: TPanel
+ Left = 0
Height = 57
Top = 480
Width = 409
@@ -33,7 +35,9 @@ object frmFieldMapper: TfrmFieldMapper
end
end
object PageControl1: TPageControl
+ Left = 0
Height = 480
+ Top = 0
Width = 409
ActivePage = TabSheet1
Align = alClient
@@ -86,7 +90,7 @@ object frmFieldMapper: TfrmFieldMapper
Height = 255
Top = 56
Width = 145
- ItemHeight = 13
+ ItemHeight = 0
OnClick = DBFieldSelected
OnKeyPress = DatasetFieldLBKeyPress
TabOrder = 0
@@ -96,7 +100,7 @@ object frmFieldMapper: TfrmFieldMapper
Height = 255
Top = 56
Width = 145
- ItemHeight = 13
+ ItemHeight = 0
OnClick = VpFieldSelected
OnKeyPress = VPFieldLBKeyPress
TabOrder = 1
@@ -106,7 +110,7 @@ object frmFieldMapper: TfrmFieldMapper
Height = 100
Top = 349
Width = 217
- ItemHeight = 13
+ ItemHeight = 0
OnClick = FieldMappingsLBClick
OnKeyPress = FieldMappingsLBKeyPress
TabOrder = 2
@@ -126,7 +130,6 @@ object frmFieldMapper: TfrmFieldMapper
Height = 21
Top = 10
Width = 145
- AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
OnChange = DatasetComboChange
TabOrder = 4
@@ -139,7 +142,6 @@ object frmFieldMapper: TfrmFieldMapper
Width = 69
Caption = 'Add Field Mapping'
Enabled = False
- NumGlyphs = 0
OnClick = btnAddMappingClick
TabOrder = 5
end
diff --git a/components/tvplanit/source/vpflxdsed1.pas b/components/tvplanit/source/vpflxdsed1.pas
index 7dd80f50c..0124dbab5 100644
--- a/components/tvplanit/source/vpflxdsed1.pas
+++ b/components/tvplanit/source/vpflxdsed1.pas
@@ -37,10 +37,14 @@ interface
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
- {$IFNDEF RUNTIMETEST}
- {$IFDEF VERSION6} DesignIntf, DesignEditors, {$ELSE} DsgnIntf, {$ENDIF}
- {$ENDIF} {RUNTIMETEST}
- ExtCtrls, StdCtrls, Db, DBTables, VpData, VpFlxDS, ComCtrls, Buttons;
+ {$IFNDEF RUNTIMETEST}
+ {$IFDEF LCL}
+ propedits, componenteditors, FormEditingIntf, lclintf, IDEIntf,
+ {$ELSE}
+ {$IFDEF VERSION6} DesignIntf, DesignEditors, {$ELSE} DsgnIntf, {$ENDIF}, DBTables,
+ {$ENDIF}
+ {$ENDIF} {RUNTIMETEST}
+ ExtCtrls, StdCtrls, Db, VpData, VpFlxDS, ComCtrls, Buttons;
type
TfrmFieldMapper = class(TForm)
@@ -100,7 +104,12 @@ procedure RuntimeTest(FlexDS: TVpFlexDataStore);
{$ENDIF}
implementation
-{$R *.DFM}
+{$IFDEF LCL}
+ {$R *.LFM}
+{$ELSE}
+ {$R *.DFM}
+{$ENDIF}
+
uses
vpConst;
@@ -141,13 +150,17 @@ end;
{$ELSE} {RUNTIMETEST}
+{$IFDEF LCL}
+procedure MapDatabaseFields(Designer : TComponentEditorDesigner;
+ FlexDS : TVpFlexDataStore);
+{$ELSE}
{$IFDEF VERSION6}
-procedure MapDatabaseFields(Designer : IDesigner;
+procedure MapDatabaseFields(Designer : TComponentEditorDesigner;; // was: Designer : IDesigner;
FlexDS : TVpFlexDataStore);
{$ELSE}
procedure MapDatabaseFields(Designer : IFormDesigner;
FlexDS : TVpFlexDataStore);
-{$ENDIF}
+{$ENDIF}{$ENDIF}
var
frmFieldMapper: TfrmFieldMapper;
begin
diff --git a/components/tvplanit/source/vpreg.pas b/components/tvplanit/source/vpreg.pas
index 42b8fdc4a..a024ca918 100644
--- a/components/tvplanit/source/vpreg.pas
+++ b/components/tvplanit/source/vpreg.pas
@@ -135,7 +135,7 @@ uses
VpContactGrid, { ContactGrid Component }
VpDateEdit, { DateEdit Component }
VpTaskList, { Task List Component }
-// VpFlxDS, { Flexible DataStore }
+ VpFlxDS, { Flexible DataStore }
VpContactEditDlg, { Contact Edit Dialog Component }
VpTaskEditDlg, { Task Edit Dialog Component }
VpEvntEditDlg, { Event Edit Dialog Component }
@@ -149,8 +149,8 @@ uses
VpContactButtons, { - New contact grid button bar component }
{ Designtime Interfaces (Property and Component Editors) }
VpAbout, { About form for the About property editor }
- VpNabEd; { component editor for the VpNavBar }
-// VpFlxDSEd1; { Field mapper component editor for the FlexDS }
+ VpNabEd, { component editor for the VpNavBar }
+ VpFlxDSEd1; { Field mapper component editor for the FlexDS }
(*****************************************************************************)
@@ -388,9 +388,9 @@ end;
TVpClock,
TVpCalendar,
TVpNavBar,
- {$IFNDEF LCL}
TVpFlexDataStore,
- TVpBDEDataStore,
+ {$IFNDEF LCL}
+ TVpBDEDataStore, // BDE is not available in Lazarus
{$ENDIF}
TVpControlLink,
TVpPrintPreview,
diff --git a/components/tvplanit/source/vpreseditdlg.lfm b/components/tvplanit/source/vpreseditdlg.lfm
index ce98c5423..e53b695bb 100644
--- a/components/tvplanit/source/vpreseditdlg.lfm
+++ b/components/tvplanit/source/vpreseditdlg.lfm
@@ -24,9 +24,9 @@ object ResEditForm: TResEditForm
ClientWidth = 400
TabOrder = 0
object OKBtn: TButton
- Left = 245
+ Left = 243
Height = 25
- Top = 9
+ Top = 7
Width = 75
Anchors = [akRight, akBottom]
Caption = 'OK'
@@ -36,9 +36,9 @@ object ResEditForm: TResEditForm
TabStop = False
end
object CancelBtn: TButton
- Left = 324
+ Left = 322
Height = 25
- Top = 9
+ Top = 7
Width = 75
Anchors = [akRight, akBottom]
Cancel = True
diff --git a/components/tvplanit/source/vpreseditdlg.pas b/components/tvplanit/source/vpreseditdlg.pas
index 7c96af555..f879ede9f 100644
--- a/components/tvplanit/source/vpreseditdlg.pas
+++ b/components/tvplanit/source/vpreseditdlg.pas
@@ -26,7 +26,7 @@
{* *}
{* ***** END LICENSE BLOCK ***** *}
-{$I Vp.INC}
+{$I vp.inc}
unit VpResEditDlg;
@@ -93,7 +93,11 @@ function ExecuteResourceDlg(Resource: TVpResource): Boolean;
implementation
{$IFNDEF LCL}
-{$R *.DFM}
+{$IFnDEF FPC}
+ {$R *.dfm}
+{$ELSE}
+ {$R *.lfm}
+{$ENDIF}
{$ENDIF}
function ExecuteResourceDlg(Resource: TVpResource): Boolean;
diff --git a/components/tvplanit/source/vptaskeditdlg.lfm b/components/tvplanit/source/vptaskeditdlg.lfm
index 0dfcd700f..10d3fdef5 100644
--- a/components/tvplanit/source/vptaskeditdlg.lfm
+++ b/components/tvplanit/source/vptaskeditdlg.lfm
@@ -25,9 +25,9 @@ object TaskEditForm: TTaskEditForm
ClientWidth = 546
TabOrder = 0
object ResourceNameLbl: TLabel
- Left = 8
+ Left = 6
Height = 16
- Top = 12
+ Top = 10
Width = 100
AutoSize = False
Caption = 'Resource Name'
@@ -39,9 +39,9 @@ object TaskEditForm: TTaskEditForm
ParentColor = False
end
object OKBtn: TButton
- Left = 389
+ Left = 387
Height = 25
- Top = 8
+ Top = 6
Width = 75
Anchors = [akTop, akRight]
Caption = 'OK'
@@ -50,9 +50,9 @@ object TaskEditForm: TTaskEditForm
TabOrder = 0
end
object CancelBtn: TButton
- Left = 467
+ Left = 465
Height = 25
- Top = 8
+ Top = 6
Width = 75
Anchors = [akTop, akRight]
Cancel = True
diff --git a/components/tvplanit/source/vptaskeditdlg.pas b/components/tvplanit/source/vptaskeditdlg.pas
index ea58f5b62..f548b103f 100644
--- a/components/tvplanit/source/vptaskeditdlg.pas
+++ b/components/tvplanit/source/vptaskeditdlg.pas
@@ -26,7 +26,7 @@
{* *}
{* ***** END LICENSE BLOCK ***** *}
-{$I Vp.INC}
+{$I vp.inc}
unit VpTaskEditDlg;
{ default task editing dialog }
@@ -104,7 +104,11 @@ type
implementation
{$IFNDEF LCL}
-{$R *.dfm}
+{$IFnDEF FPC}
+ {$R *.dfm}
+{$ELSE}
+ {$R *.lfm}
+{$ENDIF}
{$ENDIF}
{ TTaskEditForm }