tvplanit: Cosmetic changes in VpEdFmtLst. Beginning to fix print format designer.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4926 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2016-07-06 18:56:23 +00:00
parent 4701336ffd
commit 18536b3f45
8 changed files with 162 additions and 133 deletions
--- a/components/tvplanit/examples/demo/demomain.lfm
+++ b/components/tvplanit/examples/demo/demomain.lfm
@ -784,8 +784,8 @@ object MainForm: TMainForm
  object ImageList1: TImageList
    Height = 32
    Width = 32
-    left = 312
-    top = 365
+    left = 560
+    top = 368
    Bitmap = {
      4C69090000002000000020000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
@ -1943,10 +1943,14 @@ object MainForm: TMainForm
    }
  end
  object MainMenu1: TMainMenu
-    left = 469
-    top = 221
+    left = 560
+    top = 296
    object MenuItem1: TMenuItem
      Caption = 'File'
+      object MnuEditPrintFormats: TMenuItem
+        Caption = 'Edit print formats...'
+        OnClick = MnuEditPrintFormatsClick
+      end
      object MnuPrintPreview: TMenuItem
        Caption = 'Print preview...'
        OnClick = MnuPrintPreviewClick
@ -2002,4 +2006,17 @@ object MainForm: TMainForm
    left = 560
    top = 192
  end
+  object VpPrintFormatEditDialog1: TVpPrintFormatEditDialog
+    Version = 'v1.04'
+    DataStore = VpBufDSDataStore1
+    ControlLink = VpControlLink1
+    Options = []
+    Placement.Position = mpCenter
+    Placement.Top = 10
+    Placement.Left = 10
+    Placement.Height = 480
+    Placement.Width = 640
+    left = 712
+    top = 192
+  end
 end
--- a/components/tvplanit/examples/demo/demomain.lrt
+++ b/components/tvplanit/examples/demo/demomain.lrt
@ -23,6 +23,7 @@ TMAINFORM.COMBOBOX1.TEXT=ComboBox1
 TMAINFORM.CBDRAWINGSTYLE.TEXT=flat
 TMAINFORM.TITLELBL.CAPTION=TitleLbl
 TMAINFORM.MENUITEM1.CAPTION=File
+TMAINFORM.MNUEDITPRINTFORMATS.CAPTION=Edit print formats...
 TMAINFORM.MNUPRINTPREVIEW.CAPTION=Print preview...
 TMAINFORM.MENUITEM3.CAPTION=-
 TMAINFORM.MNUQUIT.CAPTION=Quit
--- a/components/tvplanit/examples/demo/demomain.pas
+++ b/components/tvplanit/examples/demo/demomain.pas
@ -8,7 +8,7 @@ uses
  Classes, SysUtils, FileUtil, PrintersDlgs, Forms, Controls, Graphics, Dialogs,
  ExtCtrls, StdCtrls, ComCtrls, LCLTranslator, Menus, VpBaseDS, VpDayView,
  VpWeekView, VpTaskList, VpAbout, VpContactGrid, VpMonthView, VpResEditDlg,
-  VpContactButtons, VpBufDS, VpNavBar, VpData, VpPrtPrvDlg, Types;
+  VpContactButtons, VpBufDS, VpNavBar, VpData, VpPrtPrvDlg, VpPrtFmtDlg, Types;

 type

@ -36,6 +36,7 @@ type
    LblLanguage: TLabel;
    LblVisibleDays: TLabel;
    MenuItem3: TMenuItem;
+    MnuEditPrintFormats: TMenuItem;
    MnuPrintPreview: TMenuItem;
    PrintDialog1: TPrintDialog;
    TitleLbl: TLabel;
@ -70,6 +71,7 @@ type
    VpDayView1: TVpDayView;
    VpMonthView1: TVpMonthView;
    VpNavBar1: TVpNavBar;
