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

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4926 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-07-06 18:56:23 +00:00
parent 4701336ffd
commit 18536b3f45
8 changed files with 162 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/tvplanit/examples/demo/demomain.lfm
View File

@ -784,8 +784,8 @@ object MainForm: TMainForm
object ImageList1: TImageList object ImageList1: TImageList
Height = 32 Height = 32
Width = 32 Width = 32
left = 312 left = 560
top = 365 top = 368
Bitmap = { Bitmap = {
4C69090000002000000020000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF 4C69090000002000000020000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
@ -1943,10 +1943,14 @@ object MainForm: TMainForm
} }
end end
object MainMenu1: TMainMenu object MainMenu1: TMainMenu
left = 469 left = 560
top = 221 top = 296
object MenuItem1: TMenuItem object MenuItem1: TMenuItem
Caption = 'File' Caption = 'File'
object MnuEditPrintFormats: TMenuItem
Caption = 'Edit print formats...'
OnClick = MnuEditPrintFormatsClick
end
object MnuPrintPreview: TMenuItem object MnuPrintPreview: TMenuItem
Caption = 'Print preview...' Caption = 'Print preview...'
OnClick = MnuPrintPreviewClick OnClick = MnuPrintPreviewClick
@ -2002,4 +2006,17 @@ object MainForm: TMainForm
left = 560 left = 560
top = 192 top = 192
end 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 end

1
components/tvplanit/examples/demo/demomain.lrt
View File

@ -23,6 +23,7 @@ TMAINFORM.COMBOBOX1.TEXT=ComboBox1
TMAINFORM.CBDRAWINGSTYLE.TEXT=flat TMAINFORM.CBDRAWINGSTYLE.TEXT=flat
TMAINFORM.TITLELBL.CAPTION=TitleLbl TMAINFORM.TITLELBL.CAPTION=TitleLbl
TMAINFORM.MENUITEM1.CAPTION=File TMAINFORM.MENUITEM1.CAPTION=File
TMAINFORM.MNUEDITPRINTFORMATS.CAPTION=Edit print formats...
TMAINFORM.MNUPRINTPREVIEW.CAPTION=Print preview... TMAINFORM.MNUPRINTPREVIEW.CAPTION=Print preview...
TMAINFORM.MENUITEM3.CAPTION=- TMAINFORM.MENUITEM3.CAPTION=-
TMAINFORM.MNUQUIT.CAPTION=Quit TMAINFORM.MNUQUIT.CAPTION=Quit

10
components/tvplanit/examples/demo/demomain.pas
View File

@ -8,7 +8,7 @@ uses
Classes, SysUtils, FileUtil, PrintersDlgs, Forms, Controls, Graphics, Dialogs, Classes, SysUtils, FileUtil, PrintersDlgs, Forms, Controls, Graphics, Dialogs,
ExtCtrls, StdCtrls, ComCtrls, LCLTranslator, Menus, VpBaseDS, VpDayView, ExtCtrls, StdCtrls, ComCtrls, LCLTranslator, Menus, VpBaseDS, VpDayView,
VpWeekView, VpTaskList, VpAbout, VpContactGrid, VpMonthView, VpResEditDlg, VpWeekView, VpTaskList, VpAbout, VpContactGrid, VpMonthView, VpResEditDlg,
VpContactButtons, VpBufDS, VpNavBar, VpData, VpPrtPrvDlg, Types; VpContactButtons, VpBufDS, VpNavBar, VpData, VpPrtPrvDlg, VpPrtFmtDlg, Types;
type type
@ -36,6 +36,7 @@ type
LblLanguage: TLabel; LblLanguage: TLabel;
LblVisibleDays: TLabel; LblVisibleDays: TLabel;
MenuItem3: TMenuItem; MenuItem3: TMenuItem;
MnuEditPrintFormats: TMenuItem;
MnuPrintPreview: TMenuItem; MnuPrintPreview: TMenuItem;
PrintDialog1: TPrintDialog; PrintDialog1: TPrintDialog;
TitleLbl: TLabel; TitleLbl: TLabel;
@ -70,6 +71,7 @@ type
VpDayView1: TVpDayView; VpDayView1: TVpDayView;
VpMonthView1: TVpMonthView; VpMonthView1: TVpMonthView;
VpNavBar1: TVpNavBar; VpNavBar1: TVpNavBar;
VpPrintFormatEditDialog1: TVpPrintFormatEditDialog;
VpPrintPreviewDialog1: TVpPrintPreviewDialog; VpPrintPreviewDialog1: TVpPrintPreviewDialog;
VpResourceCombo1: TVpResourceCombo; VpResourceCombo1: TVpResourceCombo;
VpResourceEditDialog1: TVpResourceEditDialog; VpResourceEditDialog1: TVpResourceEditDialog;
@ -90,6 +92,7 @@ type
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure MnuAboutClick(Sender: TObject); procedure MnuAboutClick(Sender: TObject);
procedure MnuEditPrintFormatsClick(Sender: TObject);
procedure MnuPrintPreviewClick(Sender: TObject); procedure MnuPrintPreviewClick(Sender: TObject);
procedure MnuQuitClick(Sender: TObject); procedure MnuQuitClick(Sender: TObject);
procedure MnuResourcesClick(Sender: TObject); procedure MnuResourcesClick(Sender: TObject);
@ -354,6 +357,11 @@ begin
end; end;
end; end;
procedure TMainForm.MnuEditPrintFormatsClick(Sender: TObject);
begin
VpPrintFormatEditDialog1.Execute;
end;
procedure TMainForm.MnuPrintPreviewClick(Sender: TObject); procedure TMainForm.MnuPrintPreviewClick(Sender: TObject);
var var
t1, t2: TDateTime; t1, t2: TDateTime;

