checkin from browser
authorClaus Gittinger <cg@exept.de>
Fri, 26 Feb 1999 01:02:39 +0100
changeset 2041 52cd1ca19280
parent 2040 06dd0e21aae0
child 2042 ccbf16071e41
checkin from browser
AbstractLauncherApplication.st
NewLauncher.st
--- a/AbstractLauncherApplication.st	Fri Feb 26 00:06:36 1999 +0100
+++ b/AbstractLauncherApplication.st	Fri Feb 26 01:02:39 1999 +0100
@@ -86,43 +86,47 @@
 
     knownTopViews := IdentitySet new.
     Screen allScreens do:[:aScreen |
-	aScreen knownViews do:[:aView |
-	    |top showIt wg|
-
-	    aView notNil ifTrue:[
-		top := aView topView.
-		(top isKindOf:DebugView) ifTrue:[
-		    "/ although modal, show it.
-		    showIt := top realized
-		] ifFalse:[
-		    wg := top windowGroup.
-		    showIt := (wg notNil and:[wg isModal not]).
-		].
-		showIt ifTrue:[
-		    knownTopViews add:top
-		]
-	    ]
-	]
+        aScreen knownViews do:[:aView |
+            |top showIt wg|
+
+            aView notNil ifTrue:[
+                top := aView topView.
+                (top isKindOf:DebugView) ifTrue:[
+                    "/ although modal, show it.
+                    showIt := top realized
+                ] ifFalse:[
+                    wg := top windowGroup.
+                    showIt := (wg notNil and:[wg isModal not]).
+                ].
+                showIt ifTrue:[
+                    knownTopViews add:top
+                ]
+            ]
+        ]
     ].
 
     knownTopViews := knownTopViews asOrderedCollection.
     knownTopViews sort:[:v1 :v2 | |l1 l2|
-				l1 := v1 label ? 'aView'.
-				l2 := v2 label ? 'aView'.
-				l1 < l2
-		       ].
+                                l1 := v1 label ? 'aView'.
+                                l2 := v2 label ? 'aView'.
+                                l1 < l2
+                       ].
+
     nameList := knownTopViews collect:[:v | 
-					|isDead wg p l|
-
-					l := v label ? 'aView'.
-					((wg := v windowGroup) notNil
-					and:[(p := wg process) notNil
-					and:[p state ~~ #dead]]) ifTrue:[
-					    l  
-					] ifFalse:[
-					    l , ' (dead ?)'
-					]
-				      ].
+                                        |isDead wg p l|
+
+                                        l := v label ? 'aView'.
+                                        v device == Display ifFalse:[
+                                            l := l , ' [' , (v device displayName ? '?') , ']'
+                                        ].
+                                        ((wg := v windowGroup) notNil
+                                        and:[(p := wg process) notNil
+                                        and:[p state ~~ #dead]]) ifTrue:[
+                                            l  
+                                        ] ifFalse:[
+                                            l , ' (dead ?)'
+                                        ]
+                                      ].
 
     box := ListSelectionBox new.
     box noEnterField.
@@ -130,11 +134,11 @@
     box label:(resources string:'view selection').
     box title:(resources string:title) withCRs.
     box action:[:selection |
-	|v|
-
-	v := knownTopViews at:box selectionIndex.
-	box destroy.
-	^ v
+        |v|
+
+        v := knownTopViews at:box selectionIndex.
+        box destroy.
+        ^ v
     ].
     box extent:400@300.
     box showAtPointer.
@@ -657,7 +661,10 @@
         ].
         remoteDisplay startDispatch.
         remoteDisplay keyboardMap:(Screen current keyboardMap).
-        self class openOnDevice:remoteDisplay.
+        DeviceWorkstation currentScreenQuerySignal answer:remoteDisplay
+        do:[
+            self class open.
+        ]
     ].
 
     "Created: / 10.9.1998 / 11:48:42 / cg"
@@ -4268,5 +4275,5 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.11 1999-02-25 23:06:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.12 1999-02-26 00:02:39 cg Exp $'
 ! !
--- a/NewLauncher.st	Fri Feb 26 00:06:36 1999 +0100
+++ b/NewLauncher.st	Fri Feb 26 01:02:39 1999 +0100
@@ -1082,6 +1082,7 @@
                           #label: 'Tools...'
                           #translateLabel: true
                           #value: #toolSettings
+                          #enabled: #enableDangerousMenuItemsInRemoteLauncher
                       )
                        #(#MenuItem
                           #label: 'Java...'
@@ -1132,6 +1133,7 @@
                           #translateLabel: true
                           #value: #saveSettings
                           #activeHelpKey: #settingsSaveSettings
+                          #enabled: #enableDangerousMenuItemsInRemoteLauncher
                       )
                        #(#MenuItem
                           #label: 'Load Settings...'
@@ -1209,12 +1211,14 @@
                           #translateLabel: true
                           #value: #findAndRaiseWindow
                           #activeHelpKey: #windowsFindAndRaise
+                          #enabled: #enableDangerousMenuItemsInRemoteLauncher
                       )
                        #(#MenuItem
                           #label: 'Find And Destroy...'
                           #translateLabel: true
                           #value: #findAndDestroyWindow
                           #activeHelpKey: #windowsFindAndDestroy
+                          #enabled: #enableDangerousMenuItemsInRemoteLauncher
                       )
                        #(#MenuItem
                           #label: '-'
@@ -1714,8 +1718,6 @@
           ) nil
           nil
       )
-
-    "Modified: / 6.1.1999 / 14:13:30 / cg"
 !
 
 menuToolbar
@@ -1758,6 +1760,7 @@
                 #isButton: true
                 #value: #saveImageAs
                 #activeHelpKey: #fileSaveImageAs
+                #enabled: #enableDangerousMenuItemsInRemoteLauncher
                 #labelImage: #(#ResourceRetriever nil #saveImageIcon)
             )
              #(#MenuItem
@@ -1834,8 +1837,6 @@
           ) nil
           nil
       )
-
-    "Modified: / 13.10.1998 / 15:59:17 / cg"
 ! !
 
 !NewLauncher class methodsFor:'resources'!
@@ -2625,7 +2626,7 @@
 redrawAllWindows
     |setOfViews|
 
-    setOfViews := Screen current knownViews.
+    setOfViews := device knownViews.
 
     setOfViews do:[:aView |
         aView shown ifTrue:[
@@ -2658,5 +2659,5 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.130 1999-02-25 23:05:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.131 1999-02-26 00:02:27 cg Exp $'
 ! !