+    VpPrintFormatEditDialog1: TVpPrintFormatEditDialog;
    VpPrintPreviewDialog1: TVpPrintPreviewDialog;
    VpResourceCombo1: TVpResourceCombo;
    VpResourceEditDialog1: TVpResourceEditDialog;
@ -90,6 +92,7 @@ type
    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
    procedure FormCreate(Sender: TObject);
    procedure MnuAboutClick(Sender: TObject);
+    procedure MnuEditPrintFormatsClick(Sender: TObject);
    procedure MnuPrintPreviewClick(Sender: TObject);
    procedure MnuQuitClick(Sender: TObject);
    procedure MnuResourcesClick(Sender: TObject);
@ -354,6 +357,11 @@ begin
  end;
 end;

+procedure TMainForm.MnuEditPrintFormatsClick(Sender: TObject);
+begin
+  VpPrintFormatEditDialog1.Execute;
+end;
+
 procedure TMainForm.MnuPrintPreviewClick(Sender: TObject);
 var
  t1, t2: TDateTime;
--- a/components/tvplanit/languages/demo.de.po
+++ b/components/tvplanit/languages/demo.de.po
@ -264,6 +264,10 @@ msgstr ""
 msgid "About Visual PlanIt"
 msgstr "Über Visual PlanIt"

+#: tmainform.mnueditprintformats.caption
+msgid "Edit print formats..."
+msgstr ""
+
 #: tmainform.mnumaintenance.caption
 msgctxt "tmainform.mnumaintenance.caption"
 msgid "Maintenance"
--- a/components/tvplanit/languages/demo.po
+++ b/components/tvplanit/languages/demo.po
@ -253,6 +253,10 @@ msgstr ""
 msgid "About Visual PlanIt"
 msgstr ""

+#: tmainform.mnueditprintformats.caption
+msgid "Edit print formats..."
+msgstr ""
+
 #: tmainform.mnumaintenance.caption
 msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
 msgid "Maintenance"
--- a/components/tvplanit/source/vpedfmtlst.lfm
+++ b/components/tvplanit/source/vpedfmtlst.lfm
@ -201,7 +201,7 @@ object frmPrnFormat: TfrmPrnFormat
    ClientWidth = 640
    TabOrder = 9
    object btnLoadFile: TButton
-      Left = 92
+      Left = 88
      Height = 25
      Top = 8
      Width = 75
@ -210,7 +210,7 @@ object frmPrnFormat: TfrmPrnFormat
      TabOrder = 1
    end
    object btnSaveFile: TButton
-      Left = 172
+      Left = 168
      Height = 25
      Top = 8
      Width = 75
@ -219,7 +219,7 @@ object frmPrnFormat: TfrmPrnFormat
      TabOrder = 2
    end
    object btnNewFile: TButton
-      Left = 12
+      Left = 8
      Height = 25
      Top = 8
      Width = 75
@ -228,7 +228,7 @@ object frmPrnFormat: TfrmPrnFormat
      TabOrder = 0
    end
    object btnOk: TButton
-      Left = 552
+      Left = 556
      Height = 25
      Top = 8
      Width = 75
--- a/components/tvplanit/source/vpedfmtlst.pas
+++ b/components/tvplanit/source/vpedfmtlst.pas
@ -95,41 +95,39 @@ type
    procedure lbElementsDragDrop(Sender, Source: TObject; X, Y: Integer);
    procedure lbElementsDragOver(Sender, Source: TObject; X, Y: Integer;
      State: TDragState; var Accept: Boolean);
+
  private
-    FFormatFileName : string;                                          
-    FControlLink : TVpControlLink;
-    IsDirty : Boolean;
+    FFormatFileName: string;
+    FControlLink: TVpControlLink;
+    IsDirty: Boolean;
    LastX, LastY: Integer;
-    DragItem : Integer;
+    DragItem: Integer;
+
  protected
    function DirtyPrompt: Integer;
    procedure DoEditElement;
    procedure DoEditFormat;
    procedure DoNewElement;
    procedure DoNewFile;