4
components/tvplanit/languages/demo.de.po
View File

@ -264,6 +264,10 @@ msgstr ""
msgid "About Visual PlanIt" msgid "About Visual PlanIt"
msgstr "Über Visual PlanIt" msgstr "Über Visual PlanIt"
#: tmainform.mnueditprintformats.caption
msgid "Edit print formats..."
msgstr ""
#: tmainform.mnumaintenance.caption #: tmainform.mnumaintenance.caption
msgctxt "tmainform.mnumaintenance.caption" msgctxt "tmainform.mnumaintenance.caption"
msgid "Maintenance" msgid "Maintenance"

4
components/tvplanit/languages/demo.po
View File

@ -253,6 +253,10 @@ msgstr ""
msgid "About Visual PlanIt" msgid "About Visual PlanIt"
msgstr "" msgstr ""
#: tmainform.mnueditprintformats.caption
msgid "Edit print formats..."
msgstr ""
#: tmainform.mnumaintenance.caption #: tmainform.mnumaintenance.caption
msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION" msgctxt "TMAINFORM.MNUMAINTENANCE.CAPTION"
msgid "Maintenance" msgid "Maintenance"

8
components/tvplanit/source/vpedfmtlst.lfm
View File

@ -201,7 +201,7 @@ object frmPrnFormat: TfrmPrnFormat
ClientWidth = 640 ClientWidth = 640
TabOrder = 9 TabOrder = 9
object btnLoadFile: TButton object btnLoadFile: TButton
Left = 92 Left = 88
Height = 25 Height = 25
Top = 8 Top = 8
Width = 75 Width = 75
@ -210,7 +210,7 @@ object frmPrnFormat: TfrmPrnFormat
TabOrder = 1 TabOrder = 1
end end
object btnSaveFile: TButton object btnSaveFile: TButton
Left = 172 Left = 168
Height = 25 Height = 25
Top = 8 Top = 8
Width = 75 Width = 75
@ -219,7 +219,7 @@ object frmPrnFormat: TfrmPrnFormat
TabOrder = 2 TabOrder = 2
end end
object btnNewFile: TButton object btnNewFile: TButton
Left = 12 Left = 8
Height = 25 Height = 25
Top = 8 Top = 8
Width = 75 Width = 75
@ -228,7 +228,7 @@ object frmPrnFormat: TfrmPrnFormat
TabOrder = 0 TabOrder = 0
end end
object btnOk: TButton object btnOk: TButton
Left = 552 Left = 556
Height = 25 Height = 25
Top = 8 Top = 8
Width = 75 Width = 75

51
components/tvplanit/source/vpedfmtlst.pas
View File

