--- a/AbstractSettingsApplication.st Sat Jul 28 01:27:04 2012 +0200
+++ b/AbstractSettingsApplication.st Sat Jul 28 08:56:19 2012 +0200
@@ -346,7 +346,8 @@
showClockInLauncher useNewChangesBrowser useNewFileBrowser
useNewSystemBrowser useNewFileDialog useNewSettingsApplication
useProcessMonitorV2 useSmalltalkDocumentViewer useTestRunner2
- showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus'
+ showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus
+ useNewChangeSetBrowser'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -13430,7 +13431,7 @@
(SpecCollection
collection: (
(CheckBoxSpec
- label: 'Verbose (Trace Access on Transcript)'
+ label: 'Verbose (Trace Operations on Transcript)'
name: 'CheckBox6'
layout: (LayoutFrame 30 0 0 0 -5 1 23 0)
activeHelpKey: verboseSourceCodeAccess
@@ -13608,6 +13609,7 @@
basicReadSettings
self initialize.
+ self verboseSourceCodeAccess value:(AbstractSourceCodeManager verboseSourceCodeAccess).
self keepMethodSource value:(currentUserPrefs keepMethodSourceCode).
self hasManager ifTrue:[
@@ -13647,13 +13649,14 @@
].
"/ self selectedPerModuleRootChanged.
- "Modified: / 18-04-2011 / 21:17:01 / cg"
"Modified: / 09-07-2011 / 14:00:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 27-07-2012 / 12:36:19 / cg"
!
basicSaveSettings
|modules|
+ AbstractSourceCodeManager verboseSourceCodeAccess:(self verboseSourceCodeAccess value).
currentUserPrefs at:#checkClassesWhenCheckingIn put:self checkClassesWhenCheckingIn value.
Class tryLocalSourceFirst:self localSourceFirst value.
currentUserPrefs keepMethodSourceCode:(self keepMethodSource value).
@@ -13720,8 +13723,8 @@
self acceptChannel value.
- "Modified: / 18-04-2011 / 21:22:14 / cg"
"Modified: / 09-07-2011 / 14:02:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 27-07-2012 / 12:36:44 / cg"
!
browseSourceCache
@@ -14255,7 +14258,10 @@
ifTrue:[^ true].
((AbstractSourceCodeManager managerPerMatchingModuleDefinitions)
- ~= (self managerPerMatchingModule asOrderedCollection)) ifTrue:[^ true].
+ ~= (self managerPerMatchingModule asOrderedCollection)) ifTrue:[^ true].
+
+ (AbstractSourceCodeManager verboseSourceCodeAccess
+ ~= self verboseSourceCodeAccess value) ifTrue:[^ true].
self availableManagers do:[:mgr |
|modules|
@@ -14274,8 +14280,8 @@
^ false
- "Modified: / 18-04-2011 / 21:22:18 / cg"
"Modified: / 09-07-2011 / 14:09:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 27-07-2012 / 12:35:40 / cg"
! !
!AbstractSettingsApplication::SourceCodeManagementSettingsAppl::PerModuleManagerSettingDialog class methodsFor:'help specs'!
@@ -16625,6 +16631,7 @@
label: 'Use the New System Browser'
name: 'NewSystemBrowser'
activeHelpKey: useNewSystemBrowser
+ visibilityChannel: false
model: useNewSystemBrowser
translateLabel: true
extent: (Point 607 25)
@@ -16633,6 +16640,7 @@
label: 'Use the New File Browser'
name: 'NewFileBrowser'
activeHelpKey: useNewFileBrowser
+ visibilityChannel: false
model: useNewFileBrowser
translateLabel: true
extent: (Point 607 25)
@@ -16654,6 +16662,7 @@
(CheckBoxSpec
label: 'Use the New Settings Dialog'
name: 'UseNewSettinsApplicationCheckBox'
+ visibilityChannel: false
model: useNewSettingsApplication
translateLabel: true
extent: (Point 607 25)
@@ -16673,19 +16682,26 @@
extent: (Point 607 25)
)
(CheckBoxSpec
- label: 'Use the New Changes Browser (not yet recommended)'
+ label: 'Use the New Changes Browser for Changefiles (not yet recommended)'
name: 'ChangesBrowser'
model: useNewChangesBrowser
translateLabel: true
extent: (Point 607 25)
)
(CheckBoxSpec
+ label: 'Use the New ChangeSet Browser for Internal ChangeSets'
+ name: 'CheckBox5'
+ model: useNewChangeSetBrowser
+ translateLabel: true
+ extent: (Point 607 25)
+ )
+ (CheckBoxSpec
label: 'Use Hierarchical Inspector (not yet recommended)'
name: 'HierarchicalInspector'
+ activeHelpKey: useHierarchicalInspector
model: useNewInspector
translateLabel: true
extent: (Point 607 25)
- activeHelpKey: useHierarchicalInspector
)
(CheckBoxSpec
label: 'Use the Smalltalk Document Viewer'
@@ -16702,10 +16718,10 @@
(CheckBoxSpec
label: 'Show "Tip Of The Day" at Startup'
name: 'CheckBox1'
+ activeHelpKey: showDidYouKnowTips
model: showTipOfTheDayAtStartup
translateLabel: true
extent: (Point 607 25)
- activeHelpKey: showDidYouKnowTips
)
(CheckBoxSpec
label: 'Show Clock in Launcher'
@@ -16792,30 +16808,34 @@
)
)
-
- "Modified: / 28-02-2012 / 21:26:54 / cg"
! !
!AbstractSettingsApplication::ToolsSettingsAppl methodsFor:'actions'!
+aspects
+ ^ #(
+ #eclipseStyleMenus
+ #useTestRunner2
+ #useNewInspector
+ #useNewChangesBrowser
+ #useNewChangeSetBrowser
+ "/ #useNewSystemBrowser -- no longer an option
+ #useNewVersionDiffBrowser
+ "/ #useNewFileBrowser -- no longer an option
+ #useNewFileDialog
+ "/ #useNewSettingsApplication -- no longer an option
+ #useProcessMonitorV2
+ #useSmalltalkDocumentViewer
+ #showClockInLauncher
+ #showTipOfTheDayAtStartup
+ )
+
+ "Created: / 27-07-2012 / 20:48:18 / cg"
+!
+
basicReadSettings
self
- readAspects:
- #(
- eclipseStyleMenus
- useTestRunner2
- useNewInspector
- useNewChangesBrowser
- useNewSystemBrowser
- useNewVersionDiffBrowser
- useNewFileBrowser
- useNewFileDialog
- useNewSettingsApplication
- useProcessMonitorV2
- useSmalltalkDocumentViewer
- showClockInLauncher
- showTipOfTheDayAtStartup
- )
+ readAspects: (self aspects)
from:currentUserPrefs.
Transcript current isExternalStream ifFalse:[
@@ -16823,7 +16843,7 @@
self autoRaiseTranscript value:Transcript current autoRaise.
].
- "Modified: / 08-07-2011 / 13:42:03 / cg"
+ "Modified (format): / 27-07-2012 / 20:51:39 / cg"
!
basicSaveSettings
@@ -16834,18 +16854,7 @@
newSystemBrowserClass := Tools::NewSystemBrowser ? NewSystemBrowser.
self
- writeAspects:
- #(
- eclipseStyleMenus
- useTestRunner2
- useNewInspector
- useNewChangesBrowser
- useNewVersionDiffBrowser
- useNewFileDialog
- useProcessMonitorV2
- useSmalltalkDocumentViewer
- showTipOfTheDayAtStartup
- )
+ writeAspects:(self aspects)
to:currentUserPrefs.
currentUserPrefs useNewSettingsApplication ~= self useNewSettingsApplication value ifTrue:[
@@ -16900,7 +16909,7 @@
]
].
- "Modified: / 08-07-2011 / 13:42:06 / cg"
+ "Modified: / 27-07-2012 / 20:51:46 / cg"
! !
!AbstractSettingsApplication::ToolsSettingsAppl methodsFor:'aspects'!
@@ -16954,6 +16963,17 @@
^ transcriptBufferSize.
!
+useNewChangeSetBrowser
+ useNewChangeSetBrowser isNil ifTrue:[
+ useNewChangeSetBrowser := false asValue.
+ useNewChangeSetBrowser onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ useNewChangeSetBrowser.
+
+ "Modified: / 21-09-2006 / 00:39:37 / cg"
+ "Created: / 27-07-2012 / 20:45:41 / cg"
+!
+
useNewChangesBrowser
useNewChangesBrowser isNil ifTrue:[
useNewChangesBrowser := false asValue.
@@ -17061,22 +17081,7 @@
hasUnsavedChanges
(self
- hasChangedAspectIn:
- #(
- eclipseStyleMenus
- useTestRunner2
- useNewInspector
- useNewChangesBrowser
- useNewSystemBrowser
- useNewVersionDiffBrowser
- useNewFileBrowser
- useNewFileDialog
- useNewSettingsApplication
- useProcessMonitorV2
- useSmalltalkDocumentViewer
- showClockInLauncher
- showTipOfTheDayAtStartup
- )
+ hasChangedAspectIn:(self aspects)
asComparedTo:currentUserPrefs) ifTrue:[^ true].
Transcript current isExternalStream ifFalse:[
@@ -17085,15 +17090,15 @@
].
^ false.
- "Modified: / 08-07-2011 / 13:42:46 / cg"
+ "Modified: / 27-07-2012 / 20:51:56 / cg"
! !
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.441 2012-07-26 22:10:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.442 2012-07-28 06:56:19 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.441 2012-07-26 22:10:56 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.442 2012-07-28 06:56:19 cg Exp $'
+! !