--- a/AbstractSettingsApplication.st Wed Mar 28 19:43:40 2012 +0100
+++ b/AbstractSettingsApplication.st Thu Mar 29 14:52:31 2012 +0100
@@ -13510,9 +13510,10 @@
entry package: dlg package.
entry manager: dlg manager.
entry changed.
+ self updateModifiedChannel.
]
- "Modified: / 09-07-2011 / 16:04:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 29-03-2012 / 11:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
actionMoveDown
@@ -17628,7 +17629,7 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.437 2012/03/20 20:54:16 cg Exp $'
+ ^ '$Id: AbstractSettingsApplication.st 7958 2012-03-29 13:52:31Z vranyj1 $'
!
version_CVS
@@ -17636,5 +17637,5 @@
!
version_SVN
- ^ '$Id: AbstractSettingsApplication.st 7952 2012-03-21 17:50:14Z vranyj1 $'
-! !
+ ^ '$Id: AbstractSettingsApplication.st 7958 2012-03-29 13:52:31Z vranyj1 $'
+! !
--- a/EventMonitor.st Wed Mar 28 19:43:40 2012 +0100
+++ b/EventMonitor.st Thu Mar 29 14:52:31 2012 +0100
@@ -722,5 +722,9 @@
!EventMonitor class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/EventMonitor.st,v 1.30 2009/03/20 17:44:15 stefan Exp $'
+ ^ '$Id: EventMonitor.st 7958 2012-03-29 13:52:31Z vranyj1 $'
+!
+
+version_SVN
+ ^ '$Id: EventMonitor.st 7958 2012-03-29 13:52:31Z vranyj1 $'
! !
--- a/Tools__BrowserListWithFilter.st Wed Mar 28 19:43:40 2012 +0100
+++ b/Tools__BrowserListWithFilter.st Thu Mar 29 14:52:31 2012 +0100
@@ -194,7 +194,8 @@
listView isNil ifTrue:[self breakPoint: #jv].
filterView isNil ifTrue:[self breakPoint: #jv].
- filterView delegate: self
+ filterView delegate: self.
+ self showFilter: showFilterHolder value.
"Created: / 29-11-2011 / 14:47:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -251,7 +252,7 @@
!BrowserListWithFilter class methodsFor:'documentation'!
version
- ^ '$Id: Tools__BrowserListWithFilter.st 7883 2012-02-13 15:19:41Z vranyj1 $'
+ ^ '$Id: Tools__BrowserListWithFilter.st 7958 2012-03-29 13:52:31Z vranyj1 $'
!
version_CVS
@@ -259,5 +260,5 @@
!
version_SVN
- ^ '$Id: Tools__BrowserListWithFilter.st 7883 2012-02-13 15:19:41Z vranyj1 $'
+ ^ '$Id: Tools__BrowserListWithFilter.st 7958 2012-03-29 13:52:31Z vranyj1 $'
! !
--- a/Tools__ChangeSetBrowser2.st Wed Mar 28 19:43:40 2012 +0100
+++ b/Tools__ChangeSetBrowser2.st Thu Mar 29 14:52:31 2012 +0100
@@ -143,9 +143,187 @@
#fileSave
'Save the changeset in a file'
+#applyAll
+'Apply all changes.'
+
+#applyForClassToEnd
+'Apply changes which affect this class to the end.'
+
+#applyFromLastSnapshot
+'Apply changes from the last snapshot to the end.'
+
+#applyLine
+'Apply the selected change.'
+
+#applyToEnd
+'Apply all changes from the selected one to the end.'
+
+#deleteAll
+'Deletes all changes.'
+
+#deleteCompress
+'Deletes all obsolete changes.'
+
+#deleteCompressForClass
+'Deletes obsolete changes for this class, leaving the last one.'
+
+#deleteForClassToEnd
+'Deletes changes for this class from the selection to the end.'
+
+#deleteLine
+'Deletes the selected change.'
+
+#deleteToEnd
+'Deletes changes from the selected one to the end.'
+
+#fileLoad
+'Opens a dialog for selecting and loading another changes file.'
+
+#fileReload
+'Reloads the changes file (undo your modifications).'
+
+#fileSave
+'Saves the list of changes into the current changes file.'
+
+#filterField
+'Matching patterns filtering the changes (separate patterns by blanks).'
+
+#settingsAutoUpdate
+'Toggle automatic update.'
+
+#settingsColumns
+'Configure which columns are shown in the list.'
+
+#settingsColumnsCategory
+'Toggle display of the changes category in the list.'
+
+#settingsColumnsDeltaInfo
+'Toggle display of the delta-info in the list.'
+
+#settingsColumnsPosition
+'Togle display of the changes file-position in the list.'
+
+#settingsColumnsTimeStamp
+'Toggle display of the changes time stamp in the list.'
+
+#settingsColumnsType
+'Toggle display of the change-type in the list.'
+
+#settingsPrivateAsSeparate
+'Toggle if changes for private private are included when applying, deleting, or compressing for a class.'
+
+#testCompareWithCurrentVersion
+'Opens a info dialog showing the difference between the changes code and the method current code.'
+
+#testFindPreviousSnapshot
+'Searches backward for the previous snapshot entry.'
+
+#testFindNextSnapshot
+'Searches forward for the next snapshot entry.'
+
)
"Created: / 27-12-2011 / 10:37:47 / cg"
+ "Modified: / 29-03-2012 / 12:13:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+helpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:NewChangesBrowser
+ "
+
+ <resource: #help>
+
+ ^ super helpSpec addPairsFrom:#(
+
+#applyAll
+'Apply all changes.'
+
+#applyForClassToEnd
+'Apply changes to the end which affect this class.'
+
+#applyFromLastSnapshot
+'Apply changes from the last snapshot to the end.'
+
+#applyLine
+'Apply the selected change.'
+
+#applyToEnd
+'Apply all changes from the selected one to the end.'
+
+#deleteAll
+'Deletes all changes.'
+
+#deleteCompress
+'Deletes all obsolete changes.'
+
+#deleteCompressForClass
+'Deletes obsolete changes for this class, leaving the last one.'
+
+#deleteForClassToEnd
+'Deletes changes for this class from the selection to the end.'
+
+#deleteLine
+'Deletes the selected change.'
+
+#deleteToEnd
+'Deletes changes from the selected one to the end.'
+
+#fileLoad
+'Opens a dialog for selecting and loading another changes file.'
+
+#fileReload
+'Reloads the changes file (undo your modifications).'
+
+#fileSave
+'Saves the list of changes into the current changes file.'
+
+#filterField
+'Matching patterns filtering the changes (separate patterns by blanks).'
+
+#settingsAutoUpdate
+'Toggle automatic update.'
+
+#settingsColumns
+'Configure which columns are shown in the list.'
+
+#settingsColumnsCategory
+'Toggle display of the changes category in the list.'
+
+#settingsColumnsClassName
+'Toggle display of the className in the list.'
+
+#settingsColumnsDeltaInfo
+'Toggle display of the delta-info in the list.'
+
+#settingsColumnsPosition
+'Togle display of the changes file-position in the list.'
+
+#settingsColumnsTimeStamp
+'Toggle display of the changes time stamp in the list.'
+
+#settingsColumnsType
+'Toggle display of the change-type in the list.'
+
+#settingsPrivateAsSeparate
+'Toggle if changes for private private are included when applying, deleting, or compressing for a class.'
+
+#testCompareWithCurrentVersion
+'Opens a info dialog showing the difference between the changes code and the method current code.'
+
+#testFindLastSnapshot
+'Searches backward for the previous snapshot entry.'
+
+#testFindNextSnapshot
+'Searches forward for the next snapshot entry.'
+
+)
! !
!ChangeSetBrowser2 class methodsFor:'image specs'!
@@ -1519,6 +1697,14 @@
translateLabel: true
indication: showSameAspect
)
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Filter'
+ translateLabel: true
+ indication: showFilterHolder
+ )
)
nil
nil
@@ -1557,8 +1743,6 @@
nil
nil
)
-
- "Modified: / 27-12-2011 / 10:35:16 / cg"
!
toolbarMenu
@@ -2278,6 +2462,14 @@
!ChangeSetBrowser2 methodsFor:'menu actions'!
+doApply
+ "Applies currently selected change"
+
+ self halt.
+
+ "Modified: / 29-03-2012 / 12:15:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
doOpen
| file changeset |
@@ -3220,7 +3412,7 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ChangeSetBrowser2.st 7954 2012-03-26 15:34:31Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 7958 2012-03-29 13:52:31Z vranyj1 $'
!
version_CVS
@@ -3228,5 +3420,5 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st 7954 2012-03-26 15:34:31Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 7958 2012-03-29 13:52:31Z vranyj1 $'
! !
--- a/Tools__NewSystemBrowser.st Wed Mar 28 19:43:40 2012 +0100
+++ b/Tools__NewSystemBrowser.st Thu Mar 29 14:52:31 2012 +0100
@@ -288,9 +288,7 @@
^ NewNavigationHistory
"Created: / 03-07-2011 / 13:21:53 / cg"
-!
-
- !
+! !
!NewSystemBrowser class methodsFor:'defaults'!
@@ -16078,6 +16076,7 @@
"Modified: / 29-09-2006 / 16:11:08 / cg"
! !
+
!NewSystemBrowser class methodsFor:'menu specs-popup'!
categoryPopUpMenu
@@ -17858,6 +17857,7 @@
"Created: / 24.2.2000 / 23:28:06 / cg"
! !
+
!NewSystemBrowser methodsFor:'aspects-organization'!
categoryMenuVisible
@@ -21315,6 +21315,7 @@
^ UserPreferences current useSearchBarInBrowser or:[self codeView searchBarActionBlock notNil]
! !
+
!NewSystemBrowser methodsFor:'change & update'!
categorySelectionChanged
@@ -35309,6 +35310,7 @@
"Modified: / 28-02-2012 / 16:27:44 / cg"
! !
+
!NewSystemBrowser methodsFor:'menu actions-namespace'!
nameSpaceMenuCheckOut
@@ -43936,6 +43938,7 @@
"Modified: / 28-02-2012 / 16:48:38 / cg"
! !
+
!NewSystemBrowser methodsFor:'menu actions-variables'!
browseVarRefsOrModsWithTitle:browserTitle boxTitle:boxTitle variables:varType access:accessType all:browseAll
@@ -51035,6 +51038,7 @@
^ navigationState projectListApplication
! !
+
!NewSystemBrowser methodsFor:'private-history'!
lastSearchPatterns
@@ -54224,7 +54228,7 @@
cnfManagerName := self class resources at: 'Not configured'.
].
srcManager notNil ifTrue:[
- srcManagerName := cnfManager managerTypeName
+ srcManagerName := srcManager managerTypeName
] ifFalse:[
srcManagerName := self class resources at: 'Unknown'.
].
@@ -56352,7 +56356,7 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1734 2012/03/16 22:21:13 stefan Exp $'
+ ^ '$Id: Tools__NewSystemBrowser.st 7958 2012-03-29 13:52:31Z vranyj1 $'
!
version_CVS
@@ -56360,7 +56364,7 @@
!
version_SVN
- ^ '$Id: Tools__NewSystemBrowser.st 7952 2012-03-21 17:50:14Z vranyj1 $'
+ ^ '$Id: Tools__NewSystemBrowser.st 7958 2012-03-29 13:52:31Z vranyj1 $'
! !
NewSystemBrowser initialize!