Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FileBrowser.st
changeset 2868 c52efd14d44f
parent 2844 9b5742ab47d6
child 2871 a6d77e61c90a 
--- a/FileBrowser.st	Fri Dec 01 16:33:03 2000 +0100
+++ b/FileBrowser.st	Fri Dec 01 16:34:41 2000 +0100
@@ -2563,18 +2563,18 @@
 
     sel := fileListView selection.
     sel size > 0 ifTrue:[
-	sel := sel collect:[:rawIndex | fileList at:rawIndex].
-	sel size > 1 ifTrue:[
-	    q := resources string:'remove %1 selected files ?' with:(sel size)
-	] ifFalse:[
-	    q := resources string:'remove ''%1'' ?' with:(sel first asText allBold)
-	].
-	(self sensor shiftDown
-	or:[self ask:q yesButton:'remove']) ifTrue:[
-	    self withCursor:(Cursor wait) do:[
-		self doRemove:sel
-	    ]
-	]
+        sel := sel collect:[:rawIndex | fileList at:rawIndex].
+        sel size > 1 ifTrue:[
+            q := resources string:'remove %1 selected files ?' with:(sel size)
+        ] ifFalse:[
+            q := resources string:'remove ''%1'' ?' with:(sel first allBold)
+        ].
+        (self sensor shiftDown
+        or:[self ask:q yesButton:'remove']) ifTrue:[
+            self withCursor:(Cursor wait) do:[
+                self doRemove:sel
+            ]
+        ]
     ]
 
     "Modified: / 16.12.1998 / 17:30:31 / cg"
@@ -2710,9 +2710,9 @@
 
     orgName1 := ''.
     (sel size > 0) ifTrue:[
-	(currentDirectory construct:sel) isDirectory ifFalse:[
-	    orgName1 := sel
-	]
+        (currentDirectory construct:sel) isDirectory ifFalse:[
+            orgName1 := sel
+        ]
     ].
 
     name1 := orgName1 asValue.