-    function DoNewFormat : Integer;                                                                                 
+    function DoNewFormat: Integer;
    procedure DoSave;
    procedure EnableElementButtons(Enable: Boolean);
    procedure EnableFormatButtons(Enable: Boolean);
    procedure EnableMoveButtons;
-    procedure SetFormatFileName (const v : string);                    
+    procedure SetFormatFileName(const v: string);
    procedure UpdateFormats;
    procedure UpdateCaption;
    procedure UpdatePreview;

    function GetControlLink: TVpControlLink;
    procedure SetControlLink(const Value: TVpControlLink);
-    { Private declarations }
+
  public
-
-    property ControlLink : TVpControlLink
-      read FControlLink write SetControlLink;
-
    function Execute : Boolean;
-    { Public declarations }
+    property ControlLink : TVpControlLink read FControlLink write SetControlLink;
+
  published
-    property FormatFileName : string                                   
-             read FFormatFileName write SetFormatFileName;             
+    property FormatFileName : string read FFormatFileName write SetFormatFileName;
  end;

 var
@ -140,8 +138,10 @@ implementation
 uses
  VpEdFmt, VpEdElem;

-{$IFNDEF LCL}
-{$R *.DFM}
+{$IFDEF DELPHI}
+ {$R *.dfm}
+{$ELSE}
+ {$R *.lfm}
 {$ENDIF}

 {TfrmPrnFormat}
@ -152,8 +152,6 @@ begin
  IsDirty := False;
  FormatFileName := UnnamedFile;

-
-
  EnableFormatButtons(False);
  EnableElementButtons(False);
 end;
@ -161,8 +159,7 @@ end;
 procedure TfrmPrnFormat.EnableMoveButtons;
 begin
  btnMoveElementUp.Enabled := lbElements.ItemIndex > 0;
-  btnMoveElementDn.Enabled :=                                          
-      lbElements.ItemIndex < lbElements.Items.Count - 1;               
+  btnMoveElementDn.Enabled := lbElements.ItemIndex < lbElements.Items.Count - 1;
 end;                                                                   
 {=====}
 procedure TfrmPrnFormat.FormShow(Sender: TObject);
@ -182,9 +179,9 @@ end;
 {=====}
 procedure TfrmPrnFormat.btnDeleteElementClick(Sender: TObject);
 var
-  Format : TVpPrintFormatItem;
-  Idx : Integer;
-  Item : string;
+  Format: TVpPrintFormatItem;
+  Idx: Integer;
+  Item: string;
 begin
  Format := TVpPrintFormatItem(lbFormats.Items.Objects[lbFormats.ItemIndex]);
  Item := '';
@ -205,14 +202,13 @@ end;
 {=====}
 procedure TfrmPrnFormat.btnDeleteFormatClick(Sender: TObject);
 var
-  Prn : TVpPrinter;
-  Idx : Integer;
+  Prn: TVpPrinter;
+  Idx: Integer;
 begin
  Prn := ControlLink.Printer;
  Idx := Prn.Find(lbFormats.Items[lbFormats.ItemIndex]);
  if (Idx < 0) or (Idx >= Prn.PrintFormats.Count) then
-    ShowMessage ('Invalid print format: ' +                              
-                 lbFormats.Items[lbFormats.ItemIndex]);                  
+    ShowMessage ('Invalid print format: ' + lbFormats.Items[lbFormats.ItemIndex]);
  Prn.PrintFormats.Items[Idx].Free;
  lbFormats.Items.Delete(lbFormats.ItemIndex);
  IsDirty := True;
@ -231,8 +227,8 @@ end;
 {=====}
 procedure TfrmPrnFormat.btnLoadFileClick(Sender: TObject);
 var
-  Prn : TVpPrinter;
-  Rslt : Integer;
+  Prn: TVpPrinter;
+  Rslt: Integer;
 begin
  if IsDirty then begin
    Rslt := DirtyPrompt;
