paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-19 00:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Printers: improved properties dialog layout and i18n, bug #28772; regenerated translations and updated Russian translation.

Browse Source 
git-svn-id: trunk@49934 -
This commit is contained in:
maxim 2015-10-03 21:32:08 +00:00
parent 83c3757b85
commit 78e6dc4d48
6 changed files with 142 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/printers/languages/printer4lazstrconst.de.po
View File

@ -68,6 +68,10 @@ msgstr "Papiertyp"
msgid "Portrait" msgid "Portrait"
msgstr "Hochformat" msgstr "Hochformat"
#: printer4lazstrconst.p4lrsprinterproperties
msgid "Printer properties"
msgstr ""
#: printer4lazstrconst.p4lrsresolution #: printer4lazstrconst.p4lrsresolution
msgid "Resolution" msgid "Resolution"
msgstr "Auflösung" msgstr "Auflösung"
@ -83,3 +87,4 @@ msgstr "Hochformat gedreht"
#: printer4lazstrconst.p4lrsstart #: printer4lazstrconst.p4lrsstart
msgid "Start" msgid "Start"
msgstr "Start" msgstr "Start"

4
components/printers/languages/printer4lazstrconst.po
View File

@ -57,6 +57,10 @@ msgstr ""
msgid "Portrait" msgid "Portrait"
msgstr "" msgstr ""
#: printer4lazstrconst.p4lrsprinterproperties
msgid "Printer properties"
msgstr ""
#: printer4lazstrconst.p4lrsresolution #: printer4lazstrconst.p4lrsresolution
msgid "Resolution" msgid "Resolution"
msgstr "" msgstr ""

4
components/printers/languages/printer4lazstrconst.ru.po
View File

@ -67,6 +67,10 @@ msgstr "Тип бумаги"
msgid "Portrait" msgid "Portrait"
msgstr "Книжная" msgstr "Книжная"
#: printer4lazstrconst.p4lrsprinterproperties
msgid "Printer properties"
msgstr "Свойства принтера"
#: printer4lazstrconst.p4lrsresolution #: printer4lazstrconst.p4lrsresolution
msgid "Resolution" msgid "Resolution"
msgstr "Разрешение" msgstr "Разрешение"

1
components/printers/printer4lazstrconst.pas
View File

@ -16,6 +16,7 @@ interface
resourcestring resourcestring
p4lrsCancel = 'Cancel'; p4lrsCancel = 'Cancel';
p4lrsPrinterProperties = 'Printer properties';
p4lrsOk = 'Ok'; p4lrsOk = 'Ok';
p4lrsGeneral = 'General'; p4lrsGeneral = 'General';
p4lrsPaperSize = 'Paper size'; p4lrsPaperSize = 'Paper size';

195
components/printers/unix/udlgpropertiesprinter.lfm
View File

