From 854be67841ef79e87c2e47a151cf012b86a77836 Mon Sep 17 00:00:00 2001
From: jesus <jesus@lazarus-ide.org>
Date: Thu, 20 Sep 2007 19:04:40 +0000
Subject: [PATCH] Printers, changed layout of select printer dialog so it can
 be used with carbon from Phil Hess, issue #9703

git-svn-id: trunk@12095 -
---
 .../printers/unix/udlgselectprinter.lfm       | 112 ++++++------
 .../printers/unix/udlgselectprinter.lrs       | 166 +++++++++---------
 components/printers/unix/udlgselectprinter.pp |   8 +-
 3 files changed, 147 insertions(+), 139 deletions(-)

diff --git a/components/printers/unix/udlgselectprinter.lfm b/components/printers/unix/udlgselectprinter.lfm
index 5ee2493ea3..16104f301e 100644
--- a/components/printers/unix/udlgselectprinter.lfm
+++ b/components/printers/unix/udlgselectprinter.lfm
@@ -1,7 +1,7 @@
 object dlgSelectPrinter: TdlgSelectPrinter
-  Left = 97
+  Left = 228
   Height = 401
-  Top = 36
+  Top = 43
   Width = 552
   HorzScrollBar.Page = 551
   VertScrollBar.Page = 400
@@ -13,17 +13,17 @@ object dlgSelectPrinter: TdlgSelectPrinter
   OnShow = dlgSelectPrinterSHOW
   object labCUPS: TLabel
     Left = 8
-    Height = 13
+    Height = 14
     Top = 152
-    Width = 212
+    Width = 180
     Caption = 'CUPS (Common Unix Printing System)'
     ParentColor = False
   end
   object labCUPSServer: TLabel
-    Left = 240
-    Height = 13
+    Left = 264
+    Height = 14
     Top = 152
-    Width = 88
+    Width = 73
     Caption = 'labCUPSServer'
     ParentColor = False
   end
@@ -33,91 +33,91 @@ object dlgSelectPrinter: TdlgSelectPrinter
     Top = 8
     Width = 536
     Caption = ' Printer '
-    ClientHeight = 119
+    ClientHeight = 118
     ClientWidth = 532
     ParentCtl3D = False
     TabOrder = 0
     object ImgPrn: TImage
-      Left = 124
+      Left = 110
       Height = 19
       Top = 7
       Width = 17
     end
     object Label1: TLabel
       Left = 19
-      Height = 13
+      Height = 14
       Top = 9
-      Width = 33
+      Width = 28
       Caption = 'Name'
       ParentColor = False
     end
     object Label2: TLabel
       Left = 17
-      Height = 13
+      Height = 14
       Top = 36
-      Width = 29
+      Width = 27
       Caption = 'State'
       ParentColor = False
     end
     object Label3: TLabel
       Left = 18
-      Height = 13
+      Height = 14
       Top = 64
-      Width = 49
+      Width = 41
       Caption = 'Location'
       ParentColor = False
     end
     object Label4: TLabel
       Left = 17
-      Height = 13
+      Height = 14
       Top = 92
-      Width = 64
+      Width = 54
       Caption = 'Description'
       ParentColor = False
     end
     object labState: TLabel
       Left = 128
-      Height = 13
+      Height = 14
       Top = 40
-      Width = 46
+      Width = 41
       Caption = 'labState'
       ParentColor = False
     end
     object labLocation: TLabel
       Left = 128
-      Height = 13
+      Height = 14
       Top = 66
-      Width = 66
+      Width = 55
       Caption = 'labLocation'
       ParentColor = False
     end
     object labComment: TLabel
       Left = 126
-      Height = 13
+      Height = 14
       Top = 92
-      Width = 69
+      Width = 60
       Caption = 'labComment'
       ParentColor = False
     end
     object cbPrinters: TComboBox
-      Left = 142
-      Height = 22
+      Left = 126
+      Height = 21
       Top = 6
       Width = 280
       AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+      ItemHeight = 13
       MaxLength = 0
       OnChange = cbPrintersCHANGE
       OnKeyPress = cbPrintersKEYPRESS
       ParentCtl3D = False
       Style = csDropDownList
       TabOrder = 0
-      Text = 'cbPrinters'
     end
     object btnProp: TButton
-      Left = 430
+      Left = 422
       Height = 25
       Top = 4
-      Width = 92
+      Width = 100
       BorderSpacing.InnerBorder = 4
       Caption = 'Properties ...'
       OnClick = btnPropCLICK
