checkin from browser
authorClaus Gittinger <cg@exept.de>
Fri, 18 Sep 1998 15:55:06 +0200
changeset 1892 47f737ca330d
parent 1891 027595da57a1
child 1893 1d91f4092152
checkin from browser
Launcher.st
NewLauncher.st
--- a/Launcher.st	Fri Sep 18 14:57:11 1998 +0200
+++ b/Launcher.st	Fri Sep 18 15:55:06 1998 +0200
@@ -2719,7 +2719,7 @@
     (box addButton:(Button label:(resources string:'defaults')) before:nil)
         action:[
             "/ fetch defaults
-            View updateAllStyleCaches.
+            View readStyleSheetAndUpdateAllStyleCaches.
             labelDef value: Label defaultFont.
             buttonDef value: Button defaultFont.
             listDef value: SelectionInListView defaultFont.
@@ -2742,9 +2742,9 @@
     box destroy.
     ^ box accepted
 
-    "Created: 27.2.1996 / 01:44:16 / cg"
-    "Modified: 17.6.1996 / 13:38:48 / stefan"
-    "Modified: 8.1.1997 / 14:59:11 / cg"
+    "Created: / 27.2.1996 / 01:44:16 / cg"
+    "Modified: / 17.6.1996 / 13:38:48 / stefan"
+    "Modified: / 15.9.1998 / 22:04:42 / cg"
 !
 
 reopenLauncher
@@ -5530,7 +5530,7 @@
     (box addButton:(Button label:(resources string:'defaults')) before:nil)
         action:[
             "/ fetch defaults
-            View updateAllStyleCaches.
+            View readStyleSheetAndUpdateAllStyleCaches.
             labelDef value: Label defaultFont.
             buttonDef value: Button defaultFont.
             listDef value: SelectionInListView defaultFont.
@@ -5553,10 +5553,9 @@
     box destroy.
     ^ box accepted
 
-    "Created: 27.2.1996 / 01:44:16 / cg"
-    "Modified: 17.6.1996 / 13:38:48 / stefan"
-    "Modified: 8.1.1997 / 14:59:11 / cg"
-
+    "Created: / 27.2.1996 / 01:44:16 / cg"
+    "Modified: / 17.6.1996 / 13:38:48 / stefan"
+    "Modified: / 15.9.1998 / 22:04:51 / cg"
 !
 
 syntaxColorConfigurationDialogFor:requestor
@@ -5662,5 +5661,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.373 1998-09-14 19:19:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.374 1998-09-18 13:54:23 cg Exp $'
 ! !
--- a/NewLauncher.st	Fri Sep 18 14:57:11 1998 +0200
+++ b/NewLauncher.st	Fri Sep 18 15:55:06 1998 +0200
@@ -2350,8 +2350,8 @@
      models labels allOfThem filter|
 
     encodingMatch notNil ifTrue:[
-	filter := [:f | f encoding notNil 
-			and:[encodingMatch match:f encoding]].
+        filter := [:f | f encoding notNil 
+                        and:[encodingMatch match:f encoding]].
     ].
 
     models := OrderedCollection new.
@@ -2370,90 +2370,90 @@
     models
     with:(resources array:#('all' 'labels' 'buttons' 'lists' 'menus' 'edit text'))
     do:[:model :title |
-	|y2 lbl f i|
-
-	f := model value.
-
-	(box addTextLabel:title) adjust:#left.
-
-	y := box yPosition.
-	b := box addComponent:(Button label:(resources string:'change ...')) tabable:true.
-	b relativeExtent:nil; extent:(b preferredExtent).
-	y2 := box yPosition.
-	box yPosition:y.
-	i := box leftIndent.
-	box leftIndent:(b widthIncludingBorder + View viewSpacing).
-	(lbl := box addTextLabel:'')
-	    adjust:#left;
-	    font:(model value);
-	    labelChannel:(BlockValue 
-			    with:[:v | |f|
-				f := v value.
-				f isNil ifTrue:[
-				    ''
-				] ifFalse:[
-				    f userFriendlyName
-				]
-			    ]
-			    argument:model).
-	labels add:lbl.
-
-	box leftIndent:i.
-	box yPosition:(box yPosition max:y2).
-	box addVerticalSpace.
-	box addHorizontalLine.
-	box addVerticalSpace.
-
-	b action:[
-	    |f|
-
-	    f := FontPanel 
-		fontFromUserInitial:(model value) 
-			      title:(resources string:'font for %1' with:title)
-			     filter:filter.
-	    f notNil ifTrue:[
-		model == allOfThem ifTrue:[
-		    models do:[:m | m value:f].
-		    labels do:[:l | l font:f]
-		] ifFalse:[
-		    model value:f.  
-		    lbl font:f.
-		].
-	    ]
-	].
-	model == allOfThem ifTrue:[
-	    box addVerticalSpace
-	]
+        |y2 lbl f i|
+
+        f := model value.
+
+        (box addTextLabel:title) adjust:#left.
+
+        y := box yPosition.
+        b := box addComponent:(Button label:(resources string:'change ...')) tabable:true.
+        b relativeExtent:nil; extent:(b preferredExtent).
+        y2 := box yPosition.
+        box yPosition:y.
+        i := box leftIndent.
+        box leftIndent:(b widthIncludingBorder + View viewSpacing).
+        (lbl := box addTextLabel:'')
+            adjust:#left;
+            font:(model value);
+            labelChannel:(BlockValue 
+                            with:[:v | |f|
+                                f := v value.
+                                f isNil ifTrue:[
+                                    ''
+                                ] ifFalse:[
+                                    f userFriendlyName
+                                ]
+                            ]
+                            argument:model).
+        labels add:lbl.
+
+        box leftIndent:i.
+        box yPosition:(box yPosition max:y2).
+        box addVerticalSpace.
+        box addHorizontalLine.
+        box addVerticalSpace.
+
+        b action:[
+            |f|
+
+            f := FontPanel 
+                fontFromUserInitial:(model value) 
+                              title:(resources string:'font for %1' with:title)
+                             filter:filter.
+            f notNil ifTrue:[
+                model == allOfThem ifTrue:[
+                    models do:[:m | m value:f].
+                    labels do:[:l | l font:f]
+                ] ifFalse:[
+                    model value:f.  
+                    lbl font:f.
+                ].
+            ]
+        ].
+        model == allOfThem ifTrue:[
+            box addVerticalSpace
+        ]
     ].
 
     box addAbortButton; addOkButton.
     (box addButton:(Button label:(resources string:'defaults')) before:nil)
-	action:[
-	    "/ fetch defaults
-	    View updateAllStyleCaches.
-	    labelDef value: Label defaultFont.
-	    buttonDef value: Button defaultFont.
-	    listDef value: SelectionInListView defaultFont.
-	    menuDef value: MenuView defaultFont.
-	    textDef value: TextView defaultFont.
-	].
+        action:[
+            "/ fetch defaults
+            View readStyleSheetAndUpdateAllStyleCaches.
+            labelDef value: Label defaultFont.
+            buttonDef value: Button defaultFont.
+            listDef value: SelectionInListView defaultFont.
+            menuDef value: MenuView defaultFont.
+            textDef value: TextView defaultFont.
+        ].
 
     box open.
     box accepted ifTrue:[
-	Label defaultFont:labelDef value.
-	Button defaultFont:buttonDef value.
-	Toggle defaultFont:buttonDef value.
-	SelectionInListView defaultFont:listDef value.
-	MenuView defaultFont:menuDef value.
-	PullDownMenu defaultFont:menuDef value.
-	TextView defaultFont:textDef value.
-	EditTextView defaultFont:textDef value.
-	CodeView defaultFont:textDef value.
+        Label defaultFont:labelDef value.
+        Button defaultFont:buttonDef value.
+        Toggle defaultFont:buttonDef value.
+        SelectionInListView defaultFont:listDef value.
+        MenuView defaultFont:menuDef value.
+        PullDownMenu defaultFont:menuDef value.
+        TextView defaultFont:textDef value.
+        EditTextView defaultFont:textDef value.
+        CodeView defaultFont:textDef value.
     ].
     box destroy.
     ^ box accepted
 
-
+    "Modified: / 15.9.1998 / 22:04:56 / cg"
 !
 
 reopenLauncher
@@ -3572,5 +3572,5 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.106 1998-09-11 16:20:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.107 1998-09-18 13:55:06 cg Exp $'
 ! !