@ -51,6 +51,7 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
end end
object Notebook1: TPageControl object Notebook1: TPageControl
AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 423 Height = 423
Top = 0 Top = 0
@ -61,67 +62,99 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
TabOrder = 1 TabOrder = 1
object pgGeneral: TTabSheet object pgGeneral: TTabSheet
Caption = 'General' Caption = 'General'
ClientHeight = 394 ClientHeight = 395
ClientWidth = 453 ClientWidth = 449
object labPaperSize: TLabel object labPaperSize: TLabel
Left = 15 AnchorSideLeft.Control = pgGeneral
AnchorSideTop.Control = cbPaperSize
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15 Height = 15
Top = 19 Top = 10
Width = 56 Width = 52
BorderSpacing.Left = 6
Caption = 'Paper size' Caption = 'Paper size'
ParentColor = False ParentColor = False
end end
object labPaperType: TLabel object labPaperType: TLabel
Left = 15 AnchorSideLeft.Control = labPaperSize
AnchorSideTop.Control = cbPaperType
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15 Height = 15
Top = 55 Top = 39
Width = 60 Width = 56
Caption = 'Paper type' Caption = 'Paper type'
ParentColor = False ParentColor = False
end end
object labPaperSrc: TLabel object labPaperSrc: TLabel
Left = 15 AnchorSideLeft.Control = labPaperSize
AnchorSideTop.Control = cbPaperSrc
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15 Height = 15
Top = 92 Top = 68
Width = 72 Width = 68
Caption = 'Paper source' Caption = 'Paper source'
ParentColor = False ParentColor = False
end end
object labResolution: TLabel object labResolution: TLabel
Left = 15 AnchorSideLeft.Control = labPaperSize
AnchorSideTop.Control = cbResolution
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15 Height = 15
Top = 125 Top = 97
Width = 59 Width = 56
Caption = 'Resolution' Caption = 'Resolution'
ParentColor = False ParentColor = False
end end
object cbPaperSize: TComboBox object cbPaperSize: TComboBox
Left = 130 AnchorSideTop.Control = pgGeneral
Height = 29 AnchorSideRight.Control = pgGeneral
Top = 9 AnchorSideRight.Side = asrBottom
Width = 310 Left = 168
Height = 23
Top = 6
Width = 275
Anchors = [akTop, akRight]
BorderSpacing.Around = 6
DropDownCount = 10 DropDownCount = 10
ItemHeight = 0 ItemHeight = 15
OnKeyPress = cbPaperSizeKEYPRESS OnKeyPress = cbPaperSizeKEYPRESS
Style = csDropDownList Style = csDropDownList
TabOrder = 0 TabOrder = 0
end end
object cbPaperType: TComboBox object cbPaperType: TComboBox
Left = 130 AnchorSideLeft.Control = cbPaperSize
Height = 29 AnchorSideTop.Control = cbPaperSize
Top = 45 AnchorSideTop.Side = asrBottom
Width = 310 AnchorSideRight.Control = cbPaperSize
ItemHeight = 0 AnchorSideRight.Side = asrBottom
Left = 168
Height = 23
Top = 35
Width = 275
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
ItemHeight = 15
OnKeyPress = cbPaperSizeKEYPRESS OnKeyPress = cbPaperSizeKEYPRESS
Style = csDropDownList Style = csDropDownList
TabOrder = 1 TabOrder = 1
end end
object cbPaperSrc: TComboBox object cbPaperSrc: TComboBox
Left = 130 AnchorSideLeft.Control = cbPaperSize
Height = 29 AnchorSideTop.Control = cbPaperType
Top = 81 AnchorSideTop.Side = asrBottom
Width = 310 AnchorSideRight.Control = cbPaperSize
ItemHeight = 0 AnchorSideRight.Side = asrBottom
Left = 168
Height = 23
Top = 64
Width = 275
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
ItemHeight = 15
OnKeyPress = cbPaperSizeKEYPRESS OnKeyPress = cbPaperSizeKEYPRESS
Style = csDropDownList Style = csDropDownList
TabOrder = 3 TabOrder = 3
@ -132,7 +165,7 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
Top = 162 Top = 162
Width = 233 Width = 233
Caption = ' Orientation ' Caption = ' Orientation '
ClientHeight = 102 ClientHeight = 99
ClientWidth = 229 ClientWidth = 229
TabOrder = 5 TabOrder = 5
object imgOrientation: TImage object imgOrientation: TImage
@ -143,9 +176,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbPortrait: TRadioButton object rbPortrait: TRadioButton
Left = 7 Left = 7
Height = 24 Height = 19
Top = 5 Top = 5
Width = 69 Width = 59
Caption = 'Portrait' Caption = 'Portrait'
Checked = True Checked = True
DragCursor = crDefault DragCursor = crDefault
@ -155,9 +188,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbLandscape: TRadioButton object rbLandscape: TRadioButton
Left = 7 Left = 7
Height = 24 Height = 19
Top = 29 Top = 29
Width = 83 Width = 76
Caption = 'Landscape' Caption = 'Landscape'
DragCursor = crDefault DragCursor = crDefault
OnClick = rbPortraitCLICK OnClick = rbPortraitCLICK
@ -165,9 +198,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbrev_Landscape: TRadioButton object rbrev_Landscape: TRadioButton
Left = 7 Left = 7
Height = 24 Height = 19
Top = 53 Top = 53
Width = 128 Width = 116
Caption = 'Reverse landscape' Caption = 'Reverse landscape'
DragCursor = crDefault DragCursor = crDefault
OnClick = rbPortraitCLICK OnClick = rbPortraitCLICK
@ -175,9 +208,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbrev_portrait: TRadioButton object rbrev_portrait: TRadioButton
Left = 7 Left = 7
Height = 24 Height = 19
Top = 77 Top = 77
Width = 117 Width = 102
Caption = 'Reverse portrait' Caption = 'Reverse portrait'
DragCursor = crDefault DragCursor = crDefault
OnClick = rbPortraitCLICK OnClick = rbPortraitCLICK
@ -190,41 +223,60 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
Top = 290 Top = 290
Width = 427 Width = 427
Caption = ' Banners ' Caption = ' Banners '
ClientHeight = 79 ClientHeight = 76
ClientWidth = 423 ClientWidth = 423
TabOrder = 2 TabOrder = 2
object labBanStart: TLabel object labBanStart: TLabel
AnchorSideLeft.Control = gbBanners
AnchorSideTop.Control = cbBanStart
AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 15 Height = 15
Top = 9 Top = 10
Width = 27 Width = 24
BorderSpacing.Left = 6
Caption = 'Start' Caption = 'Start'
ParentColor = False ParentColor = False
end end
object labBanEnd: TLabel object labBanEnd: TLabel
AnchorSideLeft.Control = labBanStart
AnchorSideTop.Control = cbBanEnd
AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 15 Height = 15
Top = 49 Top = 39
Width = 21 Width = 20
Caption = 'End' Caption = 'End'
ParentColor = False ParentColor = False
end end
object cbBanStart: TComboBox object cbBanStart: TComboBox
Left = 94 AnchorSideTop.Control = gbBanners
Height = 29 AnchorSideRight.Control = gbBanners
Top = 1 AnchorSideRight.Side = asrBottom
Width = 317 Left = 112
ItemHeight = 0 Height = 23
Top = 6
Width = 305
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
ItemHeight = 15
OnKeyPress = cbPaperSizeKEYPRESS OnKeyPress = cbPaperSizeKEYPRESS
Style = csDropDownList Style = csDropDownList
TabOrder = 0 TabOrder = 0
end end
object cbBanEnd: TComboBox object cbBanEnd: TComboBox
Left = 94 AnchorSideLeft.Control = cbBanStart
Height = 29 AnchorSideTop.Control = cbBanStart
Top = 41 AnchorSideTop.Side = asrBottom
Width = 317 AnchorSideRight.Control = cbBanStart
ItemHeight = 0 AnchorSideRight.Side = asrBottom
Left = 112
Height = 23
Top = 35
Width = 305
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
ItemHeight = 15
OnKeyPress = cbPaperSizeKEYPRESS OnKeyPress = cbPaperSizeKEYPRESS
Style = csDropDownList Style = csDropDownList
TabOrder = 1 TabOrder = 1
@ -236,7 +288,7 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
Top = 163 Top = 163
Width = 185 Width = 185
Caption = ' Pages per sheet ' Caption = ' Pages per sheet '
ClientHeight = 101 ClientHeight = 98
ClientWidth = 181 ClientWidth = 181
TabOrder = 4 TabOrder = 4
object imgPageSheet: TImage object imgPageSheet: TImage
@ -247,9 +299,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbSheet1: TRadioButton object rbSheet1: TRadioButton
Left = 6 Left = 6
Height = 24 Height = 19
Top = 5 Top = 5
Width = 33 Width = 26
Caption = '1' Caption = '1'
Checked = True Checked = True
DragCursor = crDefault DragCursor = crDefault
@ -259,9 +311,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbSheet2: TRadioButton object rbSheet2: TRadioButton
Left = 6 Left = 6
Height = 24 Height = 19
Top = 29 Top = 29
Width = 33 Width = 26
Caption = '2' Caption = '2'
DragCursor = crDefault DragCursor = crDefault
OnClick = rbPortraitCLICK OnClick = rbPortraitCLICK
@ -269,9 +321,9 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object rbSheet4: TRadioButton object rbSheet4: TRadioButton
Left = 6 Left = 6
Height = 24 Height = 19
Top = 53 Top = 53
Width = 33 Width = 26
Caption = '4' Caption = '4'
DragCursor = crDefault DragCursor = crDefault
OnClick = rbPortraitCLICK OnClick = rbPortraitCLICK
@ -279,11 +331,18 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
end end
object cbResolution: TComboBox object cbResolution: TComboBox
Left = 130 AnchorSideLeft.Control = cbPaperSize
Height = 29 AnchorSideTop.Control = cbPaperSrc
Top = 117 AnchorSideTop.Side = asrBottom
Width = 310 AnchorSideRight.Control = cbPaperSize
ItemHeight = 0 AnchorSideRight.Side = asrBottom
Left = 168
Height = 23
Top = 93
Width = 275
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
ItemHeight = 15
OnKeyPress = cbPaperSizeKEYPRESS OnKeyPress = cbPaperSizeKEYPRESS
Style = csDropDownList Style = csDropDownList
TabOrder = 6 TabOrder = 6
@ -294,11 +353,11 @@ object dlgpropertiesprinter: Tdlgpropertiesprinter
end end
object pgAdvanced: TTabSheet object pgAdvanced: TTabSheet
Caption = 'Advanced' Caption = 'Advanced'
ClientHeight = 394 ClientHeight = 395
ClientWidth = 453 ClientWidth = 449
object sb: TScrollBox object sb: TScrollBox
Left = 0 Left = 0
Height = 397 Height = 395
Top = 0 Top = 0
Width = 449 Width = 449
HorzScrollBar.Page = 1 HorzScrollBar.Page = 1

1
components/printers/unix/udlgpropertiesprinter.pp
View File

@ -343,6 +343,7 @@ begin
if Sender=nil then ; if Sender=nil then ;
Notebook1.PageIndex:=0; Notebook1.PageIndex:=0;
Caption := p4lrsPrinterProperties;
btnCancel1.Caption := p4lrsCancel; btnCancel1.Caption := p4lrsCancel;
btnOk.Caption := p4lrsOk; btnOk.Caption := p4lrsOk;
pgGeneral.Caption := p4lrsGeneral; pgGeneral.Caption := p4lrsGeneral;