#BUGFIX by cg
class: FontPanel
added: #fontFromUserInitial:title:filter:encoding:enabled:withChangeAllOption:
changed:7 methods
fixed changeAll behavior
--- a/FontPanel.st Wed Oct 12 11:16:57 2016 +0200
+++ b/FontPanel.st Wed Oct 12 11:17:20 2016 +0200
@@ -379,6 +379,24 @@
"Modified: 10.4.1997 / 09:53:03 / cg"
!
+fontFromUserInitial:initialFont title:someTitle filter:aFilterBlock encoding:encoding enabled:enabled onChangeAll:actionToChangeAll
+ "open a fontPanel with title and font-filter
+ and return the selected font, or nil if abort is pressed"
+
+ ^ self new
+ fontFromUserInitial:initialFont title:someTitle
+ filter:aFilterBlock encoding:encoding
+ enabled:enabled
+ onChangeAll:actionToChangeAll
+
+ "
+ FontPanel fontFromUserInitial:(Font family:'courier' size:12) title:'select some font'
+ "
+
+ "Created: 27.2.1996 / 00:59:46 / cg"
+ "Modified: 10.4.1997 / 09:53:03 / cg"
+!
+
openOn:aFont
"open a fontPanel showing aFont initially.
This panel is for information only - no font selection is possible."
@@ -1350,6 +1368,7 @@
filter:nil
encoding:nil
enabled:true
+ withChangeAllOption:false
"
FontPanel fontFromUser
@@ -1372,7 +1391,8 @@
filter:nil
encoding:nil
enabled:true
-
+ withChangeAllOption:false
+
"
FontPanel fontFromUserInitial:(Font family:'courier' size:12)
FontPanel fontFromUserInitial:MenuPanel defaultFont
@@ -1389,7 +1409,8 @@
filter:nil
encoding:nil
enabled:true
-
+ withChangeAllOption:false
+
"
FontPanel fontFromUserInitial:(Font family:'courier' size:12) title:'select some font'
"
@@ -1408,7 +1429,8 @@
filter:aFilterBlock
encoding:nil
enabled:true
-
+ withChangeAllOption:false
+
"
FontPanel fontFromUserInitial:(Font family:'courier' size:12) title:'select some font'
"
@@ -1427,7 +1449,8 @@
filter:aFilterBlock
encoding:encoding
enabled:true
-
+ withChangeAllOption:false
+
"
FontPanel fontFromUserInitial:(Font family:'courier' size:12) title:'select some font'
"
@@ -1437,7 +1460,27 @@
"open this fontPanel with title and font-filter
and return the selected font, or nil if abort is pressed"
- |selectedFont|
+ ^ self
+ fontFromUserInitial:initialFont title:someTitle filter:aFilterBlock encoding:encoding enabled:enabled
+ withChangeAllOption:false
+
+ "
+ FontPanel fontFromUserInitial:(Font family:'courier' size:12) title:'select some font'.
+
+ FontPanel new
+ withChangeFontInViewsAllCheckBox:true;
+ fontFromUserInitial:(Font family:'courier' size:12) title:'select some font'
+ "
+
+ "Created: 27.2.1996 / 00:59:46 / cg"
+ "Modified: 10.4.1997 / 09:53:03 / cg"
+!
+
+fontFromUserInitial:initialFont title:someTitle filter:aFilterBlock encoding:encoding enabled:enabled withChangeAllOption:changeAllBoolean
+ "open this fontPanel with title and font-filter
+ and return the selected font, or nil if abort is pressed"
+
+ |selectedFont initialFontsEncoding|
self encodingFilter:aFilterBlock.
someTitle notNil ifTrue:[
@@ -1451,14 +1494,17 @@
self encoding:encoding.
] ifFalse:[
initialFont notNil ifTrue:[
- ((initialFont encoding = #'iso8859-1')
- or:[ (initialFont encoding = #'iso10646-1') ]) ifFalse:[
- self encoding:initialFont encoding
+ initialFontsEncoding := initialFont encoding.
+ ((initialFontsEncoding = #'iso8859-1')
+ or:[ (initialFontsEncoding = #'iso10646-1') ]) ifFalse:[
+ self encoding:initialFontsEncoding
].
].
].
self enabled:enabled.
+ self withChangeFontInAllViewsCheckBoxVisibleHolder value:changeAllBoolean.
self showAtPointer.
+
self destroy.
^ selectedFont