pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

tvplanit: Less hints and warnings, some cleanup

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6476 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-06-09 09:22:33 +00:00
parent 820288c8ec
commit 64d3c247b1
10 changed files with 54 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
components/tvplanit/examples/fulldemo/ExVpRptSetup.pas
View File

@ -124,42 +124,12 @@ end;
procedure TfrmReportSetup.PositionControls; procedure TfrmReportSetup.PositionControls;
var var
i, w, h: Integer; i, w: Integer;
cnv: TControlCanvas; cnv: TControlCanvas;
begin begin
AutoSize := false; AutoSize := false;
AlignOKCancel(btnOK, btnCancel, ButtonPanel); AlignOKCancel(btnOK, btnCancel, ButtonPanel);
(*
btnOK.AutoSize := true;
btnCancel.AutoSize := true;
w := Max(btnOK.Width, btnCancel.Width);
h := btnOK.Height;
btnOK.AutoSize := false;
btnOK.Width := w;
btnOK.Height := h;
btnCancel.AutoSize := false;
btnCancel.Width := w;
btnCancel.Height := h;
{$IFDEF MSWINDOWS} // button order: OK - Cancel
btnCancel.AnchorSideRight.Control := self;
btnCancel.Anchors := [akTop, akRight];
btnOK.AnchorSideRight.Control := btnCancel;
btnOK.Anchors := [akTop, akRight];
btnOK.TabOrder := PrintFormatCombo.TabOrder;
btnCancel.TabOrder := PrintFormatCombo.TabOrder + 1;
{$ELSE} // button order: Cancel - OK
btnOK.AnchorSideRight.Control := self;
btnOK.Anchors := [akTop, akRight];
btnCancel.AnchorSideRight.Control := btnOK;
btnCancel.Anchors := [akTop, akRight];
btnCancel.TabOrder := PrintFormatCombo.TabOrder;
btnOK.TabOrder := PrintFormatCombo.TabOrder + 1;
{$ENDIF}
*)
cnv := TControlCanvas.Create; cnv := TControlCanvas.Create;
try try

2
components/tvplanit/examples/fulldemo/bufdsdatamodule.pas
View File

@ -5,7 +5,7 @@ unit bufdsdatamodule;
interface interface
uses uses
Classes, SysUtils, FileUtil, VpBaseDS, VpBufDS; Classes, SysUtils, FileUtil, VpBufDS;
type type

44
components/tvplanit/examples/fulldemo/demomain.lfm
View File

