tvplanit: Make sure that lfm files can be found. Remove any calls to lrs files from the sources.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4684 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-07 16:34:18 +00:00
parent b696519d2f
commit c4c24a03c9
19 changed files with 108 additions and 105 deletions

View File

@ -96,9 +96,9 @@ type
implementation
{$IFDEF LCL}
{$R *.LFM}
{$R *.lfm}
{$ELSE}
{$R *.DFM}
{$R *.dfm}
{$ENDIF}
uses VpSR;
@ -278,6 +278,7 @@ begin
Event.SnoozeTime := Now + SnoozeDelay;
end;
{=====}
procedure TAlarmNotifyForm.FormShow(Sender: TObject);
begin
Self.Width := 410;

View File

@ -39,7 +39,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows,
{$ENDIF}

View File

@ -34,7 +34,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,
{$ENDIF}
@ -139,8 +139,10 @@ type
implementation
{$IFNDEF LCL}
{$R *.dfm}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
uses
@ -667,12 +669,6 @@ begin
NameEdit.SetFocus;
end;
{=====}
(*
initialization
{$IFDEF LCL}
{$I vpcontacteditdlg.lrs}
{$ENDIF}
*)
end.

View File

@ -32,7 +32,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows,
{$ENDIF}
@ -56,8 +56,10 @@ var
implementation
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
function TfrmDatePropertyEditor.Execute : Boolean;

View File

@ -1791,6 +1791,28 @@ begin
end;
{=====}
procedure TVpCustomDBDataStore.SetFilterCriteria(aTable : TDataset;
aUseDateTime : Boolean; aResourceID : Integer; aStartDateTime : TDateTime;
aEndDateTime : TDateTime);
begin
// error here. Could it be that it does not recognise StartTime and EndTime
// (because they are not mapped?)
// however StartTime + EndTime are only found in events not tasks
{ if aUseDateTime then
aTable.Filter := Format('ResourceID = %d '
+ 'and (( (StartTime >= %s) and (EndTime <= %s) ) '
+ ' or ( (RepeatCode > 0) and (%s <= RepeatRangeEnd) ))',
[aResourceID,
QuotedStr(FormatDateTime('c', aStartDateTime)),
QuotedStr(FormatDateTime('c', aEndDateTime)),
QuotedStr(FormatDateTime('c', aStartDateTime))])
else
}
aTable.Filter := Format('ResourceID = %d', [aResourceID]);
aTable.Filtered := true;
end;
(*
procedure TVpCustomDBDataStore.SetFilterCriteria(aTable : TDataset;
aUseDateTime : Boolean; aResourceID : Integer; aStartDateTime : TDateTime;
aEndDateTime : TDateTime);
@ -1806,7 +1828,7 @@ begin
else
aTable.Filter := Format('ResourceID = %d', [aResourceID]);
aTable.Filtered := true;
end;
end;*)
{=====}
end.

View File

@ -34,7 +34,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows,
{$ENDIF}
@ -110,8 +110,10 @@ implementation
uses VpEdShape;
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
function EvalFmt(Val : Extended) : string;

View File

@ -34,7 +34,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows,
{$ENDIF}
@ -70,8 +70,10 @@ type
implementation
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
{ TfrmEditLayout }

View File

