--- a/AbstractLauncherApplication.st Tue Jan 21 16:17:38 2003 +0100
+++ b/AbstractLauncherApplication.st Tue Jan 21 16:53:25 2003 +0100
@@ -4821,7 +4821,7 @@
|box resources currentUserPrefs in acceptChannel
useNewInspector useNewChangesBrowser useNewSystemBrowser useNewVersionDiffBrowser
useNewFileBrowser showClockInLauncher showClock launcher
- transcriptBufferSize useNewFileDialog useNewSettingsApplication|
+ transcriptBufferSize useNewFileDialog useNewSettingsApplication useProcessMonitorV2|
currentUserPrefs := UserPreferences current.
@@ -4838,6 +4838,7 @@
useNewFileBrowser := currentUserPrefs useNewFileBrowser asValue.
useNewFileDialog := currentUserPrefs useNewFileDialog asValue.
useNewSettingsApplication := currentUserPrefs useNewSettingsApplication asValue.
+ useProcessMonitorV2 := currentUserPrefs useProcessMonitorV2 asValue.
transcriptBufferSize := Transcript current lineLimit printString asValue.
acceptChannel := false asValue.
@@ -4867,6 +4868,10 @@
box addCheckBox:(resources string:'Use the New Settings Dialog') on:useNewSettingsApplication.
box addHorizontalLine.
].
+ (Smalltalk at:#ProcessMonitorV2) isBehavior ifTrue:[
+ box addCheckBox:(resources string:'Use the New ProcessMonitor') on:useProcessMonitorV2.
+ box addHorizontalLine.
+ ].
box addCheckBox:(resources string:'Use Hierarchical Inspector') on:useNewInspector.
box addHorizontalLine.
box addCheckBox:(resources string:'Show Clock in Launcher') on:showClockInLauncher.
@@ -4901,6 +4906,7 @@
currentUserPrefs useNewVersionDiffBrowser:useNewVersionDiffBrowser value.
currentUserPrefs useNewFileBrowser:useNewFileBrowser value.
currentUserPrefs useNewFileDialog:useNewFileDialog value.
+ currentUserPrefs useProcessMonitorV2:useProcessMonitorV2 value.
currentUserPrefs useNewSettingsApplication ~= useNewSettingsApplication value ifTrue:[
currentUserPrefs useNewSettingsApplication:useNewSettingsApplication value.
NewLauncher open.
@@ -6680,5 +6686,5 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.251 2003-01-20 16:09:56 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.252 2003-01-21 15:53:25 penk Exp $'
! !
--- a/AbstractSettingsApplication.st Tue Jan 21 16:17:38 2003 +0100
+++ b/AbstractSettingsApplication.st Tue Jan 21 16:53:25 2003 +0100
@@ -221,7 +221,7 @@
instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
showClockInLauncher useNewChangesBrowser useNewFileBrowser
useNewSystemBrowser currentUserPrefs modifiedChannel
- useNewFileDialog useNewSettingsApplication'
+ useNewFileDialog useNewSettingsApplication useProcessMonitorV2'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -10700,7 +10700,7 @@
#collection: #(
#(#VerticalPanelViewSpec
#name: 'VerticalPanel2'
- #layout: #(#LayoutFrame 0 0 0 0 358 0 208 0)
+ #layout: #(#LayoutFrame 0 0 0 0 358 0 234 0)
#horizontalLayout: #left
#verticalLayout: #top
#horizontalSpace: 3
@@ -10751,6 +10751,13 @@
#extent: #(#Point 489 25)
)
#(#CheckBoxSpec
+ #label: 'Use the New Process Monitor'
+ #name: 'UseNewProcessMonitor'
+ #model: #useProcessMonitorV2
+ #translateLabel: true
+ #extent: #(#Point 489 25)
+ )
+ #(#CheckBoxSpec
#label: 'Use Hierarchical Inspector'
#name: 'HierarchicalInspector'
#model: #useNewInspector
@@ -10825,6 +10832,7 @@
self useNewInspector value:currentUserPrefs useNewInspector.
self useNewSystemBrowser value:currentUserPrefs useNewSystemBrowser.
self useNewVersionDiffBrowser value:currentUserPrefs useNewVersionDiffBrowser.
+ self useProcessMonitorV2 value:currentUserPrefs useProcessMonitorV2.
self useNewFileDialog value:currentUserPrefs useNewFileDialog.
self useNewSettingsApplication value:currentUserPrefs useNewSettingsApplication.
self modifiedChannel value:false.
@@ -10840,6 +10848,7 @@
currentUserPrefs useNewSystemBrowser:self useNewSystemBrowser value.
currentUserPrefs useNewVersionDiffBrowser:self useNewVersionDiffBrowser value.
currentUserPrefs useNewFileDialog:self useNewFileDialog value.
+ currentUserPrefs useProcessMonitorV2:self useProcessMonitorV2 value.
currentUserPrefs useNewSettingsApplication ~= self useNewSettingsApplication value ifTrue:[
currentUserPrefs useNewSettingsApplication:self useNewSettingsApplication value.
reopenLauncher := true.
@@ -10968,6 +10977,15 @@
useNewVersionDiffBrowser onChangeSend:#evaluateModified to:self
].
^ useNewVersionDiffBrowser.
+!
+
+useProcessMonitorV2
+
+ useProcessMonitorV2 isNil ifTrue:[
+ useProcessMonitorV2 := currentUserPrefs useProcessMonitorV2 asValue.
+ useProcessMonitorV2 onChangeSend:#evaluateModified to:self
+ ].
+ ^ useProcessMonitorV2.
! !
!AbstractSettingsApplication::ToolsSettingsAppl methodsFor:'initialization & release'!
@@ -10992,11 +11010,12 @@
(self useNewFileBrowser value ~= currentUserPrefs useNewFileBrowser) or:[
(self useNewFileDialog value ~= currentUserPrefs useNewFileDialog) or:[
(self useNewSettingsApplication value ~= currentUserPrefs useNewSettingsApplication) or:[
- (self transcriptBufferSize value ~= Transcript current lineLimit)]]]]]]]])
+ (self useProcessMonitorV2 value ~= currentUserPrefs useProcessMonitorV2) or:[
+ (self transcriptBufferSize value ~= Transcript current lineLimit)]]]]]]]]])
! !
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.23 2003-01-20 16:10:48 penk Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.24 2003-01-21 15:52:56 penk Exp $'
+! !
--- a/NewLauncher.st Tue Jan 21 16:17:38 2003 +0100
+++ b/NewLauncher.st Tue Jan 21 16:53:25 2003 +0100
@@ -2419,9 +2419,8 @@
#(#MenuItem
#activeHelpKey: #systemProcesses
#label: 'Processes'
- #itemValue: #openApplication:
+ #itemValue: #startProcessMonitor
#translateLabel: true
- #argument: 'ProcessMonitor'
)
#(#MenuItem
#activeHelpKey: #systemSemaphores
@@ -2431,19 +2430,19 @@
#argument: 'SemaphoreMonitor'
)
#(#MenuItem
- #label: 'Modules...'
- #translateLabel: true
- #value: #objectModuleDialog
#activeHelpKey: #fileModules
#enabled: #enableDangerousMenuItemsInRemoteLauncher
+ #label: 'Modules...'
+ #itemValue: #objectModuleDialog
+ #translateLabel: true
)
#(#MenuItem
+ #activeHelpKey: #filePackages
+ #enabled: #enableDangerousMenuItemsInRemoteLauncher
#label: 'Packages...'
+ #itemValue: #packageDialog
#translateLabel: true
#isVisible: #packageDialogVisible
- #value: #packageDialog
- #activeHelpKey: #filePackages
- #enabled: #enableDangerousMenuItemsInRemoteLauncher
)
#(#MenuItem
#label: '-'
@@ -4076,6 +4075,16 @@
self warn:'Sorry - the irq latency monitor is not available
in this release'.
+!
+
+startProcessMonitor
+ "open an ProcessMonitor view"
+
+ UserPreferences current useProcessMonitorV2 ifTrue:[
+ self openApplication:'ProcessMonitorV2'.
+ ] ifFalse:[
+ self openApplication:'ProcessMonitor'.
+ ]
! !
!NewLauncher methodsFor:'user actions - windows'!
@@ -4177,5 +4186,5 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.284 2003-01-17 10:59:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.285 2003-01-21 15:52:29 penk Exp $'
! !