@ -262,7 +258,7 @@ end;
 {=====}
 procedure TfrmPrnFormat.btnMoveElementDnClick(Sender: TObject);
 var
-  E : TVpPrintFormatElementItem;
+  E: TVpPrintFormatElementItem;
 begin
  if lbElements.ItemIndex > -1 then begin
    E := TVpPrintFormatElementItem(lbElements.Items.Objects[lbElements.ItemIndex]);
@ -289,26 +285,25 @@ end;
 {=====}
 procedure TfrmPrnFormat.btnNewFormatClick(Sender: TObject);
 var
-  NewFormatIdx : Integer;                                                
-  i            : Integer;                                                
-
+  NewFormatIdx: Integer;
+  i: Integer;
 begin
  NewFormatIdx := DoNewFormat;
-  if (NewFormatIdx > 0) and                                              
-     (Assigned (ControlLink)) and                                        
-     (NewFormatIdx < ControlLink.Printer.PrintFormats.Count) then        
+  if (NewFormatIdx > 0) and (Assigned (ControlLink)) and
+     (NewFormatIdx < ControlLink.Printer.PrintFormats.Count)
+  then
    for i := 0 to lbFormats.Items.Count - 1 do
-      if lbFormats.Items[i] = ControlLink.Printer.PrintFormats.          
-             Items[NewFormatIdx].FormatName then begin                   
+      if lbFormats.Items[i] = ControlLink.Printer.PrintFormats.Items[NewFormatIdx].FormatName then
+      begin
        lbFormats.ItemIndex := i;
-        lbFormatsClick (Self);                                           
+        lbFormatsClick(Self);
        Break;
      end;
 end;
 {=====}
 procedure TfrmPrnFormat.btnNewFileClick(Sender: TObject);
 var
-  Rslt : Integer;
+  Rslt: Integer;
 begin
  if IsDirty then begin
    Rslt := DirtyPrompt;
@ -340,17 +335,18 @@ begin
  DoSave;
 end;
 {=====}
-function TfrmPrnFormat.DirtyPrompt : Integer;
+function TfrmPrnFormat.DirtyPrompt: Integer;
 begin
  Result := Application.MessageBox(
    PChar('Save changes to ' + FormatFileName + '?'),
    PChar('Inquiry'),
-      MB_YESNOCANCEL or MB_ICONQUESTION);
+    MB_YESNOCANCEL or MB_ICONQUESTION
+  );
 end;
 {=====}
 procedure TfrmPrnFormat.DoEditElement;
 var
-  E : TVpPrintFormatElementItem;
+  E: TVpPrintFormatElementItem;
  frmEditElement: TfrmEditElement;
 begin
  if lbElements.ItemIndex > -1 then begin
@ -372,7 +368,7 @@ end;
 {=====}
 procedure TfrmPrnFormat.DoEditFormat;
 var
-  AFormat : TVpPrintFormatItem;
+  AFormat: TVpPrintFormatItem;
  frmEditFormat: TfrmEditFormat;
 begin
  if lbFormats.ItemIndex > -1 then begin
@ -392,9 +388,9 @@ end;
 {=====}
 procedure TfrmPrnFormat.DoNewElement;
 var
-  Format : TVpPrintFormatItem;
-  E : TVpPrintFormatElementItem;
-  Unique, Cancelled : Boolean;
+  Format: TVpPrintFormatItem;
+  E: TVpPrintFormatElementItem;
+  Unique, Cancelled: Boolean;
  frmEditElement: TfrmEditElement;
 begin
  Format := TVpPrintFormatItem(lbFormats.Items.Objects[lbFormats.ItemIndex]);
@ -435,7 +431,7 @@ end;
 {=====}
 procedure TfrmPrnFormat.DoNewFile;
 var
-  Prn : TVpPrinter;
+  Prn: TVpPrinter;
 begin
  Prn := ControlLink.Printer;
  Prn.PrintFormats.Clear;
@ -449,11 +445,11 @@ begin
  EnableElementButtons(False);
 end;
 {=====}
