*** empty log message ***
authorclaus
Thu, 16 Dec 1993 12:00:50 +0100
changeset 10 a288b33897a5
parent 9 3ba6bca844c8
child 11 c47dbae39a71
*** empty log message ***
CodeView.st
ETxtView.st
EditTextView.st
--- a/CodeView.st	Mon Dec 13 18:07:34 1993 +0100
+++ b/CodeView.st	Thu Dec 16 12:00:50 1993 +0100
@@ -26,7 +26,7 @@
 to the menu, and defines two actions: acceptAction to be performed for accept
 and explainAction to be performed for explain.
 
-$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.4 1993-12-11 01:41:07 claus Exp $
+$Header: /cvs/stx/stx/libwidg/CodeView.st,v 1.5 1993-12-16 11:00:30 claus Exp $
 written winter-89 by claus
 '!
 
@@ -49,28 +49,17 @@
                                'copy'
                                'cut'
                                'paste'
-                               'replace'
-                               '-'
-                               'font'
-                               '-'
-                               'search'
-                               'goto'
-                               '-'
-                               'indent'
-                               '-'
-                               'save'
-                               'print'
-                            "  'filein' "
                                '-'
                                'doIt'
                                'printIt'
                                'inspectIt'
                                '-'
-                               'explain'
+                               'accept'
                                '-'
-                               'accept').
+                               'others ...'
+                               ).
 
-    self middleButtonMenu:(PopUpMenu 
+    self middleButtonMenu:(PopUpMenu
                                 labels:labels
                              selectors:#(
 "
@@ -79,31 +68,49 @@
                                          again
                                          nil
                                          copySelection
-                                         cut 
-                                         paste 
-                                         replace
-                                         nil 
-                                         changeFont
-                                         nil 
-                                         search
-                                         gotoLine
-                                         nil 
-                                         indent
-                                         nil 
-                                         save
-                                         print
-                                       "  fileItIn "
-                                         nil 
-                                         doIt 
-                                         printIt 
-                                         inspectIt 
-                                         nil 
-                                         explain
-                                         nil 
-                                         accept)
+                                         cut
+                                         paste
+                                         nil
+                                         doIt
+                                         printIt
+                                         inspectIt
+                                         nil
+                                         accept
+                                         nil
+                                         others
+                                        )
                                 receiver:self
                                      for:self).
 
+    middleButtonMenu subMenuAt:#others put:(PopUpMenu
+                                labels:#(
+                                         'search'
+                                         'goto'
+                                         '-'
+                                         'explain'
+                                         '-'
+                                         'font'
+                                         '-'
+                                         'indent'
+                                         '-'
+                                         'save as ..'
+                                         'print'
+                                        )
+                              selectors:#(
+                                          search
+                                          gotoLine
+                                          nil
+                                          explain
+                                          nil
+                                          changeFont
+                                          nil
+                                          indent
+                                          nil
+                                          save
+                                          print
+                                         )
+                                receiver:self
+                                     for:self).
 ! !
 
 !CodeView methodsFor:'accessing'!
@@ -189,8 +196,8 @@
 keyPress:key x:x y:y
     "catch keyboard shortcut: control-a for accept"
 
-    (key == #Cmda) ifTrue:[^ self accept].
-    (key == #Cmde) ifTrue:[^ self explain].
+    (key == #Accept) ifTrue:[^ self accept].
+    (key == #Explain) ifTrue:[^ self explain].
     (key == #Help) ifTrue:[^ self explain].
     super keyPress:key x:x y:y
 ! !
--- a/ETxtView.st	Mon Dec 13 18:07:34 1993 +0100
+++ b/ETxtView.st	Thu Dec 16 12:00:50 1993 +0100
@@ -31,7 +31,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
             All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.4 1993-12-11 01:43:01 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.5 1993-12-16 11:00:50 claus Exp $
 
 written jun-89 by claus
 '!
@@ -99,26 +99,20 @@
  
     labels := resources array:#(
 "
-                                       'undo'
+                               'undo'
 "
-                                       'again'
-                                       '-'
-                                       'copy'
-                                       'cut'
-                                       'paste'
-                                       'replace'
-                                       '-'
-                                       'font'
-                                       '-'
-                                       'search'
-                                       'goto'
-                                       '-'
-                                       'indent'
-                                       '-'
-                                       'save'
-                                       'print').
+                               'again'
+                               '-'
+                               'copy'
+                               'cut'
+                               'paste'
+                               '-'
+                               'accept'
+                               '-'
+                               'others ...'
+                               ).
 
-    self middleButtonMenu:(PopUpMenu 
+    self middleButtonMenu:(PopUpMenu
                                 labels:labels
                              selectors:#(
 "
@@ -129,17 +123,41 @@
                                          copySelection
                                          cut
                                          paste
-                                         replace
                                          nil
-                                         changeFont
+                                         accept
                                          nil
-                                         search
-                                         gotoLine
-                                         nil
-                                         indent
-                                         nil
-                                         save
-                                         print)
+                                         others
+                                        )
+                                receiver:self
+                                     for:self).
+
+    middleButtonMenu subMenuAt:#others put:(PopUpMenu
+                                labels:#(
+                                         'search'
+                                         'goto'
+                                         '-'
+                                         'explain'
+                                         '-'
+                                         'font'
+                                         '-'
+                                         'indent'
+                                         '-'
+                                         'save as ..'
+                                         'print'
+                                        )
+                              selectors:#(
+                                          search
+                                          gotoLine
+                                          nil
+                                          explain
+                                          nil
+                                          changeFont
+                                          nil
+                                          indent
+                                          nil
+                                          save
+                                          print
+                                         )
                                 receiver:self
                                      for:self).
 
