Tools__ChangeSetBrowser2.st
changeset 13969 ef8a4e6cbfd7
parent 13938 36bb57e60766
child 14083 8fe49737a951
--- a/Tools__ChangeSetBrowser2.st	Wed Feb 19 13:50:25 2014 +0100
+++ b/Tools__ChangeSetBrowser2.st	Wed Feb 19 14:19:40 2014 +0100
@@ -37,7 +37,7 @@
 		allowAcceptHolder infoPanel updateChangeFileHolder
 		showFilterHolder showingRegularChangesetHolder isWorkingHolder
 		isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
-		targetNameSpaceName'
+		targetNameSpaceName showDefinitionsOnlyAspect'
 	classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages'
 	poolDictionaries:''
 	category:'Interface-Browsers-ChangeSet'
@@ -814,6 +814,10 @@
                   subAspect: showConflictsOnlyHolder
                   aspect: showConflictsOnlyAspect
                 )
+               (SubChannelInfoSpec
+                  subAspect: showDefinitionsOnlyHolder
+                  aspect: showDefinitionsOnlyAspect
+                )
               )
               createNewApplication: true
               createNewBuilder: true
@@ -906,6 +910,11 @@
                   aspect: showConflictsOnlyAspect
 
                 )
+               (SubChannelInfoSpec
+                  subAspect: showDefinitionsOnlyHolder
+                  aspect: showDefinitionsOnlyAspect
+
+                )
               )
               createNewApplication: true
               createNewBuilder: true
@@ -1008,6 +1017,10 @@
                       subAspect: showConflictsOnlyHolder
                       aspect: showConflictsOnlyAspect
                     )
+                   (SubChannelInfoSpec
+                      subAspect: showDefinitionsOnlyHolder
+                      aspect: showDefinitionsOnlyAspect
+                    )
                     )
                     createNewApplication: true
                     createNewBuilder: true
@@ -1065,6 +1078,10 @@
                       subAspect: showConflictsOnlyHolder
                       aspect: showConflictsOnlyAspect
                     )
+                   (SubChannelInfoSpec
+                      subAspect: showDefinitionsOnlyHolder
+                      aspect: showDefinitionsOnlyAspect
+                    )
 
                     )
                     createNewApplication: true
@@ -1371,21 +1388,27 @@
             label: '-'
           )
          (MenuItem
-            enabled: notShowConflictsOnlyAspect
+            enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
             label: 'Show Deleted'
             isVisible: allowRemoveHolder
             indication: showRemovedAspect
           )
          (MenuItem
-            enabled: notShowConflictsOnlyAspect
+            enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
             label: 'Show Same'
             indication: showSameAspect
           )
          (MenuItem
+            enabled: notShowDefinitionsOnlyAspect
             label: 'Show Conflicts Only'
             indication: showConflictsOnlyAspect
           )
          (MenuItem
+            enabled: notShowConflictsOnlyAspect
+            label: 'Show Definitions Only'
+            indication: showDefinitionsOnlyAspect
+          )
+         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -1558,16 +1581,19 @@
               (
                (MenuItem
                   label: 'List'
+                  hideMenuOnActivated: false
                   choice: navigatorSpecHolder
                   choiceValue: oneColumnNavigatorSpec
                 )
                (MenuItem
                   label: 'Hierarchical List'
+                  hideMenuOnActivated: false
                   choice: navigatorSpecHolder
                   choiceValue: hierarchicalNavigatorSpec
                 )
                (MenuItem
                   label: 'Browser Like'
+                  hideMenuOnActivated: false
                   choice: navigatorSpecHolder
                   choiceValue: twoColumnNavigatorSpec
                 )
@@ -1575,24 +1601,35 @@
                   label: '-'
                 )
                (MenuItem
-                  enabled: notShowConflictsOnlyAspect
+                  enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
                   label: 'Show Deleted'
+                  hideMenuOnActivated: false
                   indication: showRemovedAspect
                 )
                (MenuItem
+                  enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
+                  label: 'Show Same'
+                  hideMenuOnActivated: false
+                  indication: showSameAspect
+                )
+               (MenuItem
+                  enabled: notShowDefinitionsOnlyAspect
+                  label: 'Show Conflicts Only'
+                  hideMenuOnActivated: false
+                  indication: showConflictsOnlyAspect
+                )
+               (MenuItem
                   enabled: notShowConflictsOnlyAspect
-                  label: 'Show Same'
-                  indication: showSameAspect
-                )
-               (MenuItem
-                  label: 'Show Conflicts Only'
-                  indication: showConflictsOnlyAspect
+                  label: 'Show Definitions Only'
+                  hideMenuOnActivated: false
+                  indication: showDefinitionsOnlyAspect
                 )
                (MenuItem
                   label: '-'
                 )
                (MenuItem
                   label: 'Show Filter'
+                  hideMenuOnActivated: false
                   indication: showFilterHolder
                 )
                (MenuItem
@@ -1600,6 +1637,7 @@
                 )
                (MenuItem
                   label: 'Show Timestamp'
+                  hideMenuOnActivated: false
                   indication: showTimestampHolder
                 )
                (MenuItem
@@ -2249,6 +2287,16 @@
     ^ BlockValue forLogicalNot:(self showConflictsOnlyAspect)
 !
 
+notShowConflictsOnlyOrDefinitionsOnlyAspect
+    ^ BlockValue 
+        forLogical:(self notShowConflictsOnlyAspect)
+        and:(self notShowDefinitionsOnlyAspect)
+!
+
+notShowDefinitionsOnlyAspect
+    ^ BlockValue forLogicalNot:(self showDefinitionsOnlyAspect)
+!
+
 selection1Holder
     "return/create the 'selection1Holder' value holder (automatically generated)"
 
@@ -2320,6 +2368,19 @@
     showConflictsOnlyAspect := aValueHolder.
 !
 
+showDefinitionsOnlyAspect
+    "return/create the 'showDefinitionsOnlyAspect' value holder (automatically generated)"
+
+    showDefinitionsOnlyAspect isNil ifTrue:[
+        showDefinitionsOnlyAspect := ValueHolder with: false.
+    ].
+    ^ showDefinitionsOnlyAspect
+!
+
+showDefinitionsOnlyAspect:aValueHolder
+    showDefinitionsOnlyAspect := aValueHolder.
+!
+
 showFilterHolder
     "return/create the 'showFilterHolder' value holder (automatically generated)"
 
@@ -3992,11 +4053,11 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.56 2014-02-14 00:24:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.57 2014-02-19 13:19:40 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.56 2014-02-14 00:24:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.57 2014-02-19 13:19:40 cg Exp $'
 !
 
 version_HG
@@ -4005,6 +4066,6 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.56 2014-02-14 00:24:48 cg Exp $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.57 2014-02-19 13:19:40 cg Exp $'
 ! !