--- a/Tools__ChangeSetDiffTool.st Sun Jan 29 12:56:58 2012 +0000
+++ b/Tools__ChangeSetDiffTool.st Sun Jan 29 15:33:37 2012 +0000
@@ -23,7 +23,7 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
"
-"{ Package: 'stx:libbasic3' }"
+"{ Package: 'stx:libtool' }"
"{ NameSpace: Tools }"
@@ -462,6 +462,12 @@
resizeForLabel: true
adjust: left
)
+ (LabelSpec
+ label: '(A)'
+ name: 'ALabel'
+ layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+ translateLabel: true
+ )
)
)
@@ -515,10 +521,18 @@
useDynamicPreferredWidth: true
usePreferredWidth: true
)
+ (LabelSpec
+ label: '(B)'
+ name: 'BLabel'
+ layout: (LayoutFrame -30 1 0 0 0 1 0 1)
+ translateLabel: true
+ )
)
)
)
+
+ "Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetDiffTool class methodsFor:'menu specs'!
@@ -584,9 +598,10 @@
"Do not manually edit this!! If it is corrupted,
the MenuEditor may not be able to read the specification."
+
"
- MenuEditor new openOnClass:SVN::DiffBrowser andSelector:#mainMenu
- (Menu new fromLiteralArrayEncoding:(SVN::DiffBrowser mainMenu)) startUp
+ MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu
+ (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp
"
<resource: #menu>
@@ -626,6 +641,28 @@
)
)
(MenuItem
+ label: 'Changeset'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ label: 'Browse changes (A)'
+ itemValue: changesetMenuBrowseA
+ translateLabel: true
+ )
+ (MenuItem
+ label: 'Browse changes (B)'
+ itemValue: changesetMenuBrowseB
+ translateLabel: true
+ )
+
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
label: 'Diff'
translateLabel: true
submenuChannel: listMenu
@@ -634,6 +671,8 @@
nil
nil
)
+
+ "Modified: / 16-12-2011 / 14:24:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetDiffTool class methodsFor:'plugIn spec'!
@@ -834,12 +873,14 @@
!
listMenuHolder
- diffMenuHolder
- ifNil:[ diffMenuHolder := ValueHolder with:(Menu decodeFromLiteralArray: self class listMenu) ].
+ diffMenuHolder isNil ifTrue:[
+ diffMenuHolder := ValueHolder with:(Menu decodeFromLiteralArray: self class listMenu)
+ ].
^ diffMenuHolder
"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 09-12-2009 / 23:34:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-11-2011 / 14:57:47 / cg"
!
nameAspect
@@ -906,12 +947,13 @@
versionATextHolder
- versionATextHolder ifNil:[
+ versionATextHolder isNil ifTrue:[
versionATextHolder := ValueHolder new
].
^versionATextHolder
"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-11-2011 / 14:57:56 / cg"
!
versionBLabelHolder
@@ -924,12 +966,13 @@
versionBTextHolder
- versionBTextHolder ifNil:[
+ versionBTextHolder isNil ifTrue:[
versionBTextHolder := ValueHolder new
].
^versionBTextHolder
"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 18-11-2011 / 14:57:59 / cg"
! !
!ChangeSetDiffTool methodsFor:'change & update'!
@@ -1023,6 +1066,27 @@
!ChangeSetDiffTool methodsFor:'menu actions'!
+changesetMenuBrowse: changeset
+
+ Tools::ChangeSetBrowser2 openOn: changeset
+
+ "Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+changesetMenuBrowseA
+
+ self changesetMenuBrowse: self diffsetHolder value changesetA
+
+ "Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+changesetMenuBrowseB
+
+ self changesetMenuBrowse: self diffsetHolder value changesetB
+
+ "Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
fileMenuOpen
| dlg a b |
@@ -1053,6 +1117,34 @@
"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+listMenuBrowse
+
+ | items |
+ items := self selection collect:[:e|e]. "/must do collect as selection is an iterator..."
+ items size == 1 ifTrue:[
+ | item cls sel |
+ item:= items anElement.
+ cls := item changeClass.
+ sel := item changeSelector.
+ cls notNil ifTrue:[
+ sel notNil ifTrue:[
+ UserPreferences current systemBrowserClass
+ openInClass:cls selector:sel
+
+ ] ifFalse:[
+ UserPreferences current systemBrowserClass
+ browseClass: cls
+ ]
+ ] ifFalse:[
+ Dialog warn: (self class resources at: 'Oops, class is gone')
+ ]
+ ] ifFalse:[
+ Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'.
+ ]
+
+ "Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
listMenuInspect
(self selection collect:[:e|e]) inspect
@@ -1449,9 +1541,9 @@
!ChangeSetDiffTool class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.1 2011/07/06 12:02:32 vrany Exp §'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §'
!
version_SVN
- ^ '$Id: Tools__ChangeSetDiffTool.st 7810 2011-08-12 14:54:02Z vranyj1 $'
-! !
\ No newline at end of file
+ ^ '$Id: Tools__ChangeSetDiffTool.st 7851 2012-01-29 15:33:37Z vranyj1 $'
+! !