uppercase labels
authorClaus Gittinger <cg@exept.de>
Fri, 28 Sep 2001 16:29:31 +0200
changeset 2415 188fc1577a8d
parent 2414 ec98bcbd4c61
child 2416 56acdd9e31b5
uppercase labels
Button.st
DialogBox.st
FileSaveBox.st
TextView.st
--- a/Button.st	Fri Sep 28 16:13:48 2001 +0200
+++ b/Button.st	Fri Sep 28 16:29:31 2001 +0200
@@ -747,7 +747,7 @@
 
     |aButton|
 
-    aButton := Button label:(self classResources at:'cancel').
+    aButton := Button label:(self classResources at:'Cancel').
     aButton cursor:(Cursor thumbsDown).
     ^ aButton
 
@@ -793,7 +793,7 @@
 
     |aButton|
 
-    aButton := Button label:(self classResources at:'ok').
+    aButton := Button label:(self classResources at:'Ok').
     aButton cursor:(Cursor thumbsUp).
     aButton beReturnButton.
     ^ aButton
@@ -1376,7 +1376,8 @@
     |xlatedLabel|
 
     xlatedLabel := self defineShortcutAndTranslateLabelStringFrom:aStringOrImageOrForm.
-    super label:xlatedLabel.!
+    super label:xlatedLabel.
+!
 
 leaveLevel
     "return the level to be used when the mouse
@@ -2262,5 +2263,5 @@
 !Button class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.117 2000-11-09 15:32:00 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.118 2001-09-28 14:28:30 cg Exp $'
 ! !
--- a/DialogBox.st	Fri Sep 28 16:13:48 2001 +0200
+++ b/DialogBox.st	Fri Sep 28 16:29:31 2001 +0200
@@ -1237,7 +1237,7 @@
 
     ^ self 
         confirm:aString
-        title:(self classResources string:'confirm')
+        title:(self classResources string:'Confirm')
         yesLabel:nil
         noLabel:noText
 
@@ -1401,15 +1401,9 @@
      The default argument marks the return-button; it may be one of nil, false or true"
 
     ^ self
