--- a/AbstractSettingsApplication.st Fri Sep 07 12:37:19 2012 +0100
+++ b/AbstractSettingsApplication.st Fri Sep 07 18:28:09 2012 +0100
@@ -362,7 +362,8 @@
showClockInLauncher useNewChangesBrowser useNewFileBrowser
useNewSystemBrowser useNewFileDialog useNewSettingsApplication
useProcessMonitorV2 useSmalltalkDocumentViewer useTestRunner2
- showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus'
+ showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus
+ useNewChangeSetBrowser'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -879,10 +880,11 @@
from:currentUserPrefs.
usedCompilerForBuild value isNil ifTrue:[
- usedCompilerForBuild value:(Tools::ProjectBuilder defaultUsedCompiler)
- ].
-
- "Modified: / 22-01-2012 / 10:59:03 / cg"
+ currentUserPrefs usedCompilerForBuild:(Tools::ProjectBuilder defaultUsedCompiler).
+ usedCompilerForBuild value:(Tools::ProjectBuilder defaultUsedCompiler).
+ ].
+
+ "Modified: / 26-07-2012 / 23:16:52 / cg"
!
basicSaveSettings
@@ -5522,12 +5524,13 @@
serverToStart isEmpty ifTrue:[
^ self
].
+ serverToStart := serverToStart select:[:s | s port notNil].
serverToStart := serverToStart asSortedCollection:[:a :b | a port < b port].
serverToStart do:[:eachServerInstance |
self createServerApplicationFor:eachServerInstance.
]
- "Modified: / 25-01-2007 / 16:40:21 / cg"
+ "Modified: / 26-08-2012 / 10:25:23 / cg"
!
hasServerForPort:newServerPort
@@ -5567,6 +5570,7 @@
instances := serverClass runningServers asSet.
instances addAll:((settingsDialog getAllChildrenAppsForApplication:self)
collect:[:aApp| aApp httpServerInstance]).
+ instances := instances select:[:i | i port notNil].
highestUsedPortNr := instances
inject:(serverClass defaultPort - 1)
into:[:maxSoFar :thisServer | thisServer port max:maxSoFar].
@@ -5577,7 +5581,7 @@
].
self portNumberChannel value:portToUse.
- "Modified: / 25-01-2007 / 16:38:45 / cg"
+ "Modified: / 26-08-2012 / 10:26:20 / cg"
! !
!AbstractSettingsApplication::HTTPStartServerSettingsApplication methodsFor:'aspects'!
@@ -13005,10 +13009,10 @@
'Open a file browser on the source cache directory'
#checkClassesWhenCheckingIn
-'Before checking into the repository, check classes for leftover halt and breakpoint code.'
+'Before checking into the repository, check classes for leftover halt and breakpoint code'
#checkPerPackageManager
-'Open a window to show which scm-manager is responsible for which package.'
+'Open a window to show which scm-manager is responsible for which package'
#condenseSourceCache
'Cleanup old cached versions from the source cache.\Will keep only the current (newest) version in the cache.\Access to older code versions will be slowed down (compare with old version browser function)'
@@ -13026,13 +13030,13 @@
'After first file access, keep the method sources in the image itself.\All following text search operations will be much faster.\Grows the image over time (but who cares, these days)'
#moveManagerDown
-'Move the selected entry down in the list.\(The first matching definition is used to determine which repository type is used.)'
+'Move the selected entry down in the list.\(The first matching definition is used to determine which repository type is used)'
#moveManagerUp
-'Move the selected entry up in the list.\(The first matching definition is used to determine which repository type is used.)'
+'Move the selected entry up in the list.\(The first matching definition is used to determine which repository type is used)'
#perPackageConfiguration
-'Define per-package repository types here.\For any non-matching package-id, the default repository type is used.'
+'Define per-package repository types here.\For any non-matching package-id, the default repository type is used'
#removePerPackageManager
'Remove the selected per-package manager definition'
@@ -13041,7 +13045,7 @@
'After checkout, keep the sourcefile in a local file (to avoid repeated checkout of the same file)'
#useLocalSources
-'If present, use the local source files (from the development system''s tree).\If checkout fails, these will always be tried as second chance.'
+'If present, use the local source files (from the development system''s tree).\If checkout fails, these will always be tried as second chance'
#useManager
'Enable source code management.\If off, all queries for sourcecode are resolved by local files (offline operation)'
@@ -13051,7 +13055,7 @@
)
- "Modified: / 22-12-2011 / 11:14:45 / cg"
+ "Modified: / 09-08-2012 / 09:41:28 / cg"
! !
!AbstractSettingsApplication::SourceCodeManagementSettingsAppl class methodsFor:'image specs'!
@@ -13445,7 +13449,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
@@ -13624,6 +13628,7 @@
basicReadSettings
self initialize.
+ self verboseSourceCodeAccess value:(AbstractSourceCodeManager verboseSourceCodeAccess).
self keepMethodSource value:(currentUserPrefs keepMethodSourceCode).
self hasManager ifTrue:[
@@ -13663,13 +13668,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).
@@ -13736,8 +13742,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
@@ -14271,7 +14277,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|
@@ -14290,8 +14299,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'!
@@ -17217,7 +17226,7 @@
^ super flyByHelpSpec addPairsFrom:#(
#autoRaiseTranscript
-'Autoraise the Transcript window when messages are added.'
+'Autoraise the Transcript window when messages are added'
#useNewFileBrowser
'Use the new, improved FileBrowser (as opposed to the simpler, older version)'
@@ -17244,7 +17253,7 @@
'Use different menu layout in some tools, useful if you are used to the eclipse IDE'
)
- "Modified: / 28-02-2012 / 21:27:27 / cg"
+ "Modified: / 09-08-2012 / 09:34:41 / cg"
! !
!AbstractSettingsApplication::ToolsSettingsAppl class methodsFor:'image specs'!
@@ -17316,6 +17325,7 @@
label: 'Use the New System Browser'
name: 'NewSystemBrowser'
activeHelpKey: useNewSystemBrowser
+ visibilityChannel: false
model: useNewSystemBrowser
translateLabel: true
extent: (Point 607 25)
@@ -17324,6 +17334,7 @@
label: 'Use the New File Browser'
name: 'NewFileBrowser'
activeHelpKey: useNewFileBrowser
+ visibilityChannel: false
model: useNewFileBrowser
translateLabel: true
extent: (Point 607 25)
@@ -17345,6 +17356,7 @@
(CheckBoxSpec
label: 'Use the New Settings Dialog'
name: 'UseNewSettinsApplicationCheckBox'
+ visibilityChannel: false
model: useNewSettingsApplication
translateLabel: true
extent: (Point 607 25)
@@ -17364,19 +17376,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'
@@ -17393,10 +17412,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'
@@ -17483,30 +17502,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:[
@@ -17514,7 +17537,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
@@ -17525,18 +17548,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:[
@@ -17591,7 +17603,7 @@
]
].
- "Modified: / 08-07-2011 / 13:42:06 / cg"
+ "Modified: / 27-07-2012 / 20:51:46 / cg"
! !
!AbstractSettingsApplication::ToolsSettingsAppl methodsFor:'aspects'!
@@ -17645,6 +17657,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.
@@ -17752,22 +17775,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:[
@@ -17776,19 +17784,19 @@
].
^ 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.440 2012/06/21 09:04:30 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.444 2012/08/26 17:26:11 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.440 2012/06/21 09:04:30 stefan Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.444 2012/08/26 17:26:11 cg Exp §'
!
version_SVN
- ^ '$Id: AbstractSettingsApplication.st 8018 2012-07-18 17:00:57Z vranyj1 $'
-! !
+ ^ '$Id: AbstractSettingsApplication.st 8048 2012-09-07 17:28:09Z vranyj1 $'
+! !