Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tools__ChangeSetBrowser2.st
changeset 10666 6930bb15d213
parent 10665 bbaa7c4154de
child 10682 d0632be80033 
--- a/Tools__ChangeSetBrowser2.st	Mon Sep 05 15:43:33 2011 +0200
+++ b/Tools__ChangeSetBrowser2.st	Mon Sep 05 16:20:47 2011 +0200
@@ -770,6 +770,290 @@
       )
 !
 
+changeMenu1
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+
+    "
+     MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu1
+     (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu1)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+        (
+         (MenuItem
+            enabled: hasChangeSelectedAndNotRemoved:
+            label: 'Apply'
+            itemValue: changeMenuApplySelection:
+            translateLabel: true
+            isVisible: acceptEnabledHolder
+            shortcutKey: Accept
+            auxValue: 100
+          )
+         (MenuItem
+            label: 'Apply all'
+            itemValue: changeMenuApply:
+            translateLabel: true
+            isVisible: acceptEnabledHolder
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Delete'
+            itemValue: changeMenuDeleteSelection:
+            nameKey: Delete
+            translateLabel: true
+            shortcutKey: Delete
+          )
+         (MenuItem
+            label: 'Undelete'
+            itemValue: changeMenuUndeleteSelection:
+            nameKey: Undelete
+            translateLabel: true
+            shortcutKey: Delete
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Select...'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'Select same'
+                  itemValue: changeMenuSelectSame:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select additions (new classes/methods)'
+                  itemValue: changeMenuSelectAdditions:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select removals'
+                  itemValue: changeMenuSelectRemovals:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select differences'
+                  itemValue: changeMenuSelectDifferences:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select all'
+                  itemValue: changeMenuSelectAll:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select none'
+                  itemValue: changeMenuSelectNone:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select using block'
+                  itemValue: changeMenuSelectUsingBlock:
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Show Deleted'
+            translateLabel: true
+            indication: showRemovedAspect
+          )
+         (MenuItem
+            label: 'Show Same'
+            translateLabel: true
+            indication: showSameAspect
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Inspect change'
+            itemValue: changeMenuInspect:
+            translateLabel: true
+          )
+         (MenuItem
+            enabled: hasSingleChangeSelectedAndCanBrowse:
+            label: 'Browse Method(s)'
+            itemValue: changeMenuBrowse:
+            translateLabel: true
+          )
+         (MenuItem
+            enabled: hasSingleChangeSelectedAndCanBrowse:
+            label: 'Browse Class(s)'
+            itemValue: changeMenuBrowseClass:
+            translateLabel: true
+          )
+         )
+        nil
+        nil
+      )
+!
+
+changeMenu2
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+
+    "
+     MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu2
+     (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu2)) startUp
+    "
+
+    <resource: #menu>
+
+    ^ 
+     #(Menu
+        (
+         (MenuItem
+            enabled: hasChangeSelectedAndNotRemoved:
+            label: 'Apply'
+            itemValue: changeMenuApplySelection:
+            translateLabel: true
+            isVisible: acceptEnabledHolder
+            shortcutKey: Accept
+            auxValue: 100
+          )
+         (MenuItem
+            label: 'Apply all'
+            itemValue: changeMenuApply:
+            translateLabel: true
+            isVisible: acceptEnabledHolder
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Delete'
+            itemValue: changeMenuDeleteSelection:
+            nameKey: Delete
+            translateLabel: true
+            shortcutKey: Delete
+          )
+         (MenuItem
+            label: 'Undelete'
+            itemValue: changeMenuUndeleteSelection:
+            nameKey: Undelete
+            translateLabel: true
+            shortcutKey: Delete
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Select...'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'Select same'
+                  itemValue: changeMenuSelectSame:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select additions (new classes/methods)'
+                  itemValue: changeMenuSelectAdditions:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select removals'
+                  itemValue: changeMenuSelectRemovals:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select differences'
+                  itemValue: changeMenuSelectDifferences:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select all'
+                  itemValue: changeMenuSelectAll:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: 'Select none'
+                  itemValue: changeMenuSelectNone:
+                  translateLabel: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select using block'
+                  itemValue: changeMenuSelectUsingBlock:
+                  translateLabel: true
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Show Deleted'
+            translateLabel: true
+            indication: showRemovedAspect
+          )
+         (MenuItem
+            label: 'Show Same'
+            translateLabel: true
+            indication: showSameAspect
+          )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            label: 'Inspect change'
+            itemValue: changeMenuInspect:
+            translateLabel: true
+          )
+         (MenuItem
+            enabled: hasSingleChangeSelectedAndCanBrowse:
+            label: 'Browse Method(s)'
+            itemValue: changeMenuBrowse:
+            translateLabel: true
+          )
+         )
+        nil
+        nil
+      )
+
+    "Created: / 05-09-2011 / 16:06:49 / cg"
+!
+
 mainMenu
     "This resource specification was automatically generated
      by the MenuEditor of ST/X."