@ -95,12 +95,14 @@ type
procedure lbElementsDragDrop(Sender, Source: TObject; X, Y: Integer); procedure lbElementsDragDrop(Sender, Source: TObject; X, Y: Integer);
procedure lbElementsDragOver(Sender, Source: TObject; X, Y: Integer; procedure lbElementsDragOver(Sender, Source: TObject; X, Y: Integer;
State: TDragState; var Accept: Boolean); State: TDragState; var Accept: Boolean);
private private
FFormatFileName: string; FFormatFileName: string;
FControlLink: TVpControlLink; FControlLink: TVpControlLink;
IsDirty: Boolean; IsDirty: Boolean;
LastX, LastY: Integer; LastX, LastY: Integer;
DragItem: Integer; DragItem: Integer;
protected protected
function DirtyPrompt: Integer; function DirtyPrompt: Integer;
procedure DoEditElement; procedure DoEditElement;
@ -119,17 +121,13 @@ type
function GetControlLink: TVpControlLink; function GetControlLink: TVpControlLink;
procedure SetControlLink(const Value: TVpControlLink); procedure SetControlLink(const Value: TVpControlLink);
{ Private declarations }
public public
property ControlLink : TVpControlLink
read FControlLink write SetControlLink;
function Execute : Boolean; function Execute : Boolean;
{ Public declarations } property ControlLink : TVpControlLink read FControlLink write SetControlLink;
published published
property FormatFileName : string property FormatFileName : string read FFormatFileName write SetFormatFileName;
read FFormatFileName write SetFormatFileName;
end; end;
var var
@ -140,8 +138,10 @@ implementation
uses uses
VpEdFmt, VpEdElem; VpEdFmt, VpEdElem;
{$IFNDEF LCL} {$IFDEF DELPHI}
{$R *.DFM} {$R *.dfm}
{$ELSE}
{$R *.lfm}
{$ENDIF} {$ENDIF}
{TfrmPrnFormat} {TfrmPrnFormat}
@ -152,8 +152,6 @@ begin
IsDirty := False; IsDirty := False;
FormatFileName := UnnamedFile; FormatFileName := UnnamedFile;
EnableFormatButtons(False); EnableFormatButtons(False);
EnableElementButtons(False); EnableElementButtons(False);
end; end;
@ -161,8 +159,7 @@ end;
procedure TfrmPrnFormat.EnableMoveButtons; procedure TfrmPrnFormat.EnableMoveButtons;
begin begin
btnMoveElementUp.Enabled := lbElements.ItemIndex > 0; btnMoveElementUp.Enabled := lbElements.ItemIndex > 0;
btnMoveElementDn.Enabled := btnMoveElementDn.Enabled := lbElements.ItemIndex < lbElements.Items.Count - 1;
lbElements.ItemIndex < lbElements.Items.Count - 1;
end; end;
{=====} {=====}
procedure TfrmPrnFormat.FormShow(Sender: TObject); procedure TfrmPrnFormat.FormShow(Sender: TObject);
@ -211,8 +208,7 @@ begin
Prn := ControlLink.Printer; Prn := ControlLink.Printer;
Idx := Prn.Find(lbFormats.Items[lbFormats.ItemIndex]); Idx := Prn.Find(lbFormats.Items[lbFormats.ItemIndex]);
if (Idx < 0) or (Idx >= Prn.PrintFormats.Count) then if (Idx < 0) or (Idx >= Prn.PrintFormats.Count) then
ShowMessage ('Invalid print format: ' + ShowMessage ('Invalid print format: ' + lbFormats.Items[lbFormats.ItemIndex]);
lbFormats.Items[lbFormats.ItemIndex]);
Prn.PrintFormats.Items[Idx].Free; Prn.PrintFormats.Items[Idx].Free;
lbFormats.Items.Delete(lbFormats.ItemIndex); lbFormats.Items.Delete(lbFormats.ItemIndex);
IsDirty := True; IsDirty := True;
@ -291,15 +287,14 @@ procedure TfrmPrnFormat.btnNewFormatClick(Sender: TObject);
var var
NewFormatIdx: Integer; NewFormatIdx: Integer;
i: Integer; i: Integer;
begin begin
NewFormatIdx := DoNewFormat; NewFormatIdx := DoNewFormat;
if (NewFormatIdx > 0) and if (NewFormatIdx > 0) and (Assigned (ControlLink)) and
(Assigned (ControlLink)) and (NewFormatIdx < ControlLink.Printer.PrintFormats.Count)
(NewFormatIdx < ControlLink.Printer.PrintFormats.Count) then then
for i := 0 to lbFormats.Items.Count - 1 do for i := 0 to lbFormats.Items.Count - 1 do
if lbFormats.Items[i] = ControlLink.Printer.PrintFormats. if lbFormats.Items[i] = ControlLink.Printer.PrintFormats.Items[NewFormatIdx].FormatName then
Items[NewFormatIdx].FormatName then begin begin
lbFormats.ItemIndex := i; lbFormats.ItemIndex := i;
lbFormatsClick(Self); lbFormatsClick(Self);
Break; Break;
@ -345,7 +340,8 @@ begin
Result := Application.MessageBox( Result := Application.MessageBox(
PChar('Save changes to ' + FormatFileName + '?'), PChar('Save changes to ' + FormatFileName + '?'),
PChar('Inquiry'), PChar('Inquiry'),
MB_YESNOCANCEL or MB_ICONQUESTION); MB_YESNOCANCEL or MB_ICONQUESTION
);
end; end;
{=====} {=====}
procedure TfrmPrnFormat.DoEditElement; procedure TfrmPrnFormat.DoEditElement;
@ -578,6 +574,7 @@ begin
Prn.CurFormat := Idx; Prn.CurFormat := Idx;
PrintPreview.ControlLink := ControlLink; PrintPreview.ControlLink := ControlLink;
PrintPreview.Invalidate;
for i := 0 to Pred(Prn.PrintFormats.Items[Idx].Elements.Count) do begin for i := 0 to Pred(Prn.PrintFormats.Items[Idx].Elements.Count) do begin
E := Prn.PrintFormats.Items[Idx].Elements.Items[i]; E := Prn.PrintFormats.Items[Idx].Elements.Items[i];
@ -605,8 +602,7 @@ begin
DragItem := (Sender as TListBox).ItemAtPos(Point(LastX, LastY), True); DragItem := (Sender as TListBox).ItemAtPos(Point(LastX, LastY), True);
end; end;
{=====} {=====}
procedure TfrmPrnFormat.lbElementsDragDrop(Sender, Source: TObject; X, procedure TfrmPrnFormat.lbElementsDragDrop(Sender, Source: TObject; X, Y: Integer);
Y: Integer);
var var
lb: TListBox; lb: TListBox;
Dest: Integer; Dest: Integer;
@ -621,8 +617,8 @@ begin
EnableMoveButtons; EnableMoveButtons;
end; end;
{=====} {=====}
procedure TfrmPrnFormat.lbElementsDragOver(Sender, Source: TObject; X, procedure TfrmPrnFormat.lbElementsDragOver(Sender, Source: TObject; X,Y: Integer;
Y: Integer; State: TDragState; var Accept: Boolean); State: TDragState; var Accept: Boolean);
var var
lb: TListBox; lb: TListBox;
begin begin
@ -672,7 +668,6 @@ procedure TfrmPrnFormat.UpdatePreview;
var var
Prn: TVpPrinter; Prn: TVpPrinter;
Idx: Integer; Idx: Integer;
begin begin
Prn := ControlLink.Printer; Prn := ControlLink.Printer;
if lbFormats.ItemIndex > -1 then begin if lbFormats.ItemIndex > -1 then begin

6
components/tvplanit/source/vpprtfmtdlg.pas
View File

@ -87,15 +87,15 @@ function TVpPrintFormatEditDialog.Execute: Boolean;
var var
PrtFmtDlg : TfrmPrnFormat; PrtFmtDlg : TfrmPrnFormat;
begin begin
Application.CreateForm (TfrmPrnFormat, PrtFmtDlg); PrtFmtDlg := TfrmPrnFormat.Create(Application);
// Application.CreateForm(TfrmPrnFormat, PrtFmtDlg);
try try
DoFormPlacement(PrtFmtDlg); DoFormPlacement(PrtFmtDlg);
PrtFmtDlg.WindowState := WindowState; PrtFmtDlg.WindowState := WindowState;
PrtFmtDlg.ControlLink := ControlLink; PrtFmtDlg.ControlLink := ControlLink;
Result := PrtFmtDlg.Execute; Result := PrtFmtDlg.Execute;
finally finally
PrtFmtDlg.Release; PrtFmtDlg.Free;
end; end;
end; end;