-function TfrmPrnFormat.DoNewFormat : Integer;                            
+function TfrmPrnFormat.DoNewFormat: Integer;
 var
-  AFormat : TVpPrintFormatItem;
-  Prn : TVpPrinter;
-  Unique, Cancelled : Boolean;
+  AFormat: TVpPrintFormatItem;
+  Prn: TVpPrinter;
+  Unique, Cancelled: Boolean;
  frmEditFormat: TfrmEditFormat;
 begin
  Result := -1;
@ -507,7 +503,7 @@ begin
  end;
 end;
 {=====}
-procedure TfrmPrnFormat.EnableElementButtons(Enable : Boolean);
+procedure TfrmPrnFormat.EnableElementButtons(Enable: Boolean);
 begin
  btnNewElement.Enabled := Enable;
  btnEditElement.Enabled := Enable;
@ -517,17 +513,17 @@ begin
  EnableMoveButtons;
 end;
 {=====}
-procedure TfrmPrnFormat.EnableFormatButtons(Enable : Boolean);
+procedure TfrmPrnFormat.EnableFormatButtons(Enable: Boolean);
 begin
  btnNewFormat.Enabled := Enable;
  btnEditFormat.Enabled := Enable;
  btnDeleteFormat.Enabled := Enable;
 end;
 {=====}
-function TfrmPrnFormat.Execute : Boolean;
+function TfrmPrnFormat.Execute: Boolean;
 begin
  if not Assigned (ControlLink) then
-    raise EVpPrintFormatEditorError.Create (RSNoControlLink);
+    raise EVpPrintFormatEditorError.Create(RSNoControlLink);

  Result := ShowModal = mrOk;
 end;
@ -535,7 +531,7 @@ end;
 procedure TfrmPrnFormat.FormCloseQuery(Sender: TObject;
  var CanClose: Boolean);
 var
-  Rslt : Integer;
+  Rslt: Integer;
 begin
  if IsDirty then begin
    Rslt := DirtyPrompt;
@ -567,9 +563,9 @@ end;
 {=====}
 procedure TfrmPrnFormat.lbFormatsClick(Sender: TObject);
 var
-  E : TVpPrintFormatElementItem;
-  Prn : TVpPrinter;
-  i, Idx : Integer;
+  E: TVpPrintFormatElementItem;
+  Prn: TVpPrinter;
+  i, Idx: Integer;
 begin
  lbElements.Items.Clear;
  Prn := ControlLink.Printer;
@ -578,6 +574,7 @@ begin
  Prn.CurFormat := Idx;

  PrintPreview.ControlLink := ControlLink;
+  PrintPreview.Invalidate;

  for i := 0 to Pred(Prn.PrintFormats.Items[Idx].Elements.Count) do begin
    E := Prn.PrintFormats.Items[Idx].Elements.Items[i];