@ -58,7 +58,7 @@ object MainForm: TMainForm
Height = 528 Height = 528
Top = 48 Top = 48
Width = 834 Width = 834
PageIndex = 0 PageIndex = 2
Align = alClient Align = alClient
TabOrder = 1 TabOrder = 1
TabStop = True TabStop = True
@ -695,41 +695,41 @@ object MainForm: TMainForm
DrawingStyle = dsCoolTab DrawingStyle = dsCoolTab
FolderCollection = < FolderCollection = <
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Planner' Caption = 'Planner'
Enabled = True Enabled = True
FolderType = ftDefault FolderType = ftDefault
ItemCollection = < ItemCollection = <
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Events' Caption = 'Events'
IconIndex = 0 IconIndex = 0
Name = 'NIEvents' Name = 'NIEvents'
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Month view' Caption = 'Month view'
IconIndex = 5 IconIndex = 5
Name = 'NIEventsByMonth' Name = 'NIEventsByMonth'
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Week view' Caption = 'Week view'
IconIndex = 4 IconIndex = 4
Name = 'NIEventsByWeek' Name = 'NIEventsByWeek'
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Day view' Caption = 'Day view'
IconIndex = 3 IconIndex = 3
Name = 'NIEventsByDay' Name = 'NIEventsByDay'
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Tasks' Caption = 'Tasks'
Description = 'Show tasks' Description = 'Show tasks'
IconIndex = 1 IconIndex = 1
@ -737,7 +737,7 @@ object MainForm: TMainForm
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Contacts' Caption = 'Contacts'
Description = 'Show address book' Description = 'Show address book'
IconIndex = 2 IconIndex = 2
@ -749,20 +749,20 @@ object MainForm: TMainForm
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Maintenance' Caption = 'Maintenance'
Enabled = True Enabled = True
FolderType = ftDefault FolderType = ftDefault
ItemCollection = < ItemCollection = <
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Resources' Caption = 'Resources'
IconIndex = 7 IconIndex = 7
Name = 'NIResources' Name = 'NIResources'
Tag = 0 Tag = 0
end end
item item
Version = 'v1.10' Version = 'v1.12'
Caption = 'Settings' Caption = 'Settings'
IconIndex = 8 IconIndex = 8
Name = 'NISettings' Name = 'NISettings'
@ -800,12 +800,12 @@ object MainForm: TMainForm
Printer.MarginUnits = imPercent Printer.MarginUnits = imPercent
Printer.PrintFormats = < Printer.PrintFormats = <
item item
Version = 'v1.10' Version = 'v1.12'
DayInc = 0 DayInc = 0
DayIncUnits = duDay DayIncUnits = duDay
Elements = < Elements = <
item item
Version = 'v1.10' Version = 'v1.12'
Caption.Caption = 'Current week' Caption.Caption = 'Current week'
Caption.Font.Style = [fsItalic] Caption.Font.Style = [fsItalic]
DayOffset = 0 DayOffset = 0
@ -820,12 +820,12 @@ object MainForm: TMainForm
FormatName = 'Events of current week (dayview)' FormatName = 'Events of current week (dayview)'
end end
item item
Version = 'v1.10' Version = 'v1.12'
DayInc = 0 DayInc = 0
DayIncUnits = duWeek DayIncUnits = duWeek
Elements = < Elements = <
item item
Version = 'v1.10' Version = 'v1.12'
DayOffset = 0 DayOffset = 0
DayOffsetUnits = duDay DayOffsetUnits = duDay
ElementName = 'WeekView' ElementName = 'WeekView'
@ -839,12 +839,12 @@ object MainForm: TMainForm
FormatName = 'Events of current week (Week view)' FormatName = 'Events of current week (Week view)'
end end
item item
Version = 'v1.10' Version = 'v1.12'
DayInc = 0 DayInc = 0
DayIncUnits = duDay DayIncUnits = duDay
Elements = < Elements = <
item item
Version = 'v1.10' Version = 'v1.12'
DayOffset = 0 DayOffset = 0
DayOffsetUnits = duWeek DayOffsetUnits = duWeek
ElementName = 'TaskList' ElementName = 'TaskList'
@ -858,12 +858,12 @@ object MainForm: TMainForm
FormatName = 'Tasks of current week' FormatName = 'Tasks of current week'
end end
item item
Version = 'v1.10' Version = 'v1.12'
DayInc = 0 DayInc = 0
DayIncUnits = duDay DayIncUnits = duDay
Elements = < Elements = <
item item
Version = 'v1.10' Version = 'v1.12'
DayOffset = 0 DayOffset = 0
DayOffsetUnits = duDay DayOffsetUnits = duDay
ElementName = 'TaskList' ElementName = 'TaskList'
@ -883,7 +883,7 @@ object MainForm: TMainForm
top = 200 top = 200
end end
object VpResourceEditDialog1: TVpResourceEditDialog object VpResourceEditDialog1: TVpResourceEditDialog
Version = 'v1.10' Version = 'v1.12'
Options = [] Options = []
Placement.Position = mpCenter Placement.Position = mpCenter
Placement.Top = 10 Placement.Top = 10
@ -2110,7 +2110,7 @@ object MainForm: TMainForm
top = 368 top = 368
end end
object VpPrintPreviewDialog1: TVpPrintPreviewDialog object VpPrintPreviewDialog1: TVpPrintPreviewDialog
Version = 'v1.10' Version = 'v1.12'
BottomMargin = 0 BottomMargin = 0
ControlLink = VpControlLink1 ControlLink = VpControlLink1
EndDate = 42561.5151169907 EndDate = 42561.5151169907
@ -2129,7 +2129,7 @@ object MainForm: TMainForm
top = 432 top = 432
end end
object VpPrintFormatEditDialog1: TVpPrintFormatEditDialog object VpPrintFormatEditDialog1: TVpPrintFormatEditDialog
Version = 'v1.10' Version = 'v1.12'
ControlLink = VpControlLink1 ControlLink = VpControlLink1
Options = [] Options = []
Placement.Position = mpCenter Placement.Position = mpCenter