@@ -125,9 +125,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
     end
     object cbPrintToFile: TCheckBox
       Left = 422
-      Height = 20
+      Height = 13
       Top = 89
-      Width = 83
+      Width = 69
       Caption = 'Print to file'
       TabOrder = 2
     end
@@ -141,15 +141,15 @@ object dlgSelectPrinter: TdlgSelectPrinter
     TabOrder = 1
     object pgCopies: TPage
       Caption = 'Copies'
-      ClientWidth = 533
-      ClientHeight = 162
+      ClientWidth = 529
+      ClientHeight = 166
       object gbPages: TGroupBox
         Left = 8
         Height = 156
         Top = 7
         Width = 262
         Caption = ' Select pages '
-        ClientHeight = 139
+        ClientHeight = 138
         ClientWidth = 258
         ParentCtl3D = False
         TabOrder = 0
@@ -163,9 +163,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object labPage: TLabel
           Left = 14
-          Height = 13
-          Top = 116
-          Width = 36
+          Height = 14
+          Top = 111
+          Width = 30
           Caption = 'Pages'
           ParentColor = False
         end
@@ -178,10 +178,11 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object edPageSet: TComboBox
           Left = 130
-          Height = 25
+          Height = 21
           Top = 108
           Width = 118
           AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+          ItemHeight = 13
           ItemIndex = 0
           Items.Strings = (
             'All pages'
@@ -196,9 +197,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object rbCurrentPage: TRadioButton
           Left = 14
-          Height = 20
+          Height = 13
           Top = 21
-          Width = 97
+          Width = 81
           AllowGrayed = True
           Caption = 'Current page'
           DragCursor = crDefault
@@ -207,9 +208,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object rbRange: TRadioButton
           Left = 14
-          Height = 20
+          Height = 13
           Top = 68
-          Width = 60
+          Width = 52
           AllowGrayed = True
           Caption = 'Range'
           DragCursor = crDefault
@@ -217,8 +218,8 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object rbAllPage: TRadioButton
           Left = 14
-          Height = 20
-          Width = 43
+          Height = 13
+          Width = 34
           AllowGrayed = True
           Caption = 'All '
           Checked = True
@@ -228,9 +229,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object rbSelection: TRadioButton
           Left = 14
-          Height = 20
+          Height = 13
           Top = 45
-          Width = 76
+          Width = 64
           AllowGrayed = True
           Caption = 'Selection'
           DragCursor = crDefault
@@ -244,7 +245,7 @@ object dlgSelectPrinter: TdlgSelectPrinter
         Top = 7
         Width = 257
         Caption = ' Copies '
-        ClientHeight = 138
+        ClientHeight = 137
         ClientWidth = 253
         ParentCtl3D = False
         TabOrder = 1
@@ -258,9 +259,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object lanNumCopies: TLabel
           Left = 6
-          Height = 13
-          Top = 8
-          Width = 99
+          Height = 14
+          Top = 6
+          Width = 84
           Caption = 'Number of copies'
           ParentColor = False
         end
@@ -273,9 +274,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object cbCollate: TCheckBox
           Left = 119
-          Height = 20
+          Height = 13
           Top = 32
-          Width = 63
+          Width = 52
           AllowGrayed = True
           Caption = 'Collate'
           DragCursor = crDefault
@@ -284,9 +285,9 @@ object dlgSelectPrinter: TdlgSelectPrinter
         end
         object cbReverse: TCheckBox
           Left = 119
-          Height = 20
+          Height = 13
           Top = 60
-          Width = 70
+          Width = 60
           AllowGrayed = True
           Caption = 'Reverse'
           DragCursor = crDefault
@@ -297,8 +298,8 @@ object dlgSelectPrinter: TdlgSelectPrinter
     end
     object pgAdvance: TPage
       Caption = 'Advanced'
-      ClientWidth = 537
-      ClientHeight = 192
+      ClientWidth = 529
+      ClientHeight = 166
       object labTask: TLabel
         Left = 7
         Height = 13
@@ -321,6 +322,7 @@ object dlgSelectPrinter: TdlgSelectPrinter
         Top = 7
         Width = 200
         AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+        ItemHeight = 13
         ItemIndex = 0
         Items.Strings = (
           'Immediate'
diff --git a/components/printers/unix/udlgselectprinter.lrs b/components/printers/unix/udlgselectprinter.lrs
index c5edd9f019..53e6c0f7de 100644
--- a/components/printers/unix/udlgselectprinter.lrs
+++ b/components/printers/unix/udlgselectprinter.lrs
@@ -1,108 +1,108 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TdlgSelectPrinter','FORMDATA',[
-  'TPF0'#17'TdlgSelectPrinter'#16'dlgSelectPrinter'#4'Left'#2'a'#6'Height'#3#145
-  +#1#3'Top'#2'$'#5'Width'#3'('#2#18'HorzScrollBar.Page'#3''''#2#18'VertScrollB'
-  +'ar.Page'#3#144#1#13'ActiveControl'#7#10'cbPrinters'#7'Caption'#6#8'Printing'
-  +#12'ClientHeight'#3#145#1#11'ClientWidth'#3'('#2#8'OnCreate'#7#22'dlgSelectP'
-  +'rinterCREATE'#6'OnShow'#7#20'dlgSelectPrinterSHOW'#0#6'TLabel'#7'labCUPS'#4
-  +'Left'#2#8#6'Height'#2#13#3'Top'#3#152#0#5'Width'#3#212#0#7'Caption'#6'"CUPS'
-  +' (Common Unix Printing System)'#11'ParentColor'#8#0#0#6'TLabel'#13'labCUPSS'
-  +'erver'#4'Left'#3#240#0#6'Height'#2#13#3'Top'#3#152#0#5'Width'#2'X'#7'Captio'
-  +'n'#6#13'labCUPSServer'#11'ParentColor'#8#0#0#9'TGroupBox'#9'Groupbox1'#4'Le'
-  +'ft'#2#8#6'Height'#3#136#0#3'Top'#2#8#5'Width'#3#24#2#7'Caption'#6#9' Printe'
-  +'r '#12'ClientHeight'#2'w'#11'ClientWidth'#3#20#2#11'ParentCtl3D'#8#8'TabOrd'
-  +'er'#2#0#0#6'TImage'#6'ImgPrn'#4'Left'#2'|'#6'Height'#2#19#3'Top'#2#7#5'Widt'
-  +'h'#2#17#0#0#6'TLabel'#6'Label1'#4'Left'#2#19#6'Height'#2#13#3'Top'#2#9#5'Wi'
-  +'dth'#2'!'#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4
-  +'Left'#2#17#6'Height'#2#13#3'Top'#2'$'#5'Width'#2#29#7'Caption'#6#5'State'#11
-  +'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#2#18#6'Height'#2#13#3'Top'#2
-  +'@'#5'Width'#2'1'#7'Caption'#6#8'Location'#11'ParentColor'#8#0#0#6'TLabel'#6
-  +'Label4'#4'Left'#2#17#6'Height'#2#13#3'Top'#2'\'#5'Width'#2'@'#7'Caption'#6
+  'TPF0'#17'TdlgSelectPrinter'#16'dlgSelectPrinter'#4'Left'#3#228#0#6'Height'#3
+  +#145#1#3'Top'#2'+'#5'Width'#3'('#2#18'HorzScrollBar.Page'#3''''#2#18'VertScr'
+  +'ollBar.Page'#3#144#1#13'ActiveControl'#7#10'cbPrinters'#7'Caption'#6#8'Prin'
+  +'ting'#12'ClientHeight'#3#145#1#11'ClientWidth'#3'('#2#8'OnCreate'#7#22'dlgS'
+  +'electPrinterCREATE'#6'OnShow'#7#20'dlgSelectPrinterSHOW'#0#6'TLabel'#7'labC'
+  +'UPS'#4'Left'#2#8#6'Height'#2#14#3'Top'#3#152#0#5'Width'#3#180#0#7'Caption'#6
+  +'"CUPS (Common Unix Printing System)'#11'ParentColor'#8#0#0#6'TLabel'#13'lab'
+  +'CUPSServer'#4'Left'#3#8#1#6'Height'#2#14#3'Top'#3#152#0#5'Width'#2'I'#7'Cap'
+  +'tion'#6#13'labCUPSServer'#11'ParentColor'#8#0#0#9'TGroupBox'#9'Groupbox1'#4
+  +'Left'#2#8#6'Height'#3#136#0#3'Top'#2#8#5'Width'#3#24#2#7'Caption'#6#9' Prin'
+  +'ter '#12'ClientHeight'#2'v'#11'ClientWidth'#3#20#2#11'ParentCtl3D'#8#8'TabO'
+  +'rder'#2#0#0#6'TImage'#6'ImgPrn'#4'Left'#2'n'#6'Height'#2#19#3'Top'#2#7#5'Wi'
+  +'dth'#2#17#0#0#6'TLabel'#6'Label1'#4'Left'#2#19#6'Height'#2#14#3'Top'#2#9#5
+  +'Width'#2#28#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4
+  +'Left'#2#17#6'Height'#2#14#3'Top'#2'$'#5'Width'#2#27#7'Caption'#6#5'State'#11
+  +'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#2#18#6'Height'#2#14#3'Top'#2
+  +'@'#5'Width'#2')'#7'Caption'#6#8'Location'#11'ParentColor'#8#0#0#6'TLabel'#6
+  +'Label4'#4'Left'#2#17#6'Height'#2#14#3'Top'#2'\'#5'Width'#2'6'#7'Caption'#6
   +#11'Description'#11'ParentColor'#8#0#0#6'TLabel'#8'labState'#4'Left'#3#128#0
-  +#6'Height'#2#13#3'Top'#2'('#5'Width'#2'.'#7'Caption'#6#8'labState'#11'Parent'
-  +'Color'#8#0#0#6'TLabel'#11'labLocation'#4'Left'#3#128#0#6'Height'#2#13#3'Top'
-  +#2'B'#5'Width'#2'B'#7'Caption'#6#11'labLocation'#11'ParentColor'#8#0#0#6'TLa'
-  +'bel'#10'labComment'#4'Left'#2'~'#6'Height'#2#13#3'Top'#2'\'#5'Width'#2'E'#7
+  +#6'Height'#2#14#3'Top'#2'('#5'Width'#2')'#7'Caption'#6#8'labState'#11'Parent'
+  +'Color'#8#0#0#6'TLabel'#11'labLocation'#4'Left'#3#128#0#6'Height'#2#14#3'Top'
+  +#2'B'#5'Width'#2'7'#7'Caption'#6#11'labLocation'#11'ParentColor'#8#0#0#6'TLa'
+  +'bel'#10'labComment'#4'Left'#2'~'#6'Height'#2#14#3'Top'#2'\'#5'Width'#2'<'#7
   +'Caption'#6#10'labComment'#11'ParentColor'#8#0#0#9'TComboBox'#10'cbPrinters'
-  +#4'Left'#3#142#0#6'Height'#2#22#3'Top'#2#6#5'Width'#3#24#1#16'AutoCompleteTe'
-  +'xt'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2
-  +#0#8'OnChange'#7#16'cbPrintersCHANGE'#10'OnKeyPress'#7#18'cbPrintersKEYPRESS'
-  +#11'ParentCtl3D'#8#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#4'Text'#6#10
-  +'cbPrinters'#0#0#7'TButton'#7'btnProp'#4'Left'#3#174#1#6'Height'#2#25#3'Top'
-  +#2#4#5'Width'#2'\'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#14'Propert'
-  +'ies ...'#7'OnClick'#7#12'btnPropCLICK'#8'TabOrder'#2#1#0#0#9'TCheckBox'#13
-  +'cbPrintToFile'#4'Left'#3#166#1#6'Height'#2#20#3'Top'#2'Y'#5'Width'#2'S'#7'C'
-  +'aption'#6#13'Print to file'#8'TabOrder'#2#2#0#0#0#9'TNotebook'#6'NbOpts'#4
-  +'Left'#2#8#6'Height'#3#192#0#3'Top'#3#168#0#5'Width'#3#25#2#9'PageIndex'#2#0
-  +#8'TabOrder'#2#1#0#5'TPage'#8'pgCopies'#7'Caption'#6#6'Copies'#11'ClientWidt'
-  +'h'#3#21#2#12'ClientHeight'#3#162#0#0#9'TGroupBox'#7'gbPages'#4'Left'#2#8#6
-  +'Height'#3#156#0#3'Top'#2#7#5'Width'#3#6#1#7'Caption'#6#14' Select pages '#12
-  +'ClientHeight'#3#139#0#11'ClientWidth'#3#2#1#11'ParentCtl3D'#8#8'TabOrder'#2
-  +#0#0#6'TBevel'#6'Bevel1'#4'Left'#2#18#6'Height'#2#3#3'Top'#2'd'#5'Width'#3
-  +#230#0#5'Shape'#7#9'bsTopLine'#5'Style'#7#8'bsRaised'#0#0#6'TLabel'#7'labPag'
-  +'e'#4'Left'#2#14#6'Height'#2#13#3'Top'#2't'#5'Width'#2'$'#7'Caption'#6#5'Pag'
-  +'es'#11'ParentColor'#8#0#0#5'TEdit'#7'edRange'#4'Left'#2'\'#6'Height'#2#23#3
-  +'Top'#2'F'#5'Width'#3#154#0#8'TabOrder'#2#0#0#0#9'TComboBox'#9'edPageSet'#4
-  +'Left'#3#130#0#6'Height'#2#25#3'Top'#2'l'#5'Width'#2'v'#16'AutoCompleteText'
-  +#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'ItemIndex'#2#0#13
+  +#4'Left'#2'~'#6'Height'#2#21#3'Top'#2#6#5'Width'#3#24#1#16'AutoCompleteText'
+  +#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13
+  +#9'MaxLength'#2#0#8'OnChange'#7#16'cbPrintersCHANGE'#10'OnKeyPress'#7#18'cbP'
+  +'rintersKEYPRESS'#11'ParentCtl3D'#8#5'Style'#7#14'csDropDownList'#8'TabOrder'
+  +#2#0#0#0#7'TButton'#7'btnProp'#4'Left'#3#166#1#6'Height'#2#25#3'Top'#2#4#5'W'
+  +'idth'#2'd'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#14'Properties ...'
+  +#7'OnClick'#7#12'btnPropCLICK'#8'TabOrder'#2#1#0#0#9'TCheckBox'#13'cbPrintTo'
+  +'File'#4'Left'#3#166#1#6'Height'#2#13#3'Top'#2'Y'#5'Width'#2'E'#7'Caption'#6
+  +#13'Print to file'#8'TabOrder'#2#2#0#0#0#9'TNotebook'#6'NbOpts'#4'Left'#2#8#6
+  +'Height'#3#192#0#3'Top'#3#168#0#5'Width'#3#25#2#9'PageIndex'#2#0#8'TabOrder'
+  +#2#1#0#5'TPage'#8'pgCopies'#7'Caption'#6#6'Copies'#11'ClientWidth'#3#17#2#12
+  +'ClientHeight'#3#166#0#0#9'TGroupBox'#7'gbPages'#4'Left'#2#8#6'Height'#3#156
+  +#0#3'Top'#2#7#5'Width'#3#6#1#7'Caption'#6#14' Select pages '#12'ClientHeight'
+  +#3#138#0#11'ClientWidth'#3#2#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#6'TBevel'
+  +#6'Bevel1'#4'Left'#2#18#6'Height'#2#3#3'Top'#2'd'#5'Width'#3#230#0#5'Shape'#7
+  +#9'bsTopLine'#5'Style'#7#8'bsRaised'#0#0#6'TLabel'#7'labPage'#4'Left'#2#14#6
+  +'Height'#2#14#3'Top'#2'o'#5'Width'#2#30#7'Caption'#6#5'Pages'#11'ParentColor'
+  +#8#0#0#5'TEdit'#7'edRange'#4'Left'#2'\'#6'Height'#2#23#3'Top'#2'F'#5'Width'#3
+  +#154#0#8'TabOrder'#2#0#0#0#9'TComboBox'#9'edPageSet'#4'Left'#3#130#0#6'Heigh'
+  +'t'#2#21#3'Top'#2'l'#5'Width'#2'v'#16'AutoCompleteText'#11#22'cbactEndOfLine'
+  +'Complete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'ItemIndex'#2#0#13
   +'Items.Strings'#1#6#9'All pages'#6#9'Odd pages'#6#10'Even pages'#0#9'MaxLeng'
   +'th'#2#0#11'ParentCtl3D'#8#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1#4'T'
   +'ext'#6#9'All pages'#0#0#12'TRadioButton'#13'rbCurrentPage'#4'Left'#2#14#6'H'
-  +'eight'#2#20#3'Top'#2#21#5'Width'#2'a'#11'AllowGrayed'#9#7'Caption'#6#12'Cur'
+  +'eight'#2#13#3'Top'#2#21#5'Width'#2'Q'#11'AllowGrayed'#9#7'Caption'#6#12'Cur'
   +'rent page'#10'DragCursor'#7#9'crDefault'#7'Enabled'#8#8'TabOrder'#2#2#0#0#12
-  +'TRadioButton'#7'rbRange'#4'Left'#2#14#6'Height'#2#20#3'Top'#2'D'#5'Width'#2
-  +'<'#11'AllowGrayed'#9#7'Caption'#6#5'Range'#10'DragCursor'#7#9'crDefault'#8
-  +'TabOrder'#2#4#0#0#12'TRadioButton'#9'rbAllPage'#4'Left'#2#14#6'Height'#2#20
-  +#5'Width'#2'+'#11'AllowGrayed'#9#7'Caption'#6#4'All '#7'Checked'#9#10'DragCu'
+  +'TRadioButton'#7'rbRange'#4'Left'#2#14#6'Height'#2#13#3'Top'#2'D'#5'Width'#2
+  +'4'#11'AllowGrayed'#9#7'Caption'#6#5'Range'#10'DragCursor'#7#9'crDefault'#8
+  +'TabOrder'#2#4#0#0#12'TRadioButton'#9'rbAllPage'#4'Left'#2#14#6'Height'#2#13
+  +#5'Width'#2'"'#11'AllowGrayed'#9#7'Caption'#6#4'All '#7'Checked'#9#10'DragCu'
   +'rsor'#7#9'crDefault'#5'State'#7#9'cbChecked'#8'TabOrder'#2#3#0#0#12'TRadioB'
-  +'utton'#11'rbSelection'#4'Left'#2#14#6'Height'#2#20#3'Top'#2'-'#5'Width'#2'L'
+  +'utton'#11'rbSelection'#4'Left'#2#14#6'Height'#2#13#3'Top'#2'-'#5'Width'#2'@'
   +#11'AllowGrayed'#9#7'Caption'#6#9'Selection'#10'DragCursor'#7#9'crDefault'#7
   +'Enabled'#8#8'TabOrder'#2#5#0#0#0#9'TGroupBox'#8'gbCopies'#4'Left'#3#23#1#6
   +'Height'#3#155#0#3'Top'#2#7#5'Width'#3#1#1#7'Caption'#6#8' Copies '#12'Clien'
-  +'tHeight'#3#138#0#11'ClientWidth'#3#253#0#11'ParentCtl3D'#8#8'TabOrder'#2#1#0
+  +'tHeight'#3#137#0#11'ClientWidth'#3#253#0#11'ParentCtl3D'#8#8'TabOrder'#2#1#0
   +#6'TImage'#10'imgCollate'#4'Left'#2#6#6'Height'#2'%'#3'Top'#2' '#5'Width'#2
   +']'#8'AutoSize'#9#12'Proportional'#9#0#0#6'TLabel'#12'lanNumCopies'#4'Left'#2
-  +#6#6'Height'#2#13#3'Top'#2#8#5'Width'#2'c'#7'Caption'#6#16'Number of copies'
+  +#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'T'#7'Caption'#6#16'Number of copies'
   +#11'ParentColor'#8#0#0#9'TSpinEdit'#8'edCopies'#4'Left'#3#134#0#6'Height'#2
   ,#20#3'Top'#2#3#5'Width'#2'2'#8'TabOrder'#2#0#0#0#9'TCheckBox'#9'cbCollate'#4
-  +'Left'#2'w'#6'Height'#2#20#3'Top'#2' '#5'Width'#2'?'#11'AllowGrayed'#9#7'Cap'
+  +'Left'#2'w'#6'Height'#2#13#3'Top'#2' '#5'Width'#2'4'#11'AllowGrayed'#9#7'Cap'
   +'tion'#6#7'Collate'#10'DragCursor'#7#9'crDefault'#7'OnClick'#7#14'cbReverseC'
   +'LICK'#8'TabOrder'#2#2#0#0#9'TCheckBox'#9'cbReverse'#4'Left'#2'w'#6'Height'#2
-  +#20#3'Top'#2'<'#5'Width'#2'F'#11'AllowGrayed'#9#7'Caption'#6#7'Reverse'#10'D'
+  +#13#3'Top'#2'<'#5'Width'#2'<'#11'AllowGrayed'#9#7'Caption'#6#7'Reverse'#10'D'
   +'ragCursor'#7#9'crDefault'#7'OnClick'#7#14'cbReverseCLICK'#8'TabOrder'#2#1#0
-  +#0#0#0#5'TPage'#9'pgAdvance'#7'Caption'#6#8'Advanced'#11'ClientWidth'#3#25#2
-  +#12'ClientHeight'#3#192#0#0#6'TLabel'#7'labTask'#4'Left'#2#7#6'Height'#2#13#3
+  +#0#0#0#5'TPage'#9'pgAdvance'#7'Caption'#6#8'Advanced'#11'ClientWidth'#3#17#2
+  +#12'ClientHeight'#3#166#0#0#6'TLabel'#7'labTask'#4'Left'#2#7#6'Height'#2#13#3
   +'Top'#2#10#5'Width'#2'J'#7'Caption'#6#12'Delayed task'#11'ParentColor'#8#0#0
   +#6'TLabel'#6'Label5'#4'Left'#2#7#6'Height'#2#13#3'Top'#2'-'#5'Width'#2'('#7
   +'Caption'#6#8'Priority'#11'ParentColor'#8#0#0#9'TComboBox'#10'cbTasktime'#4
   +'Left'#3#215#0#6'Height'#2#25#3'Top'#2#7#5'Width'#3#200#0#16'AutoCompleteTex'
-  +'t'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'ItemIndex'#2#0
-  +#13'Items.Strings'#1#6#9'Immediate'#6#18'Never (suspending)'#6#14'during the'
-  +' day'#6#7'evening'#6#5'night'#6#7'Weekend'#6#23'After close of business'#6
-  +#14'After midnight'#6#7'At time'#0#9'MaxLength'#2#0#8'OnChange'#7#16'cbTaskt'
-  +'imeCHANGE'#10'OnKeyPress'#7#18'cbPrintersKEYPRESS'#11'ParentCtl3D'#8#5'Styl'
-  +'e'#7#14'csDropDownList'#8'TabOrder'#2#1#4'Text'#6#9'Immediate'#0#0#5'TEdit'
-  +#10'edTimeTask'#4'Left'#3#173#1#6'Height'#2#23#3'Top'#2#9#5'Width'#2':'#10'D'
-  +'ragCursor'#7#9'crDefault'#9'MaxLength'#2#8#8'TabOrder'#2#0#4'Text'#6#8'23:0'
-  +'0:00'#0#0#9'TSpinEdit'#10'edPriority'#4'Left'#2''#6'Height'#2#20#3'Top'#2
-  +'*'#5'Width'#2'2'#8'TabOrder'#2#3#0#0#9'TTrackBar'#11'tkbPriority'#4'Left'#3
-  +#192#0#6'Height'#2#20#3'Top'#2'1'#5'Width'#3'O'#1#9'Frequency'#2#10#3'Max'#2
-  +'d'#8'OnChange'#7#17'tkbPriorityCHANGE'#8'Position'#2#10#8'ScalePos'#7#5'trT'
-  +'op'#7'TabStop'#8#9'TickMarks'#7#6'tmBoth'#10'DragCursor'#7#9'crDefault'#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#6'Panel1'#6'Height'#2')'#3
-  +'Top'#3'h'#1#5'Width'#3'('#2#5'Align'#7#8'alBottom'#7'Anchors'#11#6'akLeft'#8
-  +'akBottom'#0#12'ClientHeight'#2')'#11'ClientWidth'#3'('#2#11'FullRepaint'#8#8
-  +'TabOrder'#2#2#7'TabStop'#9#0#7'TButton'#9'btnCancel'#4'Left'#3#191#1#6'Heig'
-  +'ht'#2#25#3'Top'#2#8#5'Width'#2'['#7'Anchors'#11#5'akTop'#7'akRight'#0#25'Bo'
-  +'rderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalRes'
-  +'ult'#2#2#8'TabOrder'#2#0#0#0#7'TButton'#8'btnPrint'#4'Left'#3'W'#1#6'Height'
-  +#2#25#3'Top'#2#8#5'Width'#2'c'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'Border'
-  +'Spacing.InnerBorder'#2#4#7'Caption'#6#5'Print'#7'Default'#9#11'ModalResult'
-  +#2#1#7'OnClick'#7#13'btnPrintCLICK'#8'TabOrder'#2#1#0#0#7'TButton'#8'btnRedu'
-  +'c'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'X'#25'BorderSpacing.Inn'
-  +'erBorder'#2#4#7'Caption'#6#8'More ...'#7'OnClick'#7#13'btnReducCLICK'#8'Tab'
-  +'Order'#2#2#0#0#7'TButton'#10'btnPreview'#4'Left'#3#208#0#6'Height'#2#25#3'T'
-  +'op'#2#8#5'Width'#2'{'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'Prev'
-  +'iew'#11'ModalResult'#2#6#8'TabOrder'#2#3#0#0#0#0
+  +'t'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2
+  +#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#9'Immediate'#6#18'Never (suspendi'
+  +'ng)'#6#14'during the day'#6#7'evening'#6#5'night'#6#7'Weekend'#6#23'After c'
+  +'lose of business'#6#14'After midnight'#6#7'At time'#0#9'MaxLength'#2#0#8'On'
+  +'Change'#7#16'cbTasktimeCHANGE'#10'OnKeyPress'#7#18'cbPrintersKEYPRESS'#11'P'
+  +'arentCtl3D'#8#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#1#4'Text'#6#9'Imm'
+  +'ediate'#0#0#5'TEdit'#10'edTimeTask'#4'Left'#3#173#1#6'Height'#2#23#3'Top'#2
+  +#9#5'Width'#2':'#10'DragCursor'#7#9'crDefault'#9'MaxLength'#2#8#8'TabOrder'#2
+  +#0#4'Text'#6#8'23:00:00'#0#0#9'TSpinEdit'#10'edPriority'#4'Left'#2''#6'Heig'
+  +'ht'#2#20#3'Top'#2'*'#5'Width'#2'2'#8'TabOrder'#2#3#0#0#9'TTrackBar'#11'tkbP'
+  +'riority'#4'Left'#3#192#0#6'Height'#2#20#3'Top'#2'1'#5'Width'#3'O'#1#9'Frequ'
+  +'ency'#2#10#3'Max'#2'd'#8'OnChange'#7#17'tkbPriorityCHANGE'#8'Position'#2#10
+  +#8'ScalePos'#7#5'trTop'#7'TabStop'#8#9'TickMarks'#7#6'tmBoth'#10'DragCursor'
+  +#7#9'crDefault'#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#6'Panel1'
+  +#6'Height'#2')'#3'Top'#3'h'#1#5'Width'#3'('#2#5'Align'#7#8'alBottom'#7'Ancho'
+  +'rs'#11#6'akLeft'#8'akBottom'#0#12'ClientHeight'#2')'#11'ClientWidth'#3'('#2
+  +#11'FullRepaint'#8#8'TabOrder'#2#2#7'TabStop'#9#0#7'TButton'#9'btnCancel'#4
+  +'Left'#3#191#1#6'Height'#2#25#3'Top'#2#8#5'Width'#2'['#7'Anchors'#11#5'akTop'
+  +#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'C'
+  +'ancel'#11'ModalResult'#2#2#8'TabOrder'#2#0#0#0#7'TButton'#8'btnPrint'#4'Lef'
+  +'t'#3'W'#1#6'Height'#2#25#3'Top'#2#8#5'Width'#2'c'#7'Anchors'#11#5'akTop'#7
+  +'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#5'Print'#7'Defaul'
+  +'t'#9#11'ModalResult'#2#1#7'OnClick'#7#13'btnPrintCLICK'#8'TabOrder'#2#1#0#0
+  +#7'TButton'#8'btnReduc'#4'Left'#2#8#6'Height'#2#25#3'Top'#2#8#5'Width'#2'X'
+  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#8'More ...'#7'OnClick'#7#13
+  +'btnReducCLICK'#8'TabOrder'#2#2#0#0#7'TButton'#10'btnPreview'#4'Left'#3#208#0
+  +#6'Height'#2#25#3'Top'#2#8#5'Width'#2'{'#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#7'Preview'#11'ModalResult'#2#6#8'TabOrder'#2#3#0#0#0#0
 ]);
diff --git a/components/printers/unix/udlgselectprinter.pp b/components/printers/unix/udlgselectprinter.pp
index 01ea93ebef..d02e960d2d 100644
--- a/components/printers/unix/udlgselectprinter.pp
+++ b/components/printers/unix/udlgselectprinter.pp
@@ -41,7 +41,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, ExtCtrls, Spin, ComCtrls, LCLType,
+  Buttons, ExtCtrls, Spin, ComCtrls, LCLType, InterfaceBase,
   Printers, OsPrinters, CUPSDyn;
 
 type
@@ -177,6 +177,12 @@ begin
   //Set Height of form
   btnReduc.Tag:=1;
   btnReducCLICK(nil);
+  if WidgetSet.LCLPlatform = lpCarbon then
+    begin  //Can't hide tabs with button on Carbon, so just expand dialog.
+    btnReduc.Tag:=0;
+    btnReducCLICK(nil);
+    btnReduc.Visible:=False;
+    end;
 end;