@@ -1647,7 +1665,9 @@
     middleButtonMenu notNil ifTrue:[
         super disableSelectionMenuEntries.
         middleButtonMenu disable:#cut.
+"
         middleButtonMenu disable:#replace.
+"
         middleButtonMenu disable:#indent
     ]
 !
@@ -1659,13 +1679,17 @@
         readOnly ifTrue:[
             super disableSelectionMenuEntries.
             middleButtonMenu disable:#cut.
+"
             middleButtonMenu disable:#replace.
+"
             middleButtonMenu disable:#indent.
             middleButtonMenu disable:#paste.
         ] ifFalse:[
             super enableSelectionMenuEntries.
             middleButtonMenu enable:#cut.
+"
             middleButtonMenu enable:#replace.
+"
             middleButtonMenu enable:#indent.
         ]
     ]
@@ -1699,6 +1723,15 @@
     super selectFromLine:startLine col:startCol toLine:endLine col:endCol.
     self cursorLine:selectionEndLine col:(selectionEndCol + 1).
     typeOfSelection := nil
+!
+
+selectAll
+    "select the whole text.
+     redefined to send super selectFrom... since we dont want the
+     cursor to be moved in this case."
+
+    super selectFromLine:1 col:1 toLine:(list size + 1) col:0.
+    typeOfSelection := nil
 ! !
 
 !EditTextView methodsFor:'scrolling'!
@@ -2068,22 +2101,26 @@
         ^self
     ].
 
