Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkin from browser
authorClaus Gittinger <cg@exept.de>
Wed, 08 Oct 1997 18:09:08 +0200
changeset 1341 c1e3438777ea
parent 1340 2378e91a0236
child 1342 f0101f5528ec
checkin from browser
FBrowser.st file | annotate | diff | comparison | revisions
FileBrowser.st file | annotate | diff | comparison | revisions 
--- a/FBrowser.st	Wed Oct 08 16:56:52 1997 +0200
+++ b/FBrowser.st	Wed Oct 08 18:09:08 1997 +0200
@@ -1173,13 +1173,13 @@
     lockUpdate := false.
 
     CommandHistory isNil ifTrue:[
-	CommandHistory := OrderedCollection new.
-	CommandHistorySize := 50
+        CommandHistory := OrderedCollection new.
+        CommandHistorySize := 50
     ].
     DirectoryHistory isNil ifTrue:[
-	DirectoryHistory := OrderedCollection new.
-	DirectoryHistoryWhere := OrderedCollection new.
-	HistorySize := 15.
+        DirectoryHistory := OrderedCollection new.
+        DirectoryHistoryWhere := OrderedCollection new.
+        HistorySize := 15.
     ].
     commandIndex := 0.
 
@@ -1187,12 +1187,12 @@
     self label:myName.
 
     labelFrame := View 
-			origin:(0.0 @ 0.0)
-			corner:(1.0 @ (font height * 2))
-			in:self.
+                        origin:(0.0 @ 0.0)
+                        corner:(1.0 @ (font height * 2))
+                        in:self.
 
     styleSheet name = #st80 ifTrue:[
-	labelFrame level:1
+        labelFrame level:1
     ].
 
     spacing := ViewSpacing.
@@ -1211,8 +1211,8 @@
     filterModel := '*' asValue.
     filterField := EditField in:labelFrame.
     filterField 