6
components/tvplanit/examples/fulldemo/demomain.pas
View File

@ -275,8 +275,6 @@ procedure UpdateFormatSettings(ALang: String);
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
var var
LCID: Integer; LCID: Integer;
i: Integer;
codepage: String;
{$ENDIF} {$ENDIF}
begin begin
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
@ -306,6 +304,7 @@ end;
function GetFirstDayOfWeek(ALang: String): TVpDayType; function GetFirstDayOfWeek(ALang: String): TVpDayType;
// Don't know how to determine this from the OS // Don't know how to determine this from the OS
begin begin
Unused(ALang);
Result := dtSunday; Result := dtSunday;
end; end;
@ -1182,7 +1181,8 @@ end;
procedure TMainForm.VpNavBar1ItemClick(Sender: TObject; Button: TMouseButton; procedure TMainForm.VpNavBar1ItemClick(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; Index: Integer); Shift: TShiftState; Index: Integer);
begin begin
SetActiveView(VpNavBar1.ActiveFolder * 1000 + Index); Unused(Button, Shift);
SetActiveView(VpNavBar1.ActiveFolder * 1000 + Index);
end; end;
procedure TMainForm.SetActiveView(AValue: Integer); procedure TMainForm.SetActiveView(AValue: Integer);

32
components/tvplanit/source/vpcontactgrid.pas
View File