@ -13,6 +13,7 @@ object frmEditShape: TfrmEditShape
Font.Name = 'MS Sans Serif'
OnCreate = FormCreate
Position = poScreenCenter
LCLVersion = '1.7'
object rgShapeType: TRadioGroup
Left = 8
Height = 84
@ -75,9 +76,9 @@ object frmEditShape: TfrmEditShape
TabOrder = 2
object Label1: TLabel
Left = 6
Height = 14
Height = 13
Top = 112
Width = 29
Width = 26
Caption = 'Style:'
ParentColor = False
end
@ -86,7 +87,6 @@ object frmEditShape: TfrmEditShape
Height = 22
Top = 108
Width = 97
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 16
OnDrawItem = cbBrushStyleDrawItem
Style = csOwnerDrawFixed
@ -104,25 +104,25 @@ object frmEditShape: TfrmEditShape
TabOrder = 1
object Label2: TLabel
Left = 8
Height = 14
Height = 13
Top = 104
Width = 29
Width = 26
Caption = 'Style:'
ParentColor = False
end
object Label3: TLabel
Left = 8
Height = 14
Height = 13
Top = 132
Width = 33
Width = 31
Caption = 'Width:'
ParentColor = False
end
object Label4: TLabel
Left = 8
Height = 14
Height = 13
Top = 160
Width = 31
Width = 30
Caption = 'Mode:'
ParentColor = False
end
@ -131,7 +131,6 @@ object frmEditShape: TfrmEditShape
Height = 19
Top = 100
Width = 105
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
OnDrawItem = cbPenStyleDrawItem
Style = csOwnerDrawFixed
@ -142,7 +141,6 @@ object frmEditShape: TfrmEditShape
Height = 21
Top = 156
Width = 105
AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
ItemHeight = 13
TabOrder = 1
end
@ -152,14 +150,16 @@ object frmEditShape: TfrmEditShape
Top = 128
Width = 11
Associate = edPenWidth
Min = 0
Position = 0
TabOrder = 3
Wrap = False
end
object edPenWidth: TEdit
Left = 44
Height = 21
Top = 128
Width = 54
OnKeyDown = nil
TabOrder = 2
Text = '0'
end

View File

@ -34,7 +34,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows,Messages,ColorGrd,
{$ENDIF}
@ -82,8 +82,10 @@ type
implementation
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
{ TfrmEditShape }

View File

@ -14,7 +14,7 @@ object DlgEventEdit: TDlgEventEdit
OnCreate = FormCreate
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '0.9.29'
LCLVersion = '1.7'
object Panel1: TPanel
Left = 0
Height = 41
@ -217,7 +217,6 @@ object DlgEventEdit: TDlgEventEdit
Height = 22
Top = 167
Width = 23
Color = clBtnFace
Glyph.Data = {
F6000000424DF600000000000000760000002800000010000000100000000100
0400000000008000000000000000000000001000000010000000000000000000
@ -228,7 +227,6 @@ object DlgEventEdit: TDlgEventEdit
8888008880088808888888088088880808888880808888088088888808088088
8808888880808088888888888800088888888888888888888888
}
NumGlyphs = 0
end
object imgClock: TImage
Left = 18
@ -339,12 +337,12 @@ object DlgEventEdit: TDlgEventEdit
Height = 29
Top = 99
Width = 19
Min = 0
Max = 32767
Min = 0
OnClick = IntervalUpDownClick
Position = 0
TabOrder = 9
Wrap = False
OnClick = IntervalUpDownClick
end
object AlarmAdvType: TComboBox
Left = 230
@ -360,12 +358,12 @@ object DlgEventEdit: TDlgEventEdit
Height = 29
Top = 164
Width = 19
Min = 1
Max = 120
Min = 1
OnClick = AdvanceUpDownClick
Position = 1
TabOrder = 10
Wrap = False
OnClick = AdvanceUpDownClick
end
object CBAllDay: TCheckBox
Left = 109
@ -395,7 +393,6 @@ object DlgEventEdit: TDlgEventEdit
CancelCaption = 'Cancel'
DateOrder = doNone
ButtonWidth = 23
CharCase = ecNormal
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@ -447,7 +444,6 @@ object DlgEventEdit: TDlgEventEdit
CancelCaption = 'Cancel'
DateOrder = doNone
ButtonWidth = 23
CharCase = ecNormal
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
@ -499,7 +495,6 @@ object DlgEventEdit: TDlgEventEdit
CancelCaption = 'Cancel'
DateOrder = doNone
ButtonWidth = 23
CharCase = ecNormal
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000FFFFFF00FFFF

View File