@@ -1035,27 +1319,29 @@
 !ChangeSetBrowser2 methodsFor:'accessing - menus'!
 
 list1MenuHolder
+    ^ [
+        |menu|
 
-    ^[
-    | menu |
-    menu := builder menuFor: #changeMenu.
-    menu allItemsDo:[:item|item argument: list1].
-    menu
+        menu := builder menuFor:#changeMenu1.
+        menu allItemsDo:[:item | item argument:list1 ].
+        menu
     ]
 
     "Created: / 04-08-2011 / 18:11:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 05-09-2011 / 16:07:20 / cg"
 !
 
 list2MenuHolder
+    ^ [
+        |menu|
 
-    ^[
-    | menu |
-    menu := builder menuFor: #changeMenu.
-    menu allItemsDo:[:item|item argument: list2].
-    menu
+        menu := builder menuFor:#changeMenu2.
+        menu allItemsDo:[:item | item argument:list2 ].
+        menu
     ]
 
     "Created: / 04-08-2011 / 18:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 05-09-2011 / 16:07:34 / cg"
 ! !
 
 !ChangeSetBrowser2 methodsFor:'actions'!
@@ -1471,7 +1757,13 @@
 changeMenuBrowse: changeList
     |changes methods classes|
 
-    changes := changeList listHolder value collect:[:c | c change].
+    changeList == list1 ifTrue:[
+        changes := selection1Holder value.
+    ] ifFalse:[
+        changes := selection2Holder value.
+    ].
+    changes := changes collect:[:c | c change].
+    "/ changes := changeList listHolder value collect:[:c | c change].
     (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[
         classes := (changes collect:[:c | c changeClass]).
         UserPreferences current systemBrowserClass 
@@ -1497,7 +1789,41 @@
     ].
 
     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 05-09-2011 / 10:38:51 / cg"
+    "Modified: / 05-09-2011 / 16:17:48 / cg"
+!
+
+changeMenuBrowseClass: changeList
+    |changes classes addThemChanges|
+
+    changeList == list1 ifTrue:[
+        changes := selection1Holder value.
+    ] ifFalse:[
+        changes := selection2Holder value.
+    ].
+    changes := changes collect:[:eachListEntry | eachListEntry change].
+
+    classes := Set new.
+    addThemChanges := 
+        [:c |
+            c isClassDefinitionChange ifTrue:[
+                classes add:c changeClass theNonMetaclass
+            ] ifFalse:[
+                c isMethodChange ifTrue:[
+                    classes add:c changeMethod mclass theNonMetaclass
+                ] ifFalse:[
+                    c isCompositeChange ifTrue:[
+                        c changes do:addThemChanges
+                    ]
+                ]
+            ]
+        ].
+    changes do:addThemChanges.
+
+    UserPreferences current systemBrowserClass 
+        browseClasses:classes title:'selected monticello classes'.
+
+    "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 05-09-2011 / 16:08:35 / cg"
 !
 
 changeMenuDeleteSelection: changeList
@@ -1794,11 +2120,11 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.16 2011-09-05 13:43:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.17 2011-09-05 14:20:47 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.16 2011-09-05 13:43:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.17 2011-09-05 14:20:47 cg Exp $'
 !
 
 version_SVN
hg/stx-libtool