-    (key == #Ctrlm) ifTrue:[
+    (key == #SearchMatchingParent) ifTrue:[
         self searchForMatchingParenthesis. 
         ^self
     ].
-    (key == #Cmdm) ifTrue:[
+    (key == #SelectMatchingParents) ifTrue:[
         self searchForAndSelectMatchingParenthesis. 
         ^self
     ].
 
+" disabled - nobody liked it ...
+  and if you like it, its better done in the keymap.
+
     (key == #Ctrlb) ifTrue:[self unselect. self cursorLeft. ^self].
     (key == #Ctrlf) ifTrue:[self unselect. self cursorRight. ^self].
     (key == #Ctrln) ifTrue:[self unselect. self cursorDown. ^self].
     (key == #Ctrlp) ifTrue:[self unselect. self cursorUp. ^self].
+"
 
-    (key == #Ctrla) ifTrue:[self cursorToBeginOfLine. ^self].
-    (key == #Ctrle) ifTrue:[self cursorToEndOfLine. ^self].
+    (key == #BeginOfLine) ifTrue:[self cursorToBeginOfLine. ^self].
+    (key == #EndOfLine) ifTrue:[self cursorToEndOfLine. ^self].
 
     (key == #CursorRight)     ifTrue:[
         self unselect. self cursorRight. ^self
--- a/EditTextView.st	Mon Dec 13 18:07:34 1993 +0100
+++ b/EditTextView.st	Thu Dec 16 12:00:50 1993 +0100
@@ -31,7 +31,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
             All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.4 1993-12-11 01:43:01 claus Exp $
+$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.5 1993-12-16 11:00:50 claus Exp $
 
 written jun-89 by claus
 '!
@@ -99,26 +99,20 @@
  
     labels := resources array:#(
 "
-                                       'undo'
+                               'undo'
 "
-                                       'again'
-                                       '-'
-                                       'copy'
-                                       'cut'
-                                       'paste'
-                                       'replace'
-                                       '-'
-                                       'font'
-                                       '-'
-                                       'search'
-                                       'goto'
-                                       '-'
-                                       'indent'
-                                       '-'
-                                       'save'
-                                       'print').
+                               'again'
+                               '-'
+                               'copy'
+                               'cut'
+                               'paste'
+                               '-'
+                               'accept'
+                               '-'
+                               'others ...'
+                               ).
 
-    self middleButtonMenu:(PopUpMenu 
+    self middleButtonMenu:(PopUpMenu
                                 labels:labels
                              selectors:#(
 "
@@ -129,17 +123,41 @@
                                          copySelection
                                          cut
                                          paste
-                                         replace
                                          nil
-                                         changeFont
+                                         accept
                                          nil
-                                         search
-                                         gotoLine
-                                         nil
-                                         indent
-                                         nil
-                                         save
-                                         print)
+                                         others
+                                        )
+                                receiver:self
+                                     for:self).
+
+    middleButtonMenu subMenuAt:#others put:(PopUpMenu
+                                labels:#(
+                                         'search'
+                                         'goto'
+                                         '-'
+                                         'explain'
+                                         '-'
+                                         'font'
+                                         '-'
+                                         'indent'
+                                         '-'
+                                         'save as ..'
+                                         'print'
+                                        )
+                              selectors:#(
+                                          search
+                                          gotoLine
+                                          nil
+                                          explain
+                                          nil
+                                          changeFont
+                                          nil
+                                          indent
+                                          nil
+                                          save
+                                          print
+                                         )
                                 receiver:self
                                      for:self).
 
@@ -1647,7 +1665,9 @@
     middleButtonMenu notNil ifTrue:[
         super disableSelectionMenuEntries.
         middleButtonMenu disable:#cut.
+"
         middleButtonMenu disable:#replace.
+"
         middleButtonMenu disable:#indent
     ]
 !
@@ -1659,13 +1679,17 @@
         readOnly ifTrue:[
             super disableSelectionMenuEntries.
             middleButtonMenu disable:#cut.
+"
             middleButtonMenu disable:#replace.
+"
             middleButtonMenu disable:#indent.
             middleButtonMenu disable:#paste.
         ] ifFalse:[
             super enableSelectionMenuEntries.
             middleButtonMenu enable:#cut.
+"
             middleButtonMenu enable:#replace.
+"
             middleButtonMenu enable:#indent.
         ]
     ]
@@ -1699,6 +1723,15 @@
     super selectFromLine:startLine col:startCol toLine:endLine col:endCol.
     self cursorLine:selectionEndLine col:(selectionEndCol + 1).
     typeOfSelection := nil
+!
+
+selectAll
+    "select the whole text.
+     redefined to send super selectFrom... since we dont want the
+     cursor to be moved in this case."
+
+    super selectFromLine:1 col:1 toLine:(list size + 1) col:0.
+    typeOfSelection := nil
 ! !
 
 !EditTextView methodsFor:'scrolling'!
@@ -2068,22 +2101,26 @@
         ^self
     ].
 
-    (key == #Ctrlm) ifTrue:[
+    (key == #SearchMatchingParent) ifTrue:[
         self searchForMatchingParenthesis. 
         ^self
     ].
-    (key == #Cmdm) ifTrue:[
+    (key == #SelectMatchingParents) ifTrue:[
         self searchForAndSelectMatchingParenthesis. 
         ^self
     ].
 
+" disabled - nobody liked it ...
+  and if you like it, its better done in the keymap.
+
     (key == #Ctrlb) ifTrue:[self unselect. self cursorLeft. ^self].
     (key == #Ctrlf) ifTrue:[self unselect. self cursorRight. ^self].
     (key == #Ctrln) ifTrue:[self unselect. self cursorDown. ^self].
     (key == #Ctrlp) ifTrue:[self unselect. self cursorUp. ^self].
+"
 
-    (key == #Ctrla) ifTrue:[self cursorToBeginOfLine. ^self].
-    (key == #Ctrle) ifTrue:[self cursorToEndOfLine. ^self].
+    (key == #BeginOfLine) ifTrue:[self cursorToBeginOfLine. ^self].
+    (key == #EndOfLine) ifTrue:[self cursorToEndOfLine. ^self].
 
     (key == #CursorRight)     ifTrue:[
         self unselect. self cursorRight. ^self