diff --git a/components/printers/languages/printer4lazstrconst.de.po b/components/printers/languages/printer4lazstrconst.de.po index d23a471c4a..473066520d 100644 --- a/components/printers/languages/printer4lazstrconst.de.po +++ b/components/printers/languages/printer4lazstrconst.de.po @@ -68,6 +68,10 @@ msgstr "Papiertyp" msgid "Portrait" msgstr "Hochformat" +#: printer4lazstrconst.p4lrsprinterproperties +msgid "Printer properties" +msgstr "" + #: printer4lazstrconst.p4lrsresolution msgid "Resolution" msgstr "Auflösung" @@ -83,3 +87,4 @@ msgstr "Hochformat gedreht" #: printer4lazstrconst.p4lrsstart msgid "Start" msgstr "Start" + diff --git a/components/printers/languages/printer4lazstrconst.po b/components/printers/languages/printer4lazstrconst.po index cd5f51b386..6dd933dbab 100644 --- a/components/printers/languages/printer4lazstrconst.po +++ b/components/printers/languages/printer4lazstrconst.po @@ -57,6 +57,10 @@ msgstr "" msgid "Portrait" msgstr "" +#: printer4lazstrconst.p4lrsprinterproperties +msgid "Printer properties" +msgstr "" + #: printer4lazstrconst.p4lrsresolution msgid "Resolution" msgstr "" diff --git a/components/printers/languages/printer4lazstrconst.ru.po b/components/printers/languages/printer4lazstrconst.ru.po index 41b4bd1fea..437311c042 100644 --- a/components/printers/languages/printer4lazstrconst.ru.po +++ b/components/printers/languages/printer4lazstrconst.ru.po @@ -67,6 +67,10 @@ msgstr "Тип бумаги" msgid "Portrait" msgstr "Книжная" +#: printer4lazstrconst.p4lrsprinterproperties +msgid "Printer properties" +msgstr "Свойства принтера" + #: printer4lazstrconst.p4lrsresolution msgid "Resolution" msgstr "Разрешение" diff --git a/components/printers/printer4lazstrconst.pas b/components/printers/printer4lazstrconst.pas index eb865d2af2..39b9b88c14 100644 --- a/components/printers/printer4lazstrconst.pas +++ b/components/printers/printer4lazstrconst.pas @@ -16,6 +16,7 @@ interface resourcestring p4lrsCancel = 'Cancel'; + p4lrsPrinterProperties = 'Printer properties'; p4lrsOk = 'Ok'; p4lrsGeneral = 'General'; p4lrsPaperSize = 'Paper size'; diff --git a/components/printers/unix/udlgpropertiesprinter.lfm b/components/printers/unix/udlgpropertiesprinter.lfm index b21f68341c..c24360bc96 100644 --- a/components/printers/unix/udlgpropertiesprinter.lfm +++ b/components/printers/unix/udlgpropertiesprinter.lfm @@ -51,6 +51,7 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end end object Notebook1: TPageControl + AnchorSideRight.Side = asrBottom Left = 0 Height = 423 Top = 0 @@ -61,67 +62,99 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter TabOrder = 1 object pgGeneral: TTabSheet Caption = 'General' - ClientHeight = 394 - ClientWidth = 453 + ClientHeight = 395 + ClientWidth = 449 object labPaperSize: TLabel - Left = 15 + AnchorSideLeft.Control = pgGeneral + AnchorSideTop.Control = cbPaperSize + AnchorSideTop.Side = asrCenter + Left = 6 Height = 15 - Top = 19 - Width = 56 + Top = 10 + Width = 52 + BorderSpacing.Left = 6 Caption = 'Paper size' ParentColor = False end object labPaperType: TLabel - Left = 15 + AnchorSideLeft.Control = labPaperSize + AnchorSideTop.Control = cbPaperType + AnchorSideTop.Side = asrCenter + Left = 6 Height = 15 - Top = 55 - Width = 60 + Top = 39 + Width = 56 Caption = 'Paper type' ParentColor = False end object labPaperSrc: TLabel - Left = 15 + AnchorSideLeft.Control = labPaperSize + AnchorSideTop.Control = cbPaperSrc + AnchorSideTop.Side = asrCenter + Left = 6 Height = 15 - Top = 92 - Width = 72 + Top = 68 + Width = 68 Caption = 'Paper source' ParentColor = False end object labResolution: TLabel - Left = 15 + AnchorSideLeft.Control = labPaperSize + AnchorSideTop.Control = cbResolution + AnchorSideTop.Side = asrCenter + Left = 6 Height = 15 - Top = 125 - Width = 59 + Top = 97 + Width = 56 Caption = 'Resolution' ParentColor = False end object cbPaperSize: TComboBox - Left = 130 - Height = 29 - Top = 9 - Width = 310 + AnchorSideTop.Control = pgGeneral + AnchorSideRight.Control = pgGeneral + AnchorSideRight.Side = asrBottom + Left = 168 + Height = 23 + Top = 6 + Width = 275 + Anchors = [akTop, akRight] + BorderSpacing.Around = 6 DropDownCount = 10 - ItemHeight = 0 + ItemHeight = 15 OnKeyPress = cbPaperSizeKEYPRESS Style = csDropDownList TabOrder = 0 end object cbPaperType: TComboBox - Left = 130 - Height = 29 - Top = 45 - Width = 310 - ItemHeight = 0 + AnchorSideLeft.Control = cbPaperSize + AnchorSideTop.Control = cbPaperSize + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = cbPaperSize + AnchorSideRight.Side = asrBottom + Left = 168 + Height = 23 + Top = 35 + Width = 275 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 OnKeyPress = cbPaperSizeKEYPRESS Style = csDropDownList TabOrder = 1 end object cbPaperSrc: TComboBox - Left = 130 - Height = 29 - Top = 81 - Width = 310 - ItemHeight = 0 + AnchorSideLeft.Control = cbPaperSize + AnchorSideTop.Control = cbPaperType + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = cbPaperSize + AnchorSideRight.Side = asrBottom + Left = 168 + Height = 23 + Top = 64 + Width = 275 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 OnKeyPress = cbPaperSizeKEYPRESS Style = csDropDownList TabOrder = 3 @@ -132,7 +165,7 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter Top = 162 Width = 233 Caption = ' Orientation ' - ClientHeight = 102 + ClientHeight = 99 ClientWidth = 229 TabOrder = 5 object imgOrientation: TImage @@ -143,9 +176,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbPortrait: TRadioButton Left = 7 - Height = 24 + Height = 19 Top = 5 - Width = 69 + Width = 59 Caption = 'Portrait' Checked = True DragCursor = crDefault @@ -155,9 +188,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbLandscape: TRadioButton Left = 7 - Height = 24 + Height = 19 Top = 29 - Width = 83 + Width = 76 Caption = 'Landscape' DragCursor = crDefault OnClick = rbPortraitCLICK @@ -165,9 +198,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbrev_Landscape: TRadioButton Left = 7 - Height = 24 + Height = 19 Top = 53 - Width = 128 + Width = 116 Caption = 'Reverse landscape' DragCursor = crDefault OnClick = rbPortraitCLICK @@ -175,9 +208,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbrev_portrait: TRadioButton Left = 7 - Height = 24 + Height = 19 Top = 77 - Width = 117 + Width = 102 Caption = 'Reverse portrait' DragCursor = crDefault OnClick = rbPortraitCLICK @@ -190,41 +223,60 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter Top = 290 Width = 427 Caption = ' Banners ' - ClientHeight = 79 + ClientHeight = 76 ClientWidth = 423 TabOrder = 2 object labBanStart: TLabel + AnchorSideLeft.Control = gbBanners + AnchorSideTop.Control = cbBanStart + AnchorSideTop.Side = asrCenter Left = 6 Height = 15 - Top = 9 - Width = 27 + Top = 10 + Width = 24 + BorderSpacing.Left = 6 Caption = 'Start' ParentColor = False end object labBanEnd: TLabel + AnchorSideLeft.Control = labBanStart + AnchorSideTop.Control = cbBanEnd + AnchorSideTop.Side = asrCenter Left = 6 Height = 15 - Top = 49 - Width = 21 + Top = 39 + Width = 20 Caption = 'End' ParentColor = False end object cbBanStart: TComboBox - Left = 94 - Height = 29 - Top = 1 - Width = 317 - ItemHeight = 0 + AnchorSideTop.Control = gbBanners + AnchorSideRight.Control = gbBanners + AnchorSideRight.Side = asrBottom + Left = 112 + Height = 23 + Top = 6 + Width = 305 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Around = 6 + ItemHeight = 15 OnKeyPress = cbPaperSizeKEYPRESS Style = csDropDownList TabOrder = 0 end object cbBanEnd: TComboBox - Left = 94 - Height = 29 - Top = 41 - Width = 317 - ItemHeight = 0 + AnchorSideLeft.Control = cbBanStart + AnchorSideTop.Control = cbBanStart + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = cbBanStart + AnchorSideRight.Side = asrBottom + Left = 112 + Height = 23 + Top = 35 + Width = 305 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 OnKeyPress = cbPaperSizeKEYPRESS Style = csDropDownList TabOrder = 1 @@ -236,7 +288,7 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter Top = 163 Width = 185 Caption = ' Pages per sheet ' - ClientHeight = 101 + ClientHeight = 98 ClientWidth = 181 TabOrder = 4 object imgPageSheet: TImage @@ -247,9 +299,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbSheet1: TRadioButton Left = 6 - Height = 24 + Height = 19 Top = 5 - Width = 33 + Width = 26 Caption = '1' Checked = True DragCursor = crDefault @@ -259,9 +311,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbSheet2: TRadioButton Left = 6 - Height = 24 + Height = 19 Top = 29 - Width = 33 + Width = 26 Caption = '2' DragCursor = crDefault OnClick = rbPortraitCLICK @@ -269,9 +321,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object rbSheet4: TRadioButton Left = 6 - Height = 24 + Height = 19 Top = 53 - Width = 33 + Width = 26 Caption = '4' DragCursor = crDefault OnClick = rbPortraitCLICK @@ -279,11 +331,18 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end end object cbResolution: TComboBox - Left = 130 - Height = 29 - Top = 117 - Width = 310 - ItemHeight = 0 + AnchorSideLeft.Control = cbPaperSize + AnchorSideTop.Control = cbPaperSrc + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = cbPaperSize + AnchorSideRight.Side = asrBottom + Left = 168 + Height = 23 + Top = 93 + Width = 275 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 OnKeyPress = cbPaperSizeKEYPRESS Style = csDropDownList TabOrder = 6 @@ -294,11 +353,11 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter end object pgAdvanced: TTabSheet Caption = 'Advanced' - ClientHeight = 394 - ClientWidth = 453 + ClientHeight = 395 + ClientWidth = 449 object sb: TScrollBox Left = 0 - Height = 397 + Height = 395 Top = 0 Width = 449 HorzScrollBar.Page = 1 diff --git a/components/printers/unix/udlgpropertiesprinter.pp b/components/printers/unix/udlgpropertiesprinter.pp index 9cc422baa1..e59d67781c 100644 --- a/components/printers/unix/udlgpropertiesprinter.pp +++ b/components/printers/unix/udlgpropertiesprinter.pp @@ -343,6 +343,7 @@ begin if Sender=nil then ; Notebook1.PageIndex:=0; + Caption := p4lrsPrinterProperties; btnCancel1.Caption := p4lrsCancel; btnOk.Caption := p4lrsOk; pgGeneral.Caption := p4lrsGeneral;