@ -165,7 +165,7 @@ type
procedure SetContactIndex(Value: Integer); procedure SetContactIndex(Value: Integer);
procedure SetColumnWidth(Value: Integer); procedure SetColumnWidth(Value: Integer);
procedure SetDrawingStyle(const Value: TVpDrawingStyle); procedure SetDrawingStyle(const Value: TVpDrawingStyle);
procedure SetColor(const Value: TColor); procedure SetColor(Value: TColor); override;
procedure SetHScrollPos; procedure SetHScrollPos;
procedure SetPrintNumColumns (const v : Integer); procedure SetPrintNumColumns (const v : Integer);
procedure SetSortBy (const v : TVpContactSort); procedure SetSortBy (const v : TVpContactSort);
@ -814,7 +814,7 @@ begin
end; end;
{=====} {=====}
procedure TVpContactGrid.SetColor(const Value: TColor); procedure TVpContactGrid.SetColor(Value: TColor);
begin begin
if FColor <> Value then begin if FColor <> Value then begin
FColor := Value; FColor := Value;
@ -1303,7 +1303,7 @@ begin
cgInPlaceEditor.Move(AddressRect, true); cgInPlaceEditor.Move(AddressRect, true);
Canvas.DrawFocusRect(Rect(AddressRect.Left + TextMargin - 1, Canvas.DrawFocusRect(Rect(AddressRect.Left + TextMargin - 1,
AddressRect.Top, AddressRect.Right + 3, AddressRect.Bottom + 3)); AddressRect.Top, AddressRect.Right + 3, AddressRect.Bottom + 3));
cgInPlaceEditor.Text := FActiveContact.Address; cgInPlaceEditor.Text := FActiveContact.Address1;
end; end;
{ edit company } { edit company }
if field = 'Company' then begin if field = 'Company' then begin
@ -1319,8 +1319,8 @@ begin
cgInPlaceEditor.Move(CSZRect, true); cgInPlaceEditor.Move(CSZRect, true);
Canvas.DrawFocusRect(Rect(CSZRect.Left + TextMargin - 1, Canvas.DrawFocusRect(Rect(CSZRect.Left + TextMargin - 1,
CSZRect.Top, CSZRect.Right + 3, CSZRect.Bottom + 3)); CSZRect.Top, CSZRect.Right + 3, CSZRect.Bottom + 3));
cgInPlaceEditor.Text := FActiveContact.City + ', ' + FActiveContact.State cgInPlaceEditor.Text := FActiveContact.City1 + ', ' + FActiveContact.State1
+ ' ' + FActiveContact.Zip; + ' ' + FActiveContact.Zip1;
end; end;
{ edit email } { edit email }
if field = 'EMail' then begin if field = 'EMail' then begin
@ -1328,7 +1328,7 @@ begin
cgInPlaceEditor.Move(EMailRect, true); cgInPlaceEditor.Move(EMailRect, true);
Canvas.DrawFocusRect(Rect(EMailRect.Left - TextMargin, Canvas.DrawFocusRect(Rect(EMailRect.Left - TextMargin,
EMailRect.Top, EMailRect.Right + 3, EMailRect.Bottom + 3)); EMailRect.Top, EMailRect.Right + 3, EMailRect.Bottom + 3));
cgInPlaceEditor.Text := FActiveContact.EMail; cgInPlaceEditor.Text := FActiveContact.EMail1;
end; end;
{ edit Phone1 } { edit Phone1 }
if field = 'Phone1' then begin if field = 'Phone1' then begin
@ -1387,8 +1387,8 @@ begin
if cgInPlaceEditor <> nil then begin if cgInPlaceEditor <> nil then begin
{Address} {Address}
if cgInPlaceEditor.field = 'Address' then begin if cgInPlaceEditor.field = 'Address' then begin
if cgInPlaceEditor.Text <> FActiveContact.Address then begin if cgInPlaceEditor.Text <> FActiveContact.Address1 then begin
FActiveContact.Address := cgInPlaceEditor.Text; FActiveContact.Address1 := cgInPlaceEditor.Text;
FActiveContact.Changed := true; FActiveContact.Changed := true;
end; end;
end end
@ -1401,20 +1401,20 @@ begin
end end
{EMail} {EMail}
else if cgInPlaceEditor.field = 'EMail' then begin else if cgInPlaceEditor.field = 'EMail' then begin
if cgInPlaceEditor.Text <> FActiveContact.EMail then begin if cgInPlaceEditor.Text <> FActiveContact.EMail1 then begin
FActiveContact.EMail := cgInPlaceEditor.Text; FActiveContact.EMail1 := cgInPlaceEditor.Text;
FActiveContact.Changed := true; FActiveContact.Changed := true;
end; end;
end end
{City, State, Zip} {City, State, Zip}
else if cgInPlaceEditor.field = 'CSZ' then begin else if cgInPlaceEditor.field = 'CSZ' then begin
ParseCSZ(cgInPlaceEditor.Text, City, State, Zip); ParseCSZ(cgInPlaceEditor.Text, City, State, Zip);
if (City <> FActiveContact.City) if (City <> FActiveContact.City1)
or (State <> FActiveContact.State) or (State <> FActiveContact.State1)
or (Zip <> FActiveContact.Zip) then begin or (Zip <> FActiveContact.Zip1) then begin
FActiveContact.City := City; FActiveContact.City1 := City;
FActiveContact.State := State; FActiveContact.State1 := State;
FActiveContact.Zip := Zip; FActiveContact.Zip1 := Zip;
FActiveContact.Changed := true; FActiveContact.Changed := true;
end; end;
end end

1
components/tvplanit/source/vpcontactgridpainter.pas
View File

@ -708,7 +708,6 @@ begin
end; end;
end; end;
procedure TVpContactGridPainter.DrawVerticalBars; procedure TVpContactGridPainter.DrawVerticalBars;
var var
BarPos, BarCount, I: Integer; BarPos, BarCount, I: Integer;

3
components/tvplanit/source/vpdayviewpainter.pas
View File

