Tools__ChangeSetBrowser2.st
branchjv
changeset 19592 ac1b2bc83e26
parent 19589 8f1c638e83cf
child 19645 346f10c81090
equal deleted inserted replaced
19591:a93aab0bd02d 19592:ac1b2bc83e26
  1417     "
  1417     "
  1418 
  1418 
  1419     <resource: #menu>
  1419     <resource: #menu>
  1420 
  1420 
  1421     ^ 
  1421     ^ 
  1422      #(Menu
  1422      #(Menu (
  1423         (
       
  1424          (MenuItem
  1423          (MenuItem
  1425             enabled: hasChangeSelectedAndNotRemoved:
  1424             enabled: hasChangeSelectedAndNotRemoved:
  1426             label: 'Apply'
  1425             label: 'Apply'
  1427             itemValue: changeMenuApplySelection:
  1426             itemValue: changeMenuApplySelection:
  1428             isVisible: allowAcceptHolder
  1427             isVisible: allowAcceptHolder
  1429             shortcutKey: Accept
  1428             shortcutKey: Accept
  1430             auxValue: 100
  1429             auxValue: 100
  1431             ignoreShortcutKeys: true
  1430             ignoreShortcutKeys: true
  1432           )
  1431          )
  1433          (MenuItem
  1432          (MenuItem
  1434             label: 'Apply All'
  1433             label: 'Apply All'
  1435             itemValue: changeMenuApply:
  1434             itemValue: changeMenuApply:
  1436             isVisible: allowAcceptHolder
  1435             isVisible: allowAcceptHolder
  1437           )
  1436          )
  1438          (MenuItem
  1437          (MenuItem
  1439             label: '-'
  1438             label: '-'
  1440             isVisible: allowAcceptHolder
  1439             isVisible: allowAcceptHolder
  1441           )
  1440          )
  1442          (MenuItem
  1441          (MenuItem
  1443             label: 'Delete (selected)'
  1442             label: 'Delete (selected)'
  1444             itemValue: changeMenuDeleteSelection:
  1443             itemValue: changeMenuDeleteSelection:
  1445             nameKey: Delete
  1444             nameKey: Delete
  1446             isVisible: allowRemoveHolder
  1445             isVisible: allowRemoveHolder
  1447             shortcutKey: Delete
  1446             shortcutKey: Delete
  1448           )
  1447          )
  1449          (MenuItem
  1448          (MenuItem
  1450             label: 'Delete (unselected)'
  1449             label: 'Delete (unselected)'
  1451             itemValue: changeMenuDeleteSelectionInverted:
  1450             itemValue: changeMenuDeleteSelectionInverted:
  1452             nameKey: Delete
  1451             nameKey: Delete
  1453             isVisible: allowRemoveHolder
  1452             isVisible: allowRemoveHolder
  1454           )
  1453          )
  1455          (MenuItem
  1454          (MenuItem
  1456             label: 'Undelete'
  1455             label: 'Undelete'
  1457             itemValue: changeMenuUndeleteSelection:
  1456             itemValue: changeMenuUndeleteSelection:
  1458             nameKey: Undelete
  1457             nameKey: Undelete
  1459             isVisible: allowRemoveHolder
  1458             isVisible: allowRemoveHolder
  1460           )
  1459          )
  1461          (MenuItem
  1460          (MenuItem
  1462             label: '-'
  1461             label: '-'
  1463             isVisible: allowRemoveHolder
  1462             isVisible: allowRemoveHolder
  1464           )
  1463          )
  1465          (MenuItem
  1464          (MenuItem
  1466             label: 'Select...'
  1465             label: 'Select...'
       
  1466             isVisible: true
  1467             submenu: 
  1467             submenu: 
  1468            (Menu
  1468            (Menu (
  1469               (
       
  1470                (MenuItem
  1469                (MenuItem
  1471                   label: 'Select Same'
  1470                   label: 'Select Same'
  1472                   itemValue: changeMenuSelectSame:
  1471                   itemValue: changeMenuSelectSame:
  1473                 )
  1472                   isVisible: true
       
  1473                )
  1474                (MenuItem
  1474                (MenuItem
  1475                   label: 'Select Additions (new classes/methods)'
  1475                   label: 'Select Additions (new classes/methods)'
  1476                   itemValue: changeMenuSelectAdditions:
  1476                   itemValue: changeMenuSelectAdditions:
  1477                 )
  1477                   isVisible: true
       
  1478                )
  1478                (MenuItem
  1479                (MenuItem
  1479                   label: 'Select Removals'
  1480                   label: 'Select Removals'
  1480                   itemValue: changeMenuSelectRemovals:
  1481                   itemValue: changeMenuSelectRemovals:
  1481                 )
  1482                   isVisible: true
       
  1483                )
  1482                (MenuItem
  1484                (MenuItem
  1483                   label: 'Select Differences'
  1485                   label: 'Select Differences'
  1484                   itemValue: changeMenuSelectDifferences:
  1486                   itemValue: changeMenuSelectDifferences:
  1485                 )
  1487                   isVisible: true
       
  1488                )
  1486                (MenuItem
  1489                (MenuItem
  1487                   label: '-'
  1490                   label: '-'
  1488                 )
  1491                   isVisible: true
       
  1492                )
  1489                (MenuItem
  1493                (MenuItem
  1490                   label: 'Select All'
  1494                   label: 'Select All'
  1491                   itemValue: changeMenuSelectAll:
  1495                   itemValue: changeMenuSelectAll:
       
  1496                   isVisible: true
  1492                   shortcutKey: SelectAll
  1497                   shortcutKey: SelectAll
  1493                 )
  1498                )
  1494                (MenuItem
  1499                (MenuItem
  1495                   label: 'Select None'
  1500                   label: 'Select None'
  1496                   itemValue: changeMenuSelectNone:
  1501                   itemValue: changeMenuSelectNone:
  1497                 )
  1502                   isVisible: true
       
  1503                )
  1498                (MenuItem
  1504                (MenuItem
  1499                   label: 'Invert Selection'
  1505                   label: 'Invert Selection'
  1500                   itemValue: changeMenuSelectInversion:
  1506                   itemValue: changeMenuSelectInversion:
  1501                 )
  1507                   isVisible: true
       
  1508                )
  1502                (MenuItem
  1509                (MenuItem
  1503                   label: '-'
  1510                   label: '-'
  1504                 )
  1511                   isVisible: true
       
  1512                )
  1505                (MenuItem
  1513                (MenuItem
  1506                   label: 'Select "version_XXX" Methods'
  1514                   label: 'Select "version_XXX" Methods'
  1507                   itemValue: changeMenuSelectVersionMethods:
  1515                   itemValue: changeMenuSelectVersionMethods:
  1508                 )
  1516                   isVisible: true
       
  1517                )
  1509                (MenuItem
  1518                (MenuItem
  1510                   label: 'Select "copyright" Methods'
  1519                   label: 'Select "copyright" Methods'
  1511                   itemValue: changeMenuSelectCopyrightMethods:
  1520                   itemValue: changeMenuSelectCopyrightMethods:
  1512                 )
  1521                   isVisible: true
       
  1522                )
  1513                (MenuItem
  1523                (MenuItem
  1514                   label: 'Select "class initialize" DoIts'
  1524                   label: 'Select "class initialize" DoIts'
  1515                   itemValue: changeMenuSelectClassInitializeDoIts:
  1525                   itemValue: changeMenuSelectClassInitializeDoIts:
  1516                 )
  1526                   isVisible: true
       
  1527                )
  1517                (MenuItem
  1528                (MenuItem
  1518                   label: '-'
  1529                   label: '-'
  1519                 )
  1530                   isVisible: true
       
  1531                )
  1520                (MenuItem
  1532                (MenuItem
  1521                   label: 'Select Using Block...'
  1533                   label: 'Select Using Block...'
  1522                   itemValue: changeMenuSelectUsingBlock:
  1534                   itemValue: changeMenuSelectUsingBlock:
  1523                 )
  1535                   isVisible: true
  1524                )
  1536                )
       
  1537              ) nil
  1525               nil
  1538               nil
  1526               nil
  1539            )
  1527             )
  1540          )
  1528           )
       
  1529          (MenuItem
  1541          (MenuItem
  1530             label: '-'
  1542             label: '-'
  1531           )
  1543             isVisible: true
       
  1544          )
  1532          (MenuItem
  1545          (MenuItem
  1533             enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
  1546             enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
  1534             label: 'Show Deleted'
  1547             label: 'Show Deleted'
  1535             isVisible: allowRemoveHolder
  1548             isVisible: allowRemoveHolder
  1536             indication: showRemovedAspect
  1549             indication: showRemovedAspect
  1537           )
  1550          )
  1538          (MenuItem
  1551          (MenuItem
  1539             enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
  1552             enabled: notShowConflictsOnlyOrDefinitionsOnlyAspect
  1540             label: 'Show Same'
  1553             label: 'Show Same'
       
  1554             isVisible: true
  1541             indication: showSameAspect
  1555             indication: showSameAspect
  1542           )
  1556          )
  1543          (MenuItem
  1557          (MenuItem
  1544             enabled: notShowDefinitionsOnlyAspect
  1558             enabled: notShowDefinitionsOnlyAspect
  1545             label: 'Show Conflicts Only'
  1559             label: 'Show Conflicts Only'
       
  1560             isVisible: true
  1546             indication: showConflictsOnlyAspect
  1561             indication: showConflictsOnlyAspect
  1547           )
  1562          )
  1548          (MenuItem
  1563          (MenuItem
  1549             enabled: notShowConflictsOnlyAspect
  1564             enabled: notShowConflictsOnlyAspect
  1550             label: 'Show Definitions Only'
  1565             label: 'Show Definitions Only'
       
  1566             isVisible: true
  1551             indication: showDefinitionsOnlyAspect
  1567             indication: showDefinitionsOnlyAspect
  1552           )
  1568          )
  1553          (MenuItem
  1569          (MenuItem
  1554             label: '-'
  1570             label: '-'
  1555           )
  1571             isVisible: true
       
  1572          )
       
  1573          (MenuItem
       
  1574             label: 'Condense'
       
  1575             itemValue: changeMenuCondense
       
  1576             isVisible: isTwoColumnHolderNot
       
  1577          )
       
  1578          (MenuItem
       
  1579             label: '-'
       
  1580             isVisible: isTwoColumnHolderNot
       
  1581          )
  1556          (MenuItem
  1582          (MenuItem
  1557             label: 'Inspect Change'
  1583             label: 'Inspect Change'
  1558             itemValue: changeMenuInspect:
  1584             itemValue: changeMenuInspect:
  1559           )
  1585             isVisible: true
       
  1586          )
  1560          (MenuItem
  1587          (MenuItem
  1561             label: '-'
  1588             label: '-'
  1562           )
  1589             isVisible: true
       
  1590          )
  1563          (MenuItem
  1591          (MenuItem
  1564             enabled: hasSingleChangeSelectedAndCanBrowseClass:
  1592             enabled: hasSingleChangeSelectedAndCanBrowseClass:
  1565             label: 'Browse Class(es)'
  1593             label: 'Browse Class(es)'
  1566             itemValue: changeMenuBrowseClass:
  1594             itemValue: changeMenuBrowseClass:
  1567           )
  1595             isVisible: true
       
  1596          )
  1568          (MenuItem
  1597          (MenuItem
  1569             enabled: hasSingleChangeSelectedAndCanBrowse:
  1598             enabled: hasSingleChangeSelectedAndCanBrowse:
  1570             label: 'Browse Method(s)'
  1599             label: 'Browse Method(s)'
  1571             itemValue: changeMenuBrowse:
  1600             itemValue: changeMenuBrowse:
  1572           )
  1601             isVisible: true
  1573          )
  1602          )
       
  1603        ) nil
  1574         nil
  1604         nil
  1575         nil
  1605      )
  1576       )
       
  1577 
       
  1578     "Modified: / 04-03-2016 / 16:02:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
  1579 !
  1606 !
  1580 
  1607 
  1581 changeMenu1
  1608 changeMenu1
  1582     <resource: #programMenu>
  1609     <resource: #programMenu>
  1583 
  1610 
  3505 
  3532 
  3506     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  3533     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  3507     "Created: / 01-12-2011 / 18:36:44 / cg"
  3534     "Created: / 01-12-2011 / 18:36:44 / cg"
  3508 !
  3535 !
  3509 
  3536 
       
  3537 changeMenuCondense
       
  3538     <resource: #uiCallback>
       
  3539 
       
  3540     self showProgress: 'Condensing changes' while: [
       
  3541         self loadChangeSet: self changeset copy condenseChanges.
       
  3542     ]
       
  3543 !
       
  3544 
  3510 changeMenuDeleteSelection: changeList
  3545 changeMenuDeleteSelection: changeList
  3511 
  3546 
  3512     changeList selection do:[:change|self changeMenuDeleteChange:change change].
  3547     changeList selection do:[:change|self changeMenuDeleteChange:change change].
  3513     changeList updateList.
  3548     changeList updateList.
  3514     (list2 notNil and:[changeList ~~ list2]) ifTrue:[
  3549     (list2 notNil and:[changeList ~~ list2]) ifTrue:[