@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows, Messages, Mask,
{$ENDIF}
@ -160,8 +160,10 @@ implementation
uses
VpSR, VpWavDlg;
{$IFNDEF LCL}
{$R *.dfm}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
{ TVpRightAlignedEdit }
@ -724,9 +726,6 @@ begin
StartTime.Text := FormatDateTime('hh:mm',ET- (30/MinutesInDay));
end;
end;
(*
initialization
{$I vpevnteditdlg.lrs}
*)
end.

View File

@ -105,9 +105,9 @@ procedure RuntimeTest(FlexDS: TVpFlexDataStore);
implementation
{$IFDEF LCL}
{$R *.LFM}
{$R *.lfm}
{$ELSE}
{$R *.DFM}
{$R *.dfm}
{$ENDIF}
uses

View File

@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows, Messages,
{$ENDIF}

View File

@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,
LMessages, LCLProc, LCLType, LCLIntf,
{$ELSE}
Windows,Messages,
{$ENDIF}
@ -138,8 +138,10 @@ var
implementation
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.DFM}
{$ENDIF}
{$IFDEF VERSION6}

View File

@ -34,7 +34,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,Messages,
{$ENDIF}
@ -172,8 +172,10 @@ type
implementation
{$IFNDEF LCL}
{$R *.dfm}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
procedure TfrmPrintPreview.FormCreate(Sender: TObject);
@ -415,11 +417,6 @@ begin
if Key = VK_ESCAPE then
actCancel.Execute;
end;
(*
initialization
{$IFDEF LCL}
{$I vpprtprvdlg.lrs}
{$ENDIF}
*)
end.

View File

@ -34,7 +34,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,
{$ENDIF}
@ -92,12 +92,10 @@ function ExecuteResourceDlg(Resource: TVpResource): Boolean;
implementation
{$IFNDEF LCL}
{$IFnDEF FPC}
{$R *.dfm}
{$ELSE}
{$IFDEF LCL}
{$R *.lfm}
{$ENDIF}
{$ELSE}
{$R *.dfm}
{$ENDIF}
function ExecuteResourceDlg(Resource: TVpResource): Boolean;
@ -242,12 +240,6 @@ procedure TResEditForm.SetControls;
begin
OKBtn.Enabled := (DescriptionEdit.Text <> '');
end;
(*
initialization
{$IFDEF LCL}
{$I vpreseditdlg.lrs}
{$ENDIF}
*)
end.

View File

@ -32,7 +32,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,
{$ENDIF}
@ -62,8 +62,10 @@ var
implementation
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.DFM}
{$ENDIF}
procedure TfrmSelectResource.btnAddNewClick(Sender: TObject);
@ -75,12 +77,6 @@ procedure TfrmSelectResource.btnEditClick(Sender: TObject);
begin
VpResourceEditDialog1.Execute;
end;
(*
initialization
{$IFDEF LCL}
{$I vpselresdlg.lrs}
{$ENDIF}
*)
end.

View File

@ -35,7 +35,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,
{$ENDIF}
@ -103,12 +103,10 @@ type
implementation
{$IFNDEF LCL}
{$IFnDEF FPC}
{$R *.dfm}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.lfm}
{$ENDIF}
{$R *.dfm}
{$ENDIF}
{ TTaskEditForm }
@ -228,11 +226,6 @@ begin
end;
end;
{=====}
(*
initialization
{$IFDEF LCL}
{$I vptaskeditdlg.lrs}
{$ENDIF}
*)
end.

View File

@ -36,7 +36,7 @@ interface
uses
{$IFDEF LCL}
LMessages,LCLProc,LCLType,LCLIntf,LResources,
LMessages, LCLProc, LCLType, LCLIntf, LResources,
{$ELSE}
Windows,
{$ENDIF}
@ -79,8 +79,10 @@ uses
{$ENDIF}
VpSR;
{$IFNDEF LCL}
{$R *.DFM}
{$IFDEF LCL}
{$R *.lfm}
{$ELSE}
{$R *.dfm}
{$ENDIF}
function ExecuteSoundFinder(var DingPath: string): Boolean;