@ -1575,8 +1575,7 @@ var
ShowCustom: Boolean; ShowCustom: Boolean;
Icons: TVpDVIcons; Icons: TVpDVIcons;
cat: TVpCategoryInfo; cat: TVpCategoryInfo;
w, h: Integer; w: Integer;
R: TRect;
isOverlayed: Boolean; isOverlayed: Boolean;
grp: TVpResourceGroup; grp: TVpResourceGroup;
imgList: TCustomImageList; imgList: TCustomImageList;

5
components/tvplanit/source/vpevnteditdlg.pas
View File

@ -300,7 +300,7 @@ var
bmp: TBitmap; bmp: TBitmap;
ColorRect: TRect; ColorRect: TRect;
IconX, IconY: Integer; IconX, IconY: Integer;
hTxt, hGutter, hDist, vMargin, hMargin: Integer; hTxt, hGutter, hDist, hMargin: Integer;
SavedStyle: TBrushStyle; SavedStyle: TBrushStyle;
imgIndex: Integer; imgIndex: Integer;
h: Integer = 0; h: Integer = 0;
@ -312,10 +312,9 @@ var
{$IFEND} {$IFEND}
{$ENDIF} {$ENDIF}
begin begin
Unused( State); Unused(Control, State);
hTxt := Category.Canvas.TextHeight('Tj'); hTxt := Category.Canvas.TextHeight('Tj');
vMargin := ScaleY(2, DesignTimeDPI);
hMargin := ScaleX(3, DesignTimeDPI); hMargin := ScaleX(3, DesignTimeDPI);
hGutter := ScaleX(10, DesignTimeDPI); hGutter := ScaleX(10, DesignTimeDPI);
hDist := ScaleX(5, DesignTimeDPI); hDist := ScaleX(5, DesignTimeDPI);

14
components/tvplanit/source/vpnavbar.pas
View File

@ -309,12 +309,6 @@ type
procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy;
const AXProportion, AYProportion: Double); override; const AXProportion, AYProportion: Double); override;
{$ENDIF} {$ENDIF}
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
{$ENDIF}
procedure CreateParams(var Params: TCreateParams); override; procedure CreateParams(var Params: TCreateParams); override;
procedure CreateWnd; override; procedure CreateWnd; override;
@ -403,6 +397,14 @@ type
procedure RemoveItem(AFolderIndex, AItemIndex: Integer); procedure RemoveItem(AFolderIndex, AItemIndex: Integer);
procedure RenameItem(AFolderIndex, AItemIndex: Integer); procedure RenameItem(AFolderIndex, AItemIndex: Integer);
procedure PlaySound(const AWavFile: String; APlaySoundMode: TVpPlaySoundMode); procedure PlaySound(const AWavFile: String; APlaySoundMode: TVpPlaySoundMode);
{$IF VP_LCL_SCALING = 2}
procedure ScaleFontsPPI(const AToPPI: Integer; const AProportion: Double); override;
{$ELSEIF VP_LCL_SCALING = 1}
procedure ScaleFontsPPI(const AProportion: Double); override;
{$ENDIF}
{$ENDIF}
property ActiveItem: Integer read FActiveItem; property ActiveItem: Integer read FActiveItem;
property Containers[Index: Integer]: TVpFolderContainer read GetContainer; property Containers[Index: Integer]: TVpFolderContainer read GetContainer;
property Folders[Index: Integer]: TVpNavFolder read GetFolder; property Folders[Index: Integer]: TVpNavFolder read GetFolder;

2
components/tvplanit/source/vpvcard.pas
View File

@ -165,7 +165,6 @@ end;
function VCardDate(AText: String): TDate; function VCardDate(AText: String): TDate;
var var
fs: TFormatSettings; fs: TFormatSettings;
value: String;
y, m, d: Integer; y, m, d: Integer;
begin begin
if AText <> '' then begin if AText <> '' then begin
@ -395,7 +394,6 @@ const
var var
i: Integer; i: Integer;
item: TVpVCardItem; item: TVpVCardItem;
s: String;
begin begin
for i := 0 to FItems.Count-1 do begin for i := 0 to FItems.Count-1 do begin
item := TVpVCardItem(FItems[i]); item := TVpVCardItem(FItems[i]);