-	origin:[((width // 4 * 3) + halfSpacing) @ halfSpacing]
-	corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing + halfSpacing) ).
+        origin:[((width // 4 * 3) + halfSpacing) @ halfSpacing]
+        corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing + halfSpacing) ).
     filterField rightInset:halfSpacing.
     filterField model:filterModel.
 
@@ -1234,12 +1234,12 @@
 
     labelView := FilenameEditField in:labelFrame.
     labelView 
-	origin:(halfSpacing @ halfSpacing)
-	extent:[((width // 2) - spacing - borderWidth)
-		@
-		(filterField heightIncludingBorder)
-		"(font height + font descent)"
-	       ].
+        origin:(halfSpacing @ halfSpacing)
+        extent:[((width // 4 * 3) - spacing - borderWidth)
+                @
+                (filterField heightIncludingBorder)
+                "(font height + font descent)"
+               ].
     labelView menu:#labelMenu; aspect:#path; changeMessage:#pathChanged:.
     labelView model:self.
     labelView backgroundColor:(labelFrame viewBackground).
@@ -1276,22 +1276,22 @@
     frame := VariableVerticalPanel origin:0.0@0.0 corner:1.0@1.0 in:self.
     frame topInset:labelFrame height.
     commandView notNil ifTrue:[
-	frame bottomInset:(commandView height + spacing + spacing)
+        frame bottomInset:(commandView height + spacing + spacing)
     ].
 
     topFrame := View in:frame.
     topFrame origin:(0.0 @ 0.0) corner:(1.0 @ 0.3).
 
     false "self is3D" ifTrue:[
-	v := View in:topFrame.
-	v level:-1.
-	tabRulerView := TabSpecRuler in:v.
-	tabRulerView level:1.
-	v origin:(0.0@0.0) corner:(1.0@10).
-	tabRulerView origin:(0.0@0.0) corner:(1.0@1.0).
+        v := View in:topFrame.
+        v level:-1.
+        tabRulerView := TabSpecRuler in:v.
+        tabRulerView level:1.
+        v origin:(0.0@0.0) corner:(1.0@10).
+        tabRulerView origin:(0.0@0.0) corner:(1.0@1.0).
     ] ifFalse:[
-	tabRulerView := TabSpecRuler in:topFrame.
-	tabRulerView origin:(0.0@0.0) corner:(1.0@10).
+        tabRulerView := TabSpecRuler in:topFrame.
+        tabRulerView origin:(0.0@0.0) corner:(1.0@10).
     ].
     tabRulerView borderWidth:0.
     tabRulerView synchronousOperation:true.
@@ -1308,20 +1308,20 @@
     fileListView menuHolder:self; menuPerformer:self; menuMessage:#fileListMenu.
     fileListView allowDrag:true.
     fileListView dragObjectConverter:[:obj | 
-					|dir nm path idx|
-
-					nm := obj theObject asString.
-					idx := fileListView list indexOf:nm.
-					idx == 0 ifTrue:[
-					    "/ cannot happen ...
-					    nil
-					] ifFalse:[
-					    nm := fileList at:idx.
-					    dir := currentDirectory pathName asFilename.
-					    path := dir constructString:nm.
-					    DropObject newFile:path.
-					]
-				     ].
+                                        |dir nm path idx|
+
+                                        nm := obj theObject asString.
+                                        idx := fileListView list indexOf:nm.
+                                        idx == 0 ifTrue:[
+                                            "/ cannot happen ...
+                                            nil
+                                        ] ifFalse:[
+                                            nm := fileList at:idx.
+                                            dir := currentDirectory pathName asFilename.
+                                            path := dir constructString:nm.
+                                            DropObject newFile:path.
+                                        ]
+                                     ].
 
     "/ sigh - must be delayed - origin is not yet fixe
 "/    tabRulerView leftInset:(fileListView originRelativeTo:scrollView) x.
@@ -1332,7 +1332,7 @@
     v origin:(0.0 @ 0.3) corner:(1.0 @ 1.0).
     subView := v scrolledView.
     (subView respondsTo:#directoryForFileDialog:) ifTrue:[
-	subView directoryForFileDialog:currentDirectory
+        subView directoryForFileDialog:currentDirectory
     ].
 
 "/    buttonPanel := HorizontalPanelView in:self.
@@ -1358,7 +1358,7 @@
 
     "Modified: 6.9.1995 / 20:26:06 / claus"
     "Modified: 16.9.1997 / 14:52:46 / stefan"
-    "Modified: 22.9.1997 / 09:35:45 / cg"
+    "Modified: 8.10.1997 / 17:07:27 / cg"
 !
 
 initializeCommandViewIn:frame
@@ -3995,5 +3995,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.204 1997-10-08 14:56:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.205 1997-10-08 16:09:08 cg Exp $'
 ! !
--- a/FileBrowser.st	Wed Oct 08 16:56:52 1997 +0200
+++ b/FileBrowser.st	Wed Oct 08 18:09:08 1997 +0200
@@ -1173,13 +1173,13 @@
     lockUpdate := false.
 
     CommandHistory isNil ifTrue:[
-	CommandHistory := OrderedCollection new.
-	CommandHistorySize := 50
+        CommandHistory := OrderedCollection new.
+        CommandHistorySize := 50
     ].
     DirectoryHistory isNil ifTrue:[
-	DirectoryHistory := OrderedCollection new.
-	DirectoryHistoryWhere := OrderedCollection new.
-	HistorySize := 15.
+        DirectoryHistory := OrderedCollection new.
+        DirectoryHistoryWhere := OrderedCollection new.
+        HistorySize := 15.
     ].
     commandIndex := 0.
 
@@ -1187,12 +1187,12 @@
     self label:myName.
 
     labelFrame := View 
-			origin:(0.0 @ 0.0)
-			corner:(1.0 @ (font height * 2))
-			in:self.
+                        origin:(0.0 @ 0.0)
+                        corner:(1.0 @ (font height * 2))
+                        in:self.
 
     styleSheet name = #st80 ifTrue:[
-	labelFrame level:1
+        labelFrame level:1
     ].
 
     spacing := ViewSpacing.
@@ -1211,8 +1211,8 @@
     filterModel := '*' asValue.
     filterField := EditField in:labelFrame.
     filterField 
-	origin:[((width // 4 * 3) + halfSpacing) @ halfSpacing]
-	corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing + halfSpacing) ).
+        origin:[((width // 4 * 3) + halfSpacing) @ halfSpacing]
+        corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing + halfSpacing) ).
     filterField rightInset:halfSpacing.
     filterField model:filterModel.
 
@@ -1234,12 +1234,12 @@
 
     labelView := FilenameEditField in:labelFrame.
     labelView 
-	origin:(halfSpacing @ halfSpacing)
-	extent:[((width // 2) - spacing - borderWidth)
-		@
-		(filterField heightIncludingBorder)
-		"(font height + font descent)"
-	       ].
+        origin:(halfSpacing @ halfSpacing)
+        extent:[((width // 4 * 3) - spacing - borderWidth)
+                @
+                (filterField heightIncludingBorder)
+                "(font height + font descent)"
+               ].
     labelView menu:#labelMenu; aspect:#path; changeMessage:#pathChanged:.
     labelView model:self.
     labelView backgroundColor:(labelFrame viewBackground).
@@ -1276,22 +1276,22 @@
     frame := VariableVerticalPanel origin:0.0@0.0 corner:1.0@1.0 in:self.
     frame topInset:labelFrame height.
     commandView notNil ifTrue:[
-	frame bottomInset:(commandView height + spacing + spacing)
+        frame bottomInset:(commandView height + spacing + spacing)
     ].
 
     topFrame := View in:frame.
     topFrame origin:(0.0 @ 0.0) corner:(1.0 @ 0.3).
 
     false "self is3D" ifTrue:[
-	v := View in:topFrame.
-	v level:-1.
-	tabRulerView := TabSpecRuler in:v.
-	tabRulerView level:1.
-	v origin:(0.0@0.0) corner:(1.0@10).
-	tabRulerView origin:(0.0@0.0) corner:(1.0@1.0).
+        v := View in:topFrame.
+        v level:-1.
+        tabRulerView := TabSpecRuler in:v.
+        tabRulerView level:1.
+        v origin:(0.0@0.0) corner:(1.0@10).
+        tabRulerView origin:(0.0@0.0) corner:(1.0@1.0).
     ] ifFalse:[
-	tabRulerView := TabSpecRuler in:topFrame.
-	tabRulerView origin:(0.0@0.0) corner:(1.0@10).
+        tabRulerView := TabSpecRuler in:topFrame.
+        tabRulerView origin:(0.0@0.0) corner:(1.0@10).
     ].
     tabRulerView borderWidth:0.
     tabRulerView synchronousOperation:true.
@@ -1308,20 +1308,20 @@
     fileListView menuHolder:self; menuPerformer:self; menuMessage:#fileListMenu.
     fileListView allowDrag:true.
     fileListView dragObjectConverter:[:obj | 
-					|dir nm path idx|
-
-					nm := obj theObject asString.
-					idx := fileListView list indexOf:nm.
-					idx == 0 ifTrue:[
-					    "/ cannot happen ...
-					    nil
-					] ifFalse:[
-					    nm := fileList at:idx.
-					    dir := currentDirectory pathName asFilename.
-					    path := dir constructString:nm.
-					    DropObject newFile:path.
-					]
-				     ].
+                                        |dir nm path idx|
+
+                                        nm := obj theObject asString.
+                                        idx := fileListView list indexOf:nm.
+                                        idx == 0 ifTrue:[
+                                            "/ cannot happen ...
+                                            nil
+                                        ] ifFalse:[
+                                            nm := fileList at:idx.
+                                            dir := currentDirectory pathName asFilename.
+                                            path := dir constructString:nm.
+                                            DropObject newFile:path.
+                                        ]
+                                     ].
 
     "/ sigh - must be delayed - origin is not yet fixe
 "/    tabRulerView leftInset:(fileListView originRelativeTo:scrollView) x.
@@ -1332,7 +1332,7 @@
     v origin:(0.0 @ 0.3) corner:(1.0 @ 1.0).
     subView := v scrolledView.
     (subView respondsTo:#directoryForFileDialog:) ifTrue:[
-	subView directoryForFileDialog:currentDirectory
+        subView directoryForFileDialog:currentDirectory
     ].
 
 "/    buttonPanel := HorizontalPanelView in:self.
@@ -1358,7 +1358,7 @@
 
     "Modified: 6.9.1995 / 20:26:06 / claus"
     "Modified: 16.9.1997 / 14:52:46 / stefan"
-    "Modified: 22.9.1997 / 09:35:45 / cg"
+    "Modified: 8.10.1997 / 17:07:27 / cg"
 !
 
 initializeCommandViewIn:frame
@@ -3995,5 +3995,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.204 1997-10-08 14:56:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.205 1997-10-08 16:09:08 cg Exp $'
 ! !
hg/stx-libtool