--- a/AbstractSettingsApplication.st Thu Dec 12 13:37:29 2002 +0100
+++ b/AbstractSettingsApplication.st Thu Dec 12 14:00:32 2002 +0100
@@ -127,8 +127,8 @@
instanceVariableNames:'modifiedChannel selectedUnit supportsColor topMargin rightMargin
bottomMargin landscape pageFormatList pageFormat unitList
leftMargin possiblePrinters printerType printerTypeSelection
- printCommandSelection printCommandList commandList printCommand
- enableFormat enablelandscape enableMargins enableColorBox'
+ printCommandList commandList printCommand enableFormat
+ enablelandscape enableMargins enableColorBox'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -6343,6 +6343,7 @@
#name: 'CommandComboBox'
#layout: #(#LayoutFrame 150 0 45 0 -5 1 67 0)
#model: #printCommand
+ #acceptOnLostFocus: true
#acceptOnPointerLeave: false
#comboList: #printCommandList
#useIndex: false
@@ -6376,7 +6377,6 @@
#model: #pageFormat
#enableChannel: #enableFormat
#menu: #pageFormatList
- #useIndex: true
)
#(#CheckBoxSpec
#label: 'Landscape'
@@ -6427,10 +6427,10 @@
#layout: #(#LayoutFrame 150 0 0 0 250 0 21 0)
#enableChannel: #enableMargins
#model: #topMargin
+ #type: #numberOrNil
#acceptOnReturn: true
#acceptOnTab: true
#acceptOnLostFocus: true
- #converter: #PrintConverter
#acceptOnPointerLeave: false
)
#(#PopUpListSpec
@@ -6464,10 +6464,10 @@
#layout: #(#LayoutFrame 150 0 0 0 250 0 21 0)
#enableChannel: #enableMargins
#model: #leftMargin
+ #type: #numberOrNil
#acceptOnReturn: true
#acceptOnTab: true
#acceptOnLostFocus: true
- #converter: #PrintConverter
#acceptOnPointerLeave: false
)
)
@@ -6492,10 +6492,10 @@
#layout: #(#LayoutFrame 150 0 0 0 250 0 21 0)
#enableChannel: #enableMargins
#model: #rightMargin
+ #type: #numberOrNil
#acceptOnReturn: true
#acceptOnTab: true
#acceptOnLostFocus: true
- #converter: #PrintConverter
#acceptOnPointerLeave: false
)
)
@@ -6520,10 +6520,10 @@
#layout: #(#LayoutFrame 150 0 0 0 250 0 21 0)
#enableChannel: #enableMargins
#model: #bottomMargin
+ #type: #numberOrNil
#acceptOnReturn: true
#acceptOnTab: true
#acceptOnLostFocus: true
- #converter: #PrintConverter
#acceptOnPointerLeave: false
)
)
@@ -6591,6 +6591,18 @@
loadRequest
+ self bottomMargin value:Printer bottomMargin.
+ self landscape value:Printer landscape.
+ self leftMargin value:Printer leftMargin.
+ self rightMargin value:Printer rightMargin.
+ self topMargin value:Printer topMargin.
+ self printCommand value:Printer printCommand.
+ self printerTypeSelection value:(possiblePrinters identityIndexOf:Printer).
+ self supportsColor value:Printer supportsColor.
+ self pageFormatList notEmpty ifTrue:[
+ self pageFormat value:Printer pageFormat.
+ ].
+ self printerTypeSelectionOrUnitListChanged.
self modifiedChannel value:false.
!
@@ -6616,7 +6628,7 @@
Printer printCommand:self printCommand value.
Printer supportsPageSizes ifTrue:[
- Printer pageFormat:(self pageFormatList at:self pageFormat value).
+ Printer pageFormat:(self pageFormat value).
Printer landscape:(self landscape value).
].
Printer supportsMargins ifTrue:[
@@ -6626,10 +6638,10 @@
] ifFalse:[
unit := #inch
].
- Printer topMargin:(UnitConverter convert:self topMargin value from:unit to:#inch).
- Printer leftMargin:(UnitConverter convert:leftMargin value from:unit to:#inch).
- Printer rightMargin:(UnitConverter convert:rightMargin value from:unit to:#inch).
- Printer bottomMargin:(UnitConverter convert:bottomMargin value from:unit to:#inch).
+ Printer topMargin:(UnitConverter convert:(self topMargin value) from:unit to:#inch).
+ Printer leftMargin:(UnitConverter convert:(self leftMargin value) from:unit to:#inch).
+ Printer rightMargin:(UnitConverter convert:(self rightMargin value) from:unit to:#inch).
+ Printer bottomMargin:(UnitConverter convert:(self bottomMargin value) from:unit to:#inch).
].
Printer supportsPostscript ifTrue:[
Printer supportsColor:self supportsColor value.
@@ -6732,12 +6744,6 @@
!
printCommand
- "automatically generated by UIPainter ..."
-
- "*** the code below creates a default model when invoked."
- "*** (which may not be the one you wanted)"
- "*** Please change as required and accept it in the browser."
- "*** (and replace this comment by something more useful ;-)"
printCommand isNil ifTrue:[
printCommand := Printer printCommand asValue.
@@ -6826,8 +6832,8 @@
printerTypeSelectionChanged
| p hasPageSize hasMargins|
- printerType selectionIndex ~~ 0 ifTrue:[
- p := possiblePrinters at:(printerType selectionIndex).
+ self printerType selectionIndex ~~ 0 ifTrue:[
+ p := possiblePrinters at:(self printerType selectionIndex).
hasPageSize := p supportsPageSizes.
hasMargins := p supportsMargins.
] ifFalse:[
@@ -6851,7 +6857,6 @@
self enablelandscape value:hasPageSize.
self enableFormat value:hasPageSize.
hasPageSize ifTrue:[
-
self pageFormat value:(p pageFormat).
self landscape value:(p landscape).
] ifFalse:[
@@ -6864,10 +6869,10 @@
unit := #inch
].
- topMargin value:(UnitConverter convert:p topMargin from:#inch to:unit).
- leftMargin value:(UnitConverter convert:p leftMargin from:#inch to:unit).
- rightMargin value:(UnitConverter convert:p rightMargin from:#inch to:unit).
- bottomMargin value:(UnitConverter convert:p bottomMargin from:#inch to:unit).
+ self topMargin value:(UnitConverter convert:p topMargin from:#inch to:unit).
+ self leftMargin value:(UnitConverter convert:p leftMargin from:#inch to:unit).
+ self rightMargin value:(UnitConverter convert:p rightMargin from:#inch to:unit).
+ self bottomMargin value:(UnitConverter convert:p bottomMargin from:#inch to:unit).
] ifFalse:[
].
@@ -6880,7 +6885,6 @@
self printCommandList contents:(newCommandList asList).
self printCommandList changed.
].
-
self printCommand value:(p printCommand).
].
self enableColorBox value:p supportsPostscript.
@@ -6959,14 +6963,14 @@
printer ~= Printer or:[
Printer printCommand ~= self printCommand value or:[
(Printer supportsPageSizes and:[
- Printer pageFormat ~= (self pageFormatList at:self pageFormat value) or:[
+ Printer pageFormat ~= self pageFormat value or:[
Printer landscape ~= (self landscape value) or:[
]]]) or:[
(Printer supportsMargins and:[
- Printer topMargin ~= (UnitConverter convert:self topMargin value from:unit to:#inch) or:[
- Printer leftMargin ~= (UnitConverter convert:leftMargin value from:unit to:#inch) or:[
- Printer rightMargin ~= (UnitConverter convert:rightMargin value from:unit to:#inch) or:[
- Printer bottomMargin ~= (UnitConverter convert:bottomMargin value from:unit to:#inch) or:[
+ Printer topMargin ~= ((UnitConverter convert:(self topMargin value asFloat) from:unit to:#inch) asFloat) or:[
+ Printer leftMargin ~= ((UnitConverter convert:(self leftMargin value asFloat) from:unit to:#inch) asFloat) or:[
+ Printer rightMargin ~= ((UnitConverter convert:(self rightMargin value asFloat) from:unit to:#inch) asFloat) or:[
+ Printer bottomMargin ~= ((UnitConverter convert:(self bottomMargin value asFloat) from:unit to:#inch) asFloat) or:[
]]]]]) or:[
Printer supportsPostscript and:[
Printer supportsColor ~= self supportsColor value
@@ -9143,5 +9147,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.12 2002-12-09 16:59:11 penk Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.13 2002-12-12 13:00:32 penk Exp $'
+! !