@ -600,20 +597,19 @@ end;
 procedure TfrmPrnFormat.lbElementsMouseDown(Sender: TObject;
  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
-  LastX:=X;
-  LastY:=Y;
-  DragItem := (Sender as TListBox).ItemAtPos(Point(LastX, LastY),True);
+  LastX := X;
+  LastY := Y;
+  DragItem := (Sender as TListBox).ItemAtPos(Point(LastX, LastY), True);
 end;
 {=====}
-procedure TfrmPrnFormat.lbElementsDragDrop(Sender, Source: TObject; X,
-  Y: Integer);
+procedure TfrmPrnFormat.lbElementsDragDrop(Sender, Source: TObject; X, Y: Integer);
 var
-  lb : TListBox;
+  lb: TListBox;
  Dest: Integer;
-  E : TVpPrintFormatElementItem;
+  E: TVpPrintFormatElementItem;
 begin
  lb := Source as TListBox;
-  Dest:=lb.ItemAtPos(Point(X, Y),True);
+  Dest := lb.ItemAtPos(Point(X, Y), True);
  lb.Items.Move(DragItem, Dest);
  E := TVpPrintFormatElementItem(lbElements.Items.Objects[Dest]);
  E.Index := Dest;
@ -621,17 +617,17 @@ begin
  EnableMoveButtons;
 end;
 {=====}
-procedure TfrmPrnFormat.lbElementsDragOver(Sender, Source: TObject; X,
-  Y: Integer; State: TDragState; var Accept: Boolean);
+procedure TfrmPrnFormat.lbElementsDragOver(Sender, Source: TObject; X,Y: Integer;
+  State: TDragState; var Accept: Boolean);
 var
-  lb : TListBox;
+  lb: TListBox;
 begin
  lb := (Source as TListBox);
  lb.Canvas.DrawFocusRect(lb.ItemRect(lb.ItemAtPos(Point(LastX, LastY), True)));
  lb.Canvas.DrawFocusRect(lb.ItemRect(lb.ItemAtPos(Point(X, Y), True)));
  LastX := X;
  LastY := Y;
-  Accept:=True;
+  Accept := True;
 end;
 {=====}
 procedure TfrmPrnFormat.SetControlLink(const Value: TVpControlLink);
@ -643,11 +639,11 @@ begin
  end;
 end;
 {=====}
-procedure TfrmPrnFormat.SetFormatFileName (const v : string);          
+procedure TfrmPrnFormat.SetFormatFileName(const v: string);
 begin
  if v <> FFormatFileName then begin
    FFormatFileName := v;
-    if Assigned (FControlLink) then                                    
+    if Assigned(FControlLink) then
      FControlLink.Printer.DefaultXMLFileName := v;
  end;
 end;
@ -659,8 +655,8 @@ end;
 {=====}
 procedure TfrmPrnFormat.UpdateFormats;
 var
-  i : Integer;
-  Prn : TVpPrinter;
+  i: Integer;
+  Prn: TVpPrinter;
 begin
  Prn := ControlLink.Printer;
  for i := 0 to Pred(Prn.PrintFormats.Count) do
@ -670,13 +666,12 @@ end;
 {=====}
 procedure TfrmPrnFormat.UpdatePreview;
 var
-  Prn : TVpPrinter;
-  Idx : Integer;                                                         
-       
+  Prn: TVpPrinter;
+  Idx: Integer;
 begin
  Prn := ControlLink.Printer;
  if lbFormats.ItemIndex > -1 then begin
-    Idx := Prn.Find (lbFormats.Items[lbFormats.ItemIndex]);              
+    Idx := Prn.Find(lbFormats.Items[lbFormats.ItemIndex]);
    if Idx > - 1 then
    Prn.CurFormat := Idx;
    {Prn.CurFormat := lbFormats.ItemIndex; }
--- a/components/tvplanit/source/vpprtfmtdlg.pas
+++ b/components/tvplanit/source/vpprtfmtdlg.pas
@ -87,20 +87,20 @@ function TVpPrintFormatEditDialog.Execute: Boolean;
 var
  PrtFmtDlg : TfrmPrnFormat;
 begin
-  Application.CreateForm (TfrmPrnFormat, PrtFmtDlg);
+  PrtFmtDlg := TfrmPrnFormat.Create(Application);
+//  Application.CreateForm(TfrmPrnFormat, PrtFmtDlg);
  try
    DoFormPlacement(PrtFmtDlg);
    PrtFmtDlg.WindowState := WindowState;
    PrtFmtDlg.ControlLink := ControlLink;
    Result := PrtFmtDlg.Execute;
-
  finally
-    PrtFmtDlg.Release;
+    PrtFmtDlg.Free;
  end;
 end;

-procedure TVpPrintFormatEditDialog.Notification (AComponent : TComponent;
-                                               Operation  : TOperation);
+procedure TVpPrintFormatEditDialog.Notification(AComponent: TComponent;
+  Operation: TOperation);
  {-Handle new/deleted components}
 begin
  inherited Notification (AComponent, Operation);