@@ -2727,45 +2727,45 @@
     box addAbortAndOkButtons.
 
     orgName1 size > 0 ifTrue:[
-	box focusOnField:if2.
+        box focusOnField:if2.
     ].
     box showAtPointer.
 
     box accepted ifTrue:[
-	name1 := name1 value.
-	(name1 size == 0) ifTrue:[
-	    err := 'no name entered'.
-	] ifFalse:[
-	    f1 := name1 asFilename.
-	    name2 := name2 value.
-	    (name2 size == 0) ifTrue:[
-		err := 'no name entered'.
-	    ] ifFalse:[
-		f2 := name2 asFilename.
-		f2 exists ifTrue:[
-		    err := '''%2'' already exists'.
-		] ifFalse:[
-		    f1 exists ifFalse:[
-			err := '''%1'' does not exist'.
-		    ] ifTrue:[
-			f1 isDirectory ifTrue:[
-			    err := '''%1'' is a directory'.
-			] ifFalse:[
-			    ErrorSignal handle:[:ex |
-				err := ex errorString
-			    ] do:[
-				OperatingSystem createHardLinkFrom:name1 to:name2
-			    ]
-			]
-		    ]
-		]
-	    ]
-	].
-
-	err notNil ifTrue:[
-	    self warn:(resources string:err with:(name1 ? '') asText allBold with:(name2 ? '') asText allBold).
-	    ^ self
-	].
+        name1 := name1 value.
+        (name1 size == 0) ifTrue:[
+            err := 'no name entered'.
+        ] ifFalse:[
+            f1 := name1 asFilename.
+            name2 := name2 value.
+            (name2 size == 0) ifTrue:[
+                err := 'no name entered'.
+            ] ifFalse:[
+                f2 := name2 asFilename.
+                f2 exists ifTrue:[
+                    err := '''%2'' already exists'.
+                ] ifFalse:[
+                    f1 exists ifFalse:[
+                        err := '''%1'' does not exist'.
+                    ] ifTrue:[
+                        f1 isDirectory ifTrue:[
+                            err := '''%1'' is a directory'.
+                        ] ifFalse:[
+                            ErrorSignal handle:[:ex |
+                                err := ex errorString
+                            ] do:[
+                                OperatingSystem createHardLinkFrom:name1 to:name2
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ].
+
+        err notNil ifTrue:[
+            self warn:(resources string:err with:(name1 ? '') allBold with:(name2 ? '') allBold).
+            ^ self
+        ].
     ].
 
     "Modified: / 13.8.1998 / 21:47:01 / cg"
@@ -2781,7 +2781,7 @@
 
     orgName1 := ''.
     (sel size > 0) ifTrue:[
-	orgName1 := sel
+        orgName1 := sel
     ].
 
     name1 := orgName1 asValue.
@@ -2796,40 +2796,40 @@
     box addAbortAndOkButtons.
 
     orgName1 size > 0 ifTrue:[
-	box focusOnField:if2.
+        box focusOnField:if2.
     ].
     box showAtPointer.
 
     box accepted ifTrue:[
-	name1 := name1 value.
-	(name1 size == 0) ifTrue:[
-	    err := 'no name entered'.
-	] ifFalse:[
-	    f1 := name1 asFilename.
-	    name2 := name2 value.
-	    (name2 size == 0) ifTrue:[
-		err := 'no name entered'.
-	    ] ifFalse:[
-		f2 := name2 asFilename.
-		f2 exists ifTrue:[
-		    err := '''%2'' already exists'.
-		] ifFalse:[
-		    f1 exists ifFalse:[
-			err := '''%1'' does not exist (link created anyway)'.
-		    ].
-		    ErrorSignal handle:[:ex |
-			err := ex errorString
-		    ] do:[
-			OperatingSystem createSymbolicLinkFrom:name1 to:name2
-		    ]
-		]
-	    ]
-	].
-
-	err notNil ifTrue:[
-	    self warn:(resources string:err with:(name1 ? '') asText allBold with:(name2 ? '') asText allBold).
-	    ^ self
-	].
+        name1 := name1 value.
+        (name1 size == 0) ifTrue:[
+            err := 'no name entered'.
+        ] ifFalse:[
+            f1 := name1 asFilename.
+            name2 := name2 value.
+            (name2 size == 0) ifTrue:[
+                err := 'no name entered'.
+            ] ifFalse:[
+                f2 := name2 asFilename.
+                f2 exists ifTrue:[
+                    err := '''%2'' already exists'.
+                ] ifFalse:[
+                    f1 exists ifFalse:[
+                        err := '''%1'' does not exist (link created anyway)'.
+                    ].
+                    ErrorSignal handle:[:ex |
+                        err := ex errorString
+                    ] do:[
+                        OperatingSystem createSymbolicLinkFrom:name1 to:name2
+                    ]
+                ]
+            ]
+        ].
+
+        err notNil ifTrue:[
+            self warn:(resources string:err with:(name1 ? '') allBold with:(name2 ? '') allBold).
+            ^ self
+        ].
     ].
 
     "Modified: / 13.8.1998 / 21:26:59 / cg"
@@ -3875,18 +3875,18 @@
 
     sel := fileListView selection.
     sel size > 0 ifTrue:[
-	sel := sel collect:[:rawIndex | fileList at:rawIndex].
-	sel size > 1 ifTrue:[
-	    q := resources string:'remove %1 selected files and CVS containers ?' with:(sel size)
-	] ifFalse:[
-	    q := resources string:'remove ''%1'' and CVS container ?' with:(sel first asText allBold)
-	].
-	(self sensor shiftDown
-	or:[self ask:q yesButton:'remove']) ifTrue:[
-	    self withCursor:(Cursor wait) do:[
-		self doRemoveAndRemoveFromCVS:sel
-	    ]
-	]
+        sel := sel collect:[:rawIndex | fileList at:rawIndex].
+        sel size > 1 ifTrue:[
+            q := resources string:'remove %1 selected files and CVS containers ?' with:(sel size)
+        ] ifFalse:[
+            q := resources string:'remove ''%1'' and CVS container ?' with:(sel first allBold)
+        ].
+        (self sensor shiftDown
+        or:[self ask:q yesButton:'remove']) ifTrue:[
+            self withCursor:(Cursor wait) do:[
+                self doRemoveAndRemoveFromCVS:sel
+            ]
+        ]
     ]
 
     "Modified: / 16.12.1998 / 17:30:31 / cg"
@@ -5690,7 +5690,7 @@
             iconLbl := myName
         ] ifFalse:[
             f exists ifFalse:[
-                Dialog warn:(resources string:'oops, ''%1'' is gone or unreadable.' withCRs with:f pathName asText allBold).
+                Dialog warn:(resources string:'oops, ''%1'' is gone or unreadable.' withCRs with:f pathName allBold).
                 ^ self
             ].
             timeOfFileRead := f modificationTime.
@@ -5767,13 +5767,13 @@
                         yesToAll ifFalse:[
                             idx == filesToRemove size ifTrue:[
                                 answer := Dialog
-                                            confirmWithCancel:(resources string:'directory ''%1'' is not empty\remove anyway ?' with:fileName asText allBold) withCRs
+                                            confirmWithCancel:(resources string:'directory ''%1'' is not empty\remove anyway ?' with:fileName allBold) withCRs
                                             labels:(resources array:#('cancel' 'remove'))
                                             values:#(false true) 
                                             default:2.
                             ] ifFalse:[
                                 answer := Dialog
-                                            confirmWithCancel:(resources string:'directory ''%1'' is not empty\remove anyway ?' with:fileName asText allBold) withCRs
+                                            confirmWithCancel:(resources string:'directory ''%1'' is not empty\remove anyway ?' with:fileName allBold) withCRs
                                             labels:(resources array:#('cancel' 'remove all' 'remove'))
                                             values:#(false #removeAll true) 
                                             default:3.
@@ -5834,24 +5834,24 @@
     |old new|
 
     (oldName notNil and:[newName notNil]) ifTrue:[
-	(oldName isBlank or:[newName isBlank]) ifFalse:[
-	    old := currentDirectory filenameFor:oldName.
-	    new := currentDirectory filenameFor:newName.
-	    OperatingSystem errorSignal handle:[:ex|
-		self showAlert:(resources string:'cannot rename file ''%1'' to %2 !!' 
-					  with:oldName with:newName)
-			  with:(OperatingSystem lastErrorString)
-	    ] do:[
-		new exists ifTrue:[
-		    (self confirm:(resources string:'''%1'' already exists - rename (i.e. overwrite) anyway ?' with:new baseName asText allBold))
-		    ifFalse:[
-			^ self
-		    ]
-		].
-		old renameTo:new.
-	    ].
-	    self updateCurrentDirectoryIfChanged.
-	]
+        (oldName isBlank or:[newName isBlank]) ifFalse:[
+            old := currentDirectory filenameFor:oldName.
+            new := currentDirectory filenameFor:newName.
+            OperatingSystem errorSignal handle:[:ex|
+                self showAlert:(resources string:'cannot rename file ''%1'' to %2 !!' 
+                                          with:oldName with:newName)
+                          with:(OperatingSystem lastErrorString)
+            ] do:[
+                new exists ifTrue:[
+                    (self confirm:(resources string:'''%1'' already exists - rename (i.e. overwrite) anyway ?' with:new baseName allBold))
+                    ifFalse:[
+                        ^ self
+                    ]
+                ].
+                old renameTo:new.
+            ].
+            self updateCurrentDirectoryIfChanged.
+        ]
     ]
 
     "Modified: / 24.9.1997 / 09:20:00 / stefan"
@@ -7082,5 +7082,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.389 2000-11-15 12:36:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.390 2000-12-01 15:34:41 cg Exp $'
 ! !
hg/stx-libtool