-	confirmWithCancel:aString 
-		   labels:(self 
-			       classResources 
-				   array:
-					#('cancel' 
-					  'no' 
-					  'yes')
-			  )
-		  default:(#(nil false true) indexOf:default ifAbsent:nil)
+        confirmWithCancel:aString 
+                   labels:(self classResources array:#('Cancel' 'No' 'Yes') )
+                  default:(#(nil false true) indexOf:default ifAbsent:nil)
     "
      Dialog confirmWithCancel:'really ?' default:false
     "
@@ -1423,10 +1417,7 @@
 
     ^ self
         confirmWithCancel:aString 
-                   labels:(self 
-                               classResources 
-                                   array:labelArray
-                          )
+                   labels:(self classResources array:labelArray)
                   default:3
     "
      Dialog confirmWithCancel:'really ?' labels:#( 'oops' 'nope' 'yea')
@@ -1604,8 +1595,8 @@
 
     fileBox := FileSelectionBox
                     title:title
-                    okText:'ok'
-                    abortText:'cancel'
+                    okText:'Ok'
+                    abortText:'Cancel'
                     action:[:fileName | enteredName := fileName].
 
     fN := aFileName.
@@ -1856,25 +1847,28 @@
      The matchPattern is set to pattern initially.
      Return the string or nil if cancel was pressed."
 
+    |resources|
+
+    resources := self classResources.
     ^ self 
-	requestFileName:titleString 
-	default:defaultName
-	ok:(self classResources string:'ok') 
-	abort:(self classResources string:'cancel') 
-	pattern:pattern
-	fromDirectory:nil
+        requestFileName:titleString 
+        default:defaultName
+        ok:(resources string:'Ok') 
+        abort:(resources string:'Cancel') 
+        pattern:pattern
+        fromDirectory:nil
 
     "
      Dialog 
-	requestFileName:'enter a fileName:'
-	default:''
-	pattern:'*.st'   
+        requestFileName:'enter a fileName:'
+        default:''
+        pattern:'*.st'   
     "
     "
      Dialog 
-	requestFileName:'enter a fileName:'
-	default:''
-	pattern:'*.st;*.h'   
+        requestFileName:'enter a fileName:'
+        default:''
+        pattern:'*.st;*.h'   
     "
 
     "Created: 21.2.1997 / 11:16:52 / cg"
@@ -6937,6 +6931,6 @@
 !DialogBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.169 2001-08-02 09:58:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.170 2001-09-28 14:29:31 cg Exp $'
 ! !
 DialogBox initialize!
--- a/FileSaveBox.st	Fri Sep 28 16:13:48 2001 +0200
+++ b/FileSaveBox.st	Fri Sep 28 16:29:31 2001 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+"{ Package: 'stx:libwidg' }"
+
 FileSelectionBox subclass:#FileSaveBox
 	instanceVariableNames:'appendButton appendAction'
 	classVariableNames:''
@@ -77,7 +79,7 @@
     "
     appendButton := Button okButton.
     appendButton isReturnButton:false.
-    appendButton label:(resources string:'append').
+    appendButton label:(resources string:'Append').
     appendButton action:[appendButton turnOffWithoutRedraw. self appendPressed].
     (styleSheet at:'dialogBox.okAtLeft' default:false) ifTrue:[
         self addButton:appendButton after:okButton.
@@ -103,5 +105,5 @@
 !FileSaveBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FileSaveBox.st,v 1.14 1999-03-06 03:03:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FileSaveBox.st,v 1.15 2001-09-28 14:28:41 cg Exp $'
 ! !
--- a/TextView.st	Fri Sep 28 16:13:48 2001 +0200
+++ b/TextView.st	Fri Sep 28 16:29:31 2001 +0200
@@ -293,7 +293,7 @@
              #(#SpecCollection
                 #collection: #(
                  #(#ActionButtonSpec
-                    #label: 'cancel'
+                    #label: 'Cancel'
                     #name: 'cancelButton'
                     #level: 2
                     #translateLabel: true
@@ -302,7 +302,7 @@
                     #extent: #(#Point 95 21)
                   )
                  #(#ActionButtonSpec
-                    #label: 'prev'
+                    #label: 'Prev'
                     #name: 'prevButton'
                     #level: 2
                     #translateLabel: true
@@ -311,7 +311,7 @@
                     #extent: #(#Point 95 21)
                   )
                  #(#ActionButtonSpec
-                    #label: 'next'
+                    #label: 'Next'
                     #name: 'nextButton'
                     #level: 2
                     #borderWidth: 1
@@ -1477,9 +1477,9 @@
 
     lineNumberBox :=
         EnterBox
-           title:(resources string:'line number (or +/- relativeNr):')
-           okText:(resources string:'goto')
-           abortText:(resources string:'cancel')
+           title:(resources string:'Line number (or +/- relativeNr):')
+           okText:(resources string:'Goto')
+           abortText:(resources string:'Cancel')
            action:[:l | input := l].
 
     l := self defaultForGotoLine.
@@ -1522,16 +1522,16 @@
     |fileBox|
 
     fileBox := FileSaveBox
-		    title:(resources string:'save contents in:')
-		    okText:(resources string:'save')
-		    abortText:(resources string:'cancel')
-		    action:[:fileName | self saveAs:fileName].
+                    title:(resources string:'Save contents in:')
+                    okText:(resources string:'Save')
+                    abortText:(resources string:'Cancel')
+                    action:[:fileName | self saveAs:fileName].
     fileBox appendAction:[:fileName | self appendTo:fileName].
     directoryForFileDialog notNil ifTrue:[
-	fileBox directory:directoryForFileDialog
+        fileBox directory:directoryForFileDialog
     ].
     defaultFileNameForFileDialog notNil ifTrue:[
-	fileBox initialText:defaultFileNameForFileDialog asString
+        fileBox initialText:defaultFileNameForFileDialog asString
     ].
     fileBox showAtPointer.
 
@@ -3224,5 +3224,5 @@
 !TextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.167 2001-09-28 14:13:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/TextView.st,v 1.168 2001-09-28 14:28:50 cg Exp $'
 ! !