| branch | jv |
| changeset 12247 | 1bd3e7f3c9c9 |
| parent 12216 | 5698c277f043 |
| child 12249 | 8c861bdf7f51 |
| 12246:c8ac47ffe913 | 12247:1bd3e7f3c9c9 |
|---|---|
32 navigatorChangesetHolder navigatorSpecHolder list1 list1Holder |
32 navigatorChangesetHolder navigatorSpecHolder list1 list1Holder |
33 selection1Holder list2 list2Holder selection2Holder classHolder |
33 selection1Holder list2 list2Holder selection2Holder classHolder |
34 languageHolder codeAspectHolder showRemovedAspect showSameAspect |
34 languageHolder codeAspectHolder showRemovedAspect showSameAspect |
35 sourceView changeSourceHolder imageSourceHolder targetPackage |
35 sourceView changeSourceHolder imageSourceHolder targetPackage |
36 targetNamespace allowRemoveHolder allowAcceptHolder infoPanel |
36 targetNamespace allowRemoveHolder allowAcceptHolder infoPanel |
37 updateChangeFileHolder showFilterHolder showColumnSpecHolder' |
37 updateChangeFileHolder showFilterHolder showColumnSpecHolder |
38 isWorkingHolder isWorkingNotHolder hasSelectionHolder' |
|
38 classVariableNames:'ShowRemoved LastSelectionConditionString' |
39 classVariableNames:'ShowRemoved LastSelectionConditionString' |
39 poolDictionaries:'' |
40 poolDictionaries:'' |
40 category:'Interface-Browsers-ChangeSet' |
41 category:'Interface-Browsers-ChangeSet' |
41 ! |
42 ! |
42 |
43 |
78 " |
79 " |
79 ! ! |
80 ! ! |
80 |
81 |
81 !ChangeSetBrowser2 class methodsFor:'instance creation'! |
82 !ChangeSetBrowser2 class methodsFor:'instance creation'! |
82 |
83 |
83 on: aChangeSet |
84 on: aStringOrChangeSet |
84 |
85 "Opens a browser on given changeset. If the argument is |
85 ^self on: aChangeSet label: aChangeSet name |
86 string, then loads the changeset from given file - for |
86 |
87 compatibility with other tools" |
87 "Modified: / 26-10-2010 / 22:51:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
88 |
89 aStringOrChangeSet isString ifTrue:[ |
|
90 self onFile: aStringOrChangeSet |
|
91 ] ifFalse:[ |
|
92 self on: aStringOrChangeSet label: aStringOrChangeSet name |
|
93 ] |
|
94 |
|
95 "Modified: / 17-05-2012 / 23:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
88 ! |
96 ! |
89 |
97 |
90 on: aChangeSet label: aString |
98 on: aChangeSet label: aString |
91 |
99 |
92 ^self on: aChangeSet label: aString setupWith: [:browser] |
100 ^self on: aChangeSet label: aString setupWith: [:browser] |
104 title: label. |
112 title: label. |
105 aBlock value: browser. |
113 aBlock value: browser. |
106 ^browser |
114 ^browser |
107 |
115 |
108 "Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
116 "Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
117 ! |
|
118 |
|
119 onFile: aString |
|
120 | browser | |
|
121 |
|
122 browser := self new. |
|
123 browser enqueueDelayedAction:[browser doOpenFile: aString]. |
|
124 ^browser |
|
125 |
|
126 "Created: / 17-05-2012 / 23:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
109 ! ! |
127 ! ! |
110 |
128 |
111 !ChangeSetBrowser2 class methodsFor:'accessing'! |
129 !ChangeSetBrowser2 class methodsFor:'accessing'! |
112 |
130 |
113 showRemoved |
131 showRemoved |
233 |
251 |
234 "Do not manually edit this!! If it is corrupted, |
252 "Do not manually edit this!! If it is corrupted, |
235 the UIHelpTool may not be able to read the specification." |
253 the UIHelpTool may not be able to read the specification." |
236 |
254 |
237 " |
255 " |
238 UIHelpTool openOnClass:NewChangesBrowser |
256 UIHelpTool openOnClass:Tools::ChangeSetBrowser2 |
239 " |
257 " |
240 |
258 |
241 <resource: #help> |
259 <resource: #help> |
242 |
260 |
243 ^ super helpSpec addPairsFrom:#( |
261 ^ super helpSpec addPairsFrom:#( |
320 #testFindLastSnapshot |
338 #testFindLastSnapshot |
321 'Searches backward for the previous snapshot entry.' |
339 'Searches backward for the previous snapshot entry.' |
322 |
340 |
323 #testFindNextSnapshot |
341 #testFindNextSnapshot |
324 'Searches forward for the next snapshot entry.' |
342 'Searches forward for the next snapshot entry.' |
343 |
|
344 #testFindPreviousSnapshot |
|
345 '' |
|
325 |
346 |
326 ) |
347 ) |
327 ! ! |
348 ! ! |
328 |
349 |
329 !ChangeSetBrowser2 class methodsFor:'image specs'! |
350 !ChangeSetBrowser2 class methodsFor:'image specs'! |
1195 (MenuItem |
1216 (MenuItem |
1196 label: '-' |
1217 label: '-' |
1197 isVisible: allowAcceptHolder |
1218 isVisible: allowAcceptHolder |
1198 ) |
1219 ) |
1199 (MenuItem |
1220 (MenuItem |
1200 label: 'Delete' |
1221 label: 'Delete (selected)' |
1201 itemValue: changeMenuDeleteSelection: |
1222 itemValue: changeMenuDeleteSelection: |
1202 nameKey: Delete |
1223 nameKey: Delete |
1203 translateLabel: true |
1224 translateLabel: true |
1204 isVisible: allowRemoveHolder |
1225 isVisible: allowRemoveHolder |
1205 shortcutKey: Delete |
1226 shortcutKey: Delete |
1227 ) |
|
1228 (MenuItem |
|
1229 label: 'Delete (unselected)' |
|
1230 itemValue: changeMenuDeleteSelectionInverted: |
|
1231 nameKey: Delete |
|
1232 translateLabel: true |
|
1233 isVisible: allowRemoveHolder |
|
1206 ) |
1234 ) |
1207 (MenuItem |
1235 (MenuItem |
1208 label: 'Undelete' |
1236 label: 'Undelete' |
1209 itemValue: changeMenuUndeleteSelection: |
1237 itemValue: changeMenuUndeleteSelection: |
1210 nameKey: Undelete |
1238 nameKey: Undelete |
1253 label: 'Select none' |
1281 label: 'Select none' |
1254 itemValue: changeMenuSelectNone: |
1282 itemValue: changeMenuSelectNone: |
1255 translateLabel: true |
1283 translateLabel: true |
1256 ) |
1284 ) |
1257 (MenuItem |
1285 (MenuItem |
1286 label: 'Invert Selection' |
|
1287 itemValue: changeMenuSelectInversion: |
|
1288 translateLabel: true |
|
1289 ) |
|
1290 (MenuItem |
|
1258 label: '-' |
1291 label: '-' |
1259 ) |
1292 ) |
1260 (MenuItem |
1293 (MenuItem |
1261 label: 'Select using block' |
1294 label: 'Select Using Block...' |
1262 itemValue: changeMenuSelectUsingBlock: |
1295 itemValue: changeMenuSelectUsingBlock: |
1263 translateLabel: true |
1296 translateLabel: true |
1264 ) |
1297 ) |
1265 ) |
1298 ) |
1266 nil |
1299 nil |
1300 nil |
1333 nil |
1301 ) |
1334 ) |
1302 ! |
1335 ! |
1303 |
1336 |
1304 changeMenu1 |
1337 changeMenu1 |
1305 "This resource specification was automatically generated |
|
1306 by the MenuEditor of ST/X." |
|
1307 |
|
1308 "Do not manually edit this!! If it is corrupted, |
|
1309 the MenuEditor may not be able to read the specification." |
|
1310 |
|
1311 |
|
1312 " |
|
1313 MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu1 |
|
1314 (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu1)) startUp |
|
1315 " |
|
1316 |
|
1317 <resource: #menu> |
1338 <resource: #menu> |
1318 |
1339 |
1319 ^ |
1340 ^self changeMenu |
1320 #(Menu |
1341 |
1321 ( |
1342 "Modified: / 17-05-2012 / 22:51:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1322 (MenuItem |
|
1323 enabled: hasChangeSelectedAndNotRemoved: |
|
1324 label: 'Apply' |
|
1325 itemValue: changeMenuApplySelection: |
|
1326 translateLabel: true |
|
1327 isVisible: allowAcceptHolder |
|
1328 shortcutKey: Accept |
|
1329 auxValue: 100 |
|
1330 ) |
|
1331 (MenuItem |
|
1332 label: 'Apply All' |
|
1333 itemValue: changeMenuApply: |
|
1334 translateLabel: true |
|
1335 isVisible: allowAcceptHolder |
|
1336 ) |
|
1337 (MenuItem |
|
1338 label: '-' |
|
1339 isVisible: allowAcceptHolder |
|
1340 ) |
|
1341 (MenuItem |
|
1342 label: 'Delete' |
|
1343 itemValue: changeMenuDeleteSelection: |
|
1344 nameKey: Delete |
|
1345 translateLabel: true |
|
1346 isVisible: allowRemoveHolder |
|
1347 shortcutKey: Delete |
|
1348 ) |
|
1349 (MenuItem |
|
1350 label: 'Undelete' |
|
1351 itemValue: changeMenuUndeleteSelection: |
|
1352 nameKey: Undelete |
|
1353 translateLabel: true |
|
1354 isVisible: allowRemoveHolder |
|
1355 ) |
|
1356 (MenuItem |
|
1357 label: '-' |
|
1358 isVisible: allowRemoveHolder |
|
1359 ) |
|
1360 (MenuItem |
|
1361 label: 'Select...' |
|
1362 translateLabel: true |
|
1363 submenu: |
|
1364 (Menu |
|
1365 ( |
|
1366 (MenuItem |
|
1367 label: 'Select Same' |
|
1368 itemValue: changeMenuSelectSame: |
|
1369 translateLabel: true |
|
1370 ) |
|
1371 (MenuItem |
|
1372 label: 'Select Additions (new Classes/Methods)' |
|
1373 itemValue: changeMenuSelectAdditions: |
|
1374 translateLabel: true |
|
1375 ) |
|
1376 (MenuItem |
|
1377 label: 'Select Removals' |
|
1378 itemValue: changeMenuSelectRemovals: |
|
1379 translateLabel: true |
|
1380 ) |
|
1381 (MenuItem |
|
1382 label: 'Select Differences' |
|
1383 itemValue: changeMenuSelectDifferences: |
|
1384 translateLabel: true |
|
1385 ) |
|
1386 (MenuItem |
|
1387 label: '-' |
|
1388 ) |
|
1389 (MenuItem |
|
1390 label: 'Select All' |
|
1391 itemValue: changeMenuSelectAll: |
|
1392 translateLabel: true |
|
1393 ) |
|
1394 (MenuItem |
|
1395 label: 'Select None' |
|
1396 itemValue: changeMenuSelectNone: |
|
1397 translateLabel: true |
|
1398 ) |
|
1399 (MenuItem |
|
1400 label: '-' |
|
1401 ) |
|
1402 (MenuItem |
|
1403 label: 'Select using Block' |
|
1404 itemValue: changeMenuSelectUsingBlock: |
|
1405 translateLabel: true |
|
1406 ) |
|
1407 ) |
|
1408 nil |
|
1409 nil |
|
1410 ) |
|
1411 ) |
|
1412 (MenuItem |
|
1413 label: '-' |
|
1414 ) |
|
1415 (MenuItem |
|
1416 label: 'Show Deleted' |
|
1417 translateLabel: true |
|
1418 isVisible: allowRemoveHolder |
|
1419 indication: showRemovedAspect |
|
1420 ) |
|
1421 (MenuItem |
|
1422 label: 'Show Same' |
|
1423 translateLabel: true |
|
1424 indication: showSameAspect |
|
1425 ) |
|
1426 (MenuItem |
|
1427 label: '-' |
|
1428 ) |
|
1429 (MenuItem |
|
1430 label: 'Inspect Change' |
|
1431 itemValue: changeMenuInspect: |
|
1432 translateLabel: true |
|
1433 ) |
|
1434 (MenuItem |
|
1435 enabled: hasSingleChangeSelectedAndCanBrowse: |
|
1436 label: 'Browse Method(s)' |
|
1437 itemValue: changeMenuBrowse: |
|
1438 translateLabel: true |
|
1439 ) |
|
1440 (MenuItem |
|
1441 enabled: hasSingleChangeSelectedAndCanBrowse: |
|
1442 label: 'Browse Class(s)' |
|
1443 itemValue: changeMenuBrowseClass: |
|
1444 translateLabel: true |
|
1445 ) |
|
1446 (MenuItem |
|
1447 label: '-' |
|
1448 ) |
|
1449 (MenuItem |
|
1450 enabled: hasSingleChangeSelectedAndCanBrowse: |
|
1451 label: 'Compare Class Against...' |
|
1452 itemValue: changeMenuCompareClass: |
|
1453 translateLabel: true |
|
1454 ) |
|
1455 ) |
|
1456 nil |
|
1457 nil |
|
1458 ) |
|
1459 ! |
1343 ! |
1460 |
1344 |
1461 changeMenu2 |
1345 changeMenu2 |
1462 "This resource specification was automatically generated |
|
1463 by the MenuEditor of ST/X." |
|
1464 |
|
1465 "Do not manually edit this!! If it is corrupted, |
|
1466 the MenuEditor may not be able to read the specification." |
|
1467 |
|
1468 |
|
1469 " |
|
1470 MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu2 |
|
1471 (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu2)) startUp |
|
1472 " |
|
1473 |
|
1474 <resource: #menu> |
1346 <resource: #menu> |
1475 |
1347 |
1476 ^ |
1348 ^self changeMenu |
1477 #(Menu |
1349 |
1478 ( |
1350 "Modified: / 17-05-2012 / 22:51:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1479 (MenuItem |
|
1480 enabled: hasChangeSelectedAndNotRemoved: |
|
1481 label: 'Apply' |
|
1482 itemValue: changeMenuApplySelection: |
|
1483 translateLabel: true |
|
1484 isVisible: allowAcceptHolder |
|
1485 shortcutKey: Accept |
|
1486 auxValue: 100 |
|
1487 ) |
|
1488 (MenuItem |
|
1489 label: 'Apply to End' |
|
1490 itemValue: changeMenuApplyToEnd: |
|
1491 translateLabel: true |
|
1492 isVisible: allowAcceptHolder |
|
1493 ) |
|
1494 (MenuItem |
|
1495 label: '-' |
|
1496 isVisible: allowAcceptHolder |
|
1497 ) |
|
1498 (MenuItem |
|
1499 label: 'Delete' |
|
1500 itemValue: changeMenuDeleteSelection: |
|
1501 nameKey: Delete |
|
1502 translateLabel: true |
|
1503 isVisible: allowRemoveHolder |
|
1504 shortcutKey: Delete |
|
1505 ) |
|
1506 (MenuItem |
|
1507 label: 'Undelete' |
|
1508 itemValue: changeMenuUndeleteSelection: |
|
1509 nameKey: Undelete |
|
1510 translateLabel: true |
|
1511 isVisible: allowRemoveHolder |
|
1512 ) |
|
1513 (MenuItem |
|
1514 label: '-' |
|
1515 isVisible: allowRemoveHolder |
|
1516 ) |
|
1517 (MenuItem |
|
1518 label: 'Select...' |
|
1519 translateLabel: true |
|
1520 submenu: |
|
1521 (Menu |
|
1522 ( |
|
1523 (MenuItem |
|
1524 label: 'Select Same' |
|
1525 itemValue: changeMenuSelectSame: |
|
1526 translateLabel: true |
|
1527 ) |
|
1528 (MenuItem |
|
1529 label: 'Select Additions (new Classes/Methods)' |
|
1530 itemValue: changeMenuSelectAdditions: |
|
1531 translateLabel: true |
|
1532 ) |
|
1533 (MenuItem |
|
1534 label: 'Select Removals' |
|
1535 itemValue: changeMenuSelectRemovals: |
|
1536 translateLabel: true |
|
1537 ) |
|
1538 (MenuItem |
|
1539 label: 'Select Differences' |
|
1540 itemValue: changeMenuSelectDifferences: |
|
1541 translateLabel: true |
|
1542 ) |
|
1543 (MenuItem |
|
1544 label: '-' |
|
1545 ) |
|
1546 (MenuItem |
|
1547 label: 'Select All' |
|
1548 itemValue: changeMenuSelectAll: |
|
1549 translateLabel: true |
|
1550 ) |
|
1551 (MenuItem |
|
1552 label: 'Select None' |
|
1553 itemValue: changeMenuSelectNone: |
|
1554 translateLabel: true |
|
1555 ) |
|
1556 (MenuItem |
|
1557 label: '-' |
|
1558 ) |
|
1559 (MenuItem |
|
1560 label: 'Select using Block' |
|
1561 itemValue: changeMenuSelectUsingBlock: |
|
1562 translateLabel: true |
|
1563 ) |
|
1564 ) |
|
1565 nil |
|
1566 nil |
|
1567 ) |
|
1568 ) |
|
1569 (MenuItem |
|
1570 label: '-' |
|
1571 ) |
|
1572 (MenuItem |
|
1573 label: 'Show Deleted' |
|
1574 translateLabel: true |
|
1575 isVisible: allowRemoveHolder |
|
1576 indication: showRemovedAspect |
|
1577 ) |
|
1578 (MenuItem |
|
1579 label: 'Show Same' |
|
1580 translateLabel: true |
|
1581 indication: showSameAspect |
|
1582 ) |
|
1583 (MenuItem |
|
1584 label: '-' |
|
1585 ) |
|
1586 (MenuItem |
|
1587 label: 'Inspect Change' |
|
1588 itemValue: changeMenuInspect: |
|
1589 translateLabel: true |
|
1590 ) |
|
1591 (MenuItem |
|
1592 enabled: hasSingleChangeSelectedAndCanBrowse: |
|
1593 label: 'Browse Method(s)' |
|
1594 itemValue: changeMenuBrowse: |
|
1595 translateLabel: true |
|
1596 ) |
|
1597 ) |
|
1598 nil |
|
1599 nil |
|
1600 ) |
|
1601 ! |
1351 ! |
1602 |
1352 |
1603 mainMenu |
1353 mainMenu |
1604 "This resource specification was automatically generated |
1354 "This resource specification was automatically generated |
1605 by the MenuEditor of ST/X." |
1355 by the MenuEditor of ST/X." |
1623 translateLabel: true |
1373 translateLabel: true |
1624 submenu: |
1374 submenu: |
1625 (Menu |
1375 (Menu |
1626 ( |
1376 ( |
1627 (MenuItem |
1377 (MenuItem |
1378 enabled: isWorkingNotHolder |
|
1628 label: 'Open...' |
1379 label: 'Open...' |
1629 itemValue: doOpen |
1380 itemValue: doOpen |
1630 translateLabel: true |
1381 translateLabel: true |
1631 isVisible: allowOpenHolder |
1382 isVisible: allowOpenHolder |
1632 shortcutKey: Ctrlo |
1383 shortcutKey: Ctrlo |
1633 ) |
1384 ) |
1634 (MenuItem |
1385 (MenuItem |
1386 enabled: isWorkingNotHolder |
|
1635 label: 'Open Current' |
1387 label: 'Open Current' |
1636 itemValue: doOpenCurrent |
1388 itemValue: doOpenCurrent |
1637 translateLabel: true |
1389 translateLabel: true |
1638 isVisible: allowOpenHolder |
1390 isVisible: allowOpenHolder |
1639 ) |
1391 ) |
1640 (MenuItem |
1392 (MenuItem |
1393 enabled: isWorkingNotHolder |
|
1641 label: 'Save' |
1394 label: 'Save' |
1642 itemValue: doSave |
1395 itemValue: doSave |
1643 translateLabel: true |
1396 translateLabel: true |
1644 ) |
1397 ) |
1645 (MenuItem |
1398 (MenuItem |
1399 enabled: isWorkingNotHolder |
|
1646 label: 'Save As...' |
1400 label: 'Save As...' |
1647 itemValue: doSaveAs |
1401 itemValue: doSaveAs |
1648 translateLabel: true |
1402 translateLabel: true |
1649 ) |
1403 ) |
1650 (MenuItem |
1404 (MenuItem |
1659 nil |
1413 nil |
1660 nil |
1414 nil |
1661 ) |
1415 ) |
1662 ) |
1416 ) |
1663 (MenuItem |
1417 (MenuItem |
1418 enabled: isWorkingNotHolder |
|
1664 label: 'Changes' |
1419 label: 'Changes' |
1665 translateLabel: true |
1420 translateLabel: true |
1666 isVisible: isTwoColumnHolderNot |
1421 isVisible: isTwoColumnHolderNot |
1667 submenuChannel: list1MenuHolder |
1422 submenuChannel: list1MenuHolder |
1668 ) |
1423 ) |
1669 (MenuItem |
1424 (MenuItem |
1425 enabled: isWorkingNotHolder |
|
1670 label: 'Left' |
1426 label: 'Left' |
1671 translateLabel: true |
1427 translateLabel: true |
1672 isVisible: isTwoColumnHolder |
1428 isVisible: isTwoColumnHolder |
1673 submenuChannel: list1MenuHolder |
1429 submenuChannel: list1MenuHolder |
1674 ) |
1430 ) |
1675 (MenuItem |
1431 (MenuItem |
1432 enabled: isWorkingNotHolder |
|
1676 label: 'Right' |
1433 label: 'Right' |
1677 translateLabel: true |
1434 translateLabel: true |
1678 isVisible: isTwoColumnHolder |
1435 isVisible: isTwoColumnHolder |
1679 submenuChannel: list2MenuHolder |
1436 submenuChannel: list2MenuHolder |
1680 ) |
1437 ) |
1768 by the MenuEditor of ST/X." |
1525 by the MenuEditor of ST/X." |
1769 |
1526 |
1770 "Do not manually edit this!! If it is corrupted, |
1527 "Do not manually edit this!! If it is corrupted, |
1771 the MenuEditor may not be able to read the specification." |
1528 the MenuEditor may not be able to read the specification." |
1772 |
1529 |
1773 " |
1530 |
1774 MenuEditor new openOnClass:NewChangesBrowser andSelector:#toolbarMenu |
1531 " |
1775 (Menu new fromLiteralArrayEncoding:(NewChangesBrowser toolbarMenu)) startUp |
1532 MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#toolbarMenu |
1533 (Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 toolbarMenu)) startUp |
|
1776 " |
1534 " |
1777 |
1535 |
1778 <resource: #menu> |
1536 <resource: #menu> |
1779 |
1537 |
1780 ^ |
1538 ^ |
1781 #(Menu |
1539 #(Menu |
1782 ( |
1540 ( |
1783 (MenuItem |
1541 (MenuItem |
1784 activeHelpKey: fileLoad |
1542 activeHelpKey: fileLoad |
1785 enabled: valueOfNotReading |
1543 enabled: isWorkingNotHolder |
1786 label: 'Load' |
1544 label: 'Load' |
1787 itemValue: doLoad |
1545 itemValue: doLoad |
1788 translateLabel: true |
1546 translateLabel: true |
1789 isButton: true |
1547 isButton: true |
1790 labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon) |
1548 labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon) |
1791 ) |
1549 ) |
1792 (MenuItem |
1550 (MenuItem |
1793 activeHelpKey: fileSave |
1551 activeHelpKey: fileSave |
1794 enabled: valueOfNotSaving |
1552 enabled: isWorkingNotHolder |
1795 label: 'Save' |
1553 label: 'Save' |
1796 itemValue: doSave |
1554 itemValue: doSave |
1797 translateLabel: true |
1555 translateLabel: true |
1798 isButton: true |
1556 isButton: true |
1799 labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon) |
1557 labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon) |
1801 (MenuItem |
1559 (MenuItem |
1802 label: '-' |
1560 label: '-' |
1803 ) |
1561 ) |
1804 (MenuItem |
1562 (MenuItem |
1805 activeHelpKey: applyLine |
1563 activeHelpKey: applyLine |
1806 enabled: valueOfHavingChangeSelection |
1564 enabled: hasSelectionHolder |
1807 label: 'Apply' |
1565 label: 'Apply' |
1808 itemValue: doApply |
1566 itemValue: doApply |
1809 translateLabel: true |
1567 translateLabel: true |
1810 isButton: true |
1568 isButton: true |
1811 labelImage: (ResourceRetriever nil applyIcon) |
1569 labelImage: (ResourceRetriever nil applyIcon) |
1812 ) |
1570 ) |
1813 (MenuItem |
1571 (MenuItem |
1814 activeHelpKey: applyToEnd |
1572 activeHelpKey: applyToEnd |
1815 enabled: valueOfHavingSelection |
1573 enabled: hasSelectionHolder |
1816 label: 'Apply To End' |
1574 label: 'Apply To End' |
1817 itemValue: doApplyToEnd |
1575 itemValue: doApplyToEnd |
1818 translateLabel: true |
1576 translateLabel: true |
1819 isButton: true |
1577 isButton: true |
1820 labelImage: (ResourceRetriever nil applyToEndIcon) |
1578 labelImage: (ResourceRetriever nil applyToEndIcon) |
1821 ) |
1579 ) |
1822 (MenuItem |
1580 (MenuItem |
1823 activeHelpKey: applyFromLastSnapshot |
1581 activeHelpKey: applyFromLastSnapshot |
1824 enabled: valueOfNotReading |
1582 enabled: hasSelectionHolder |
1825 label: 'Apply From Last Snapshot' |
1583 label: 'Apply From Last Snapshot' |
1826 itemValue: doApplyFromLastSnapshot |
1584 itemValue: doApplyFromLastSnapshot |
1827 translateLabel: true |
1585 translateLabel: true |
1828 isButton: true |
1586 isButton: true |
1829 labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon) |
1587 labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon) |
1831 (MenuItem |
1589 (MenuItem |
1832 label: '-' |
1590 label: '-' |
1833 ) |
1591 ) |
1834 (MenuItem |
1592 (MenuItem |
1835 activeHelpKey: deleteLine |
1593 activeHelpKey: deleteLine |
1836 enabled: valueOfHavingSelection |
1594 enabled: hasSelectionHolder |
1837 label: 'Delete' |
1595 label: 'Delete' |
1838 itemValue: doDelete |
1596 itemValue: doDelete |
1839 translateLabel: true |
1597 translateLabel: true |
1840 isButton: true |
1598 isButton: true |
1841 labelImage: (ResourceRetriever nil deleteIcon) |
1599 labelImage: (ResourceRetriever nil deleteIcon) |
1842 ) |
1600 ) |
1843 (MenuItem |
1601 (MenuItem |
1844 activeHelpKey: deleteToEnd |
1602 activeHelpKey: deleteToEnd |
1845 enabled: valueOfHavingSelection |
1603 enabled: hasSelectionHolder |
1846 label: 'Delete To End' |
1604 label: 'Delete To End' |
1847 itemValue: doDeleteToEnd |
1605 itemValue: doDeleteToEnd |
1848 translateLabel: true |
1606 translateLabel: true |
1849 isButton: true |
1607 isButton: true |
1850 labelImage: (ResourceRetriever nil deleteToEndIcon) |
1608 labelImage: (ResourceRetriever nil deleteToEndIcon) |
1851 ) |
1609 ) |
1852 (MenuItem |
1610 (MenuItem |
1853 activeHelpKey: deleteCompress |
1611 activeHelpKey: deleteCompress |
1854 enabled: valueOfNotReading |
1612 enabled: isWorkingNotHolder |
1855 label: 'Compress' |
1613 label: 'Compress' |
1856 itemValue: doCompress |
1614 itemValue: doCompress |
1857 translateLabel: true |
1615 translateLabel: true |
1858 isButton: true |
1616 isButton: true |
1859 labelImage: (ResourceRetriever nil compressIcon) |
1617 labelImage: (ResourceRetriever nil compressIcon) |
1861 (MenuItem |
1619 (MenuItem |
1862 label: '-' |
1620 label: '-' |
1863 ) |
1621 ) |
1864 (MenuItem |
1622 (MenuItem |
1865 activeHelpKey: testFindPreviousSnapshot |
1623 activeHelpKey: testFindPreviousSnapshot |
1866 enabled: valueOfHavingSelection |
1624 enabled: hasSelectionHolder |
1867 label: 'Find Previous Snapshot' |
1625 label: 'Find Previous Snapshot' |
1868 itemValue: doFindSnapshot: |
1626 itemValue: doFindSnapshot: |
1869 translateLabel: true |
1627 translateLabel: true |
1870 isButton: true |
1628 isButton: true |
1871 labelImage: (ResourceRetriever nil findPreviousSnapshotIcon) |
1629 labelImage: (ResourceRetriever nil findPreviousSnapshotIcon) |
1872 argument: 'previous' |
1630 argument: 'previous' |
1873 ) |
1631 ) |
1874 (MenuItem |
1632 (MenuItem |
1875 activeHelpKey: testFindNextSnapshot |
1633 activeHelpKey: testFindNextSnapshot |
1876 enabled: valueOfHavingSelection |
1634 enabled: hasSelectionHolder |
1877 label: 'Find Next Snapshot' |
1635 label: 'Find Next Snapshot' |
1878 itemValue: doFindSnapshot: |
1636 itemValue: doFindSnapshot: |
1879 translateLabel: true |
1637 translateLabel: true |
1880 isButton: true |
1638 isButton: true |
1881 labelImage: (ResourceRetriever nil findNextSnapshotIcon) |
1639 labelImage: (ResourceRetriever nil findNextSnapshotIcon) |
1884 ) |
1642 ) |
1885 nil |
1643 nil |
1886 nil |
1644 nil |
1887 ) |
1645 ) |
1888 |
1646 |
1889 "Modified: / 26-03-2012 / 12:56:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1647 "Modified: / 17-05-2012 / 20:45:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1890 ! ! |
1648 ! ! |
1891 |
1649 |
1892 !ChangeSetBrowser2 class methodsFor:'plugIn spec'! |
1650 !ChangeSetBrowser2 class methodsFor:'plugIn spec'! |
1893 |
1651 |
1894 aspectSelectors |
1652 aspectSelectors |
2473 ]. |
2231 ]. |
2474 ^ updateChangeFileHolder |
2232 ^ updateChangeFileHolder |
2475 |
2233 |
2476 "Created: / 07-09-2011 / 15:54:03 / cg" |
2234 "Created: / 07-09-2011 / 15:54:03 / cg" |
2477 "Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2235 "Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2236 ! ! |
|
2237 |
|
2238 !ChangeSetBrowser2 methodsFor:'aspects-queries'! |
|
2239 |
|
2240 hasSelectionHolder |
|
2241 |
|
2242 hasSelectionHolder isNil ifTrue:[ |
|
2243 hasSelectionHolder := |
|
2244 BlockValue |
|
2245 with:[:sel1 :sel2| |
|
2246 sel1 value notEmptyOrNil or:[sel2 value notEmptyOrNil] |
|
2247 ] |
|
2248 argument: self selection1Holder |
|
2249 argument: self selection2Holder |
|
2250 ]. |
|
2251 ^hasSelectionHolder |
|
2252 |
|
2253 "Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2254 ! |
|
2255 |
|
2256 isWorkingHolder |
|
2257 |
|
2258 isWorkingHolder isNil ifTrue:[ |
|
2259 isWorkingHolder := ValueHolder with: false. |
|
2260 ]. |
|
2261 ^isWorkingHolder |
|
2262 |
|
2263 "Created: / 17-05-2012 / 20:45:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2264 ! |
|
2265 |
|
2266 isWorkingNotHolder |
|
2267 |
|
2268 isWorkingNotHolder isNil ifTrue:[ |
|
2269 isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder |
|
2270 ]. |
|
2271 ^isWorkingNotHolder |
|
2272 |
|
2273 "Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2478 ! ! |
2274 ! ! |
2479 |
2275 |
2480 !ChangeSetBrowser2 methodsFor:'change & update'! |
2276 !ChangeSetBrowser2 methodsFor:'change & update'! |
2481 |
2277 |
2482 changesetChanged |
2278 changesetChanged |
2631 self showColumnSpecHolder add: #timestamp |
2427 self showColumnSpecHolder add: #timestamp |
2632 ]. |
2428 ]. |
2633 ] ifFalse:[ |
2429 ] ifFalse:[ |
2634 self showColumnSpecHolder remove: #timestamp ifAbsent:[]. |
2430 self showColumnSpecHolder remove: #timestamp ifAbsent:[]. |
2635 ]. |
2431 ]. |
2432 self allowRemove: true. |
|
2636 self doOpen: cs. |
2433 self doOpen: cs. |
2637 ]. |
2434 ]. |
2638 |
2435 |
2639 "Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2436 "Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2640 ! |
2437 ! |
2669 "Modified: / 27-12-2011 / 10:39:52 / cg" |
2466 "Modified: / 27-12-2011 / 10:39:52 / cg" |
2670 "Modified: / 20-03-2012 / 13:52:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2467 "Modified: / 20-03-2012 / 13:52:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2671 ! |
2468 ! |
2672 |
2469 |
2673 doSaveAs: newFile |
2470 doSaveAs: newFile |
2471 | changesetToSave | |
|
2472 |
|
2473 changesetToSave := ChangeSet new. |
|
2474 self list1Holder value do:[:e| |
|
2475 e removed ~~ true ifTrue:[changesetToSave add:e]. |
|
2476 ]. |
|
2674 |
2477 |
2675 "/ [ |
2478 "/ [ |
2676 self changeset saveToFile: newFile format: #classSource. |
2479 (newFile asFilename suffix = 'st') ifTrue:[ |
2480 changesetToSave saveToFile: newFile format: #classSource. |
|
2481 ] ifFalse:[ |
|
2482 changesetToSave saveToFile: newFile |
|
2483 ]. |
|
2484 changesetFile := newFile. |
|
2677 "/ ] on: Error do: |
2485 "/ ] on: Error do: |
2678 "/ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description] |
2486 "/ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description] |
2679 |
2487 |
2680 "Modified: / 20-03-2012 / 13:52:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2488 "Modified: / 17-05-2012 / 23:56:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2681 ! |
2489 ! |
2682 |
2490 |
2683 doScrollToBottom |
2491 doScrollToBottom |
2684 |
2492 |
2685 | changeList | |
2493 | changeList | |
2974 ! |
2782 ! |
2975 |
2783 |
2976 changeMenuDeleteSelection: changeList |
2784 changeMenuDeleteSelection: changeList |
2977 |
2785 |
2978 changeList selection do:[:change|self changeMenuDeleteChange:change change]. |
2786 changeList selection do:[:change|self changeMenuDeleteChange:change change]. |
2979 list2 notNil ifTrue:[ |
2787 changeList updateList. |
2788 (list2 notNil and:[changeList ~~ list2]) ifTrue:[ |
|
2980 "/ to get the =-icons |
2789 "/ to get the =-icons |
2981 list2 updateList |
2790 list2 updateList |
2982 ]. |
2791 ]. |
2983 |
2792 |
2984 "Created: / 04-08-2011 / 17:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2793 "Created: / 04-08-2011 / 17:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2794 ! |
|
2795 |
|
2796 changeMenuDeleteSelectionInverted: changeList |
|
2797 | sel | |
|
2798 |
|
2799 sel := changeList selection ? #(). |
|
2800 changeList list do:[:change| |
|
2801 (sel includes: change) ifFalse:[ |
|
2802 self changeMenuDeleteChange:change change |
|
2803 ]. |
|
2804 ]. |
|
2805 changeList updateList. |
|
2806 (list2 notNil and:[changeList ~~ list2]) ifTrue:[ |
|
2807 "/ to get the =-icons |
|
2808 list2 updateList |
|
2809 ]. |
|
2810 |
|
2811 "Created: / 17-05-2012 / 22:55:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2985 ! |
2812 ! |
2986 |
2813 |
2987 changeMenuDeleteToEnd: changeList |
2814 changeMenuDeleteToEnd: changeList |
2988 |lastIdx| |
2815 |lastIdx| |
2989 |
2816 |
3032 changeMenuSelectDifferences: changeList |
2859 changeMenuSelectDifferences: changeList |
3033 |
2860 |
3034 self changeMenuSelectIn: changeList suchThat:[:change|change delta = #~] |
2861 self changeMenuSelectIn: changeList suchThat:[:change|change delta = #~] |
3035 |
2862 |
3036 "Created: / 04-08-2011 / 17:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2863 "Created: / 04-08-2011 / 17:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2864 ! |
|
2865 |
|
2866 changeMenuSelectInversion: changeList |
|
2867 |
|
2868 | oldSel newSel | |
|
2869 oldSel := changeList selection. |
|
2870 newSel := oldSel species new. |
|
2871 changeList list do:[:change| |
|
2872 (oldSel includes: change) ifFalse:[ |
|
2873 newSel add: change. |
|
2874 ] |
|
2875 ]. |
|
2876 changeList selection: newSel. |
|
2877 |
|
2878 "Created: / 17-05-2012 / 23:03:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3037 ! |
2879 ! |
3038 |
2880 |
3039 changeMenuSelectNone: changeList |
2881 changeMenuSelectNone: changeList |
3040 |
2882 |
3041 self changeMenuSelectIn: changeList suchThat:[:change|false] |
2883 self changeMenuSelectIn: changeList suchThat:[:change|false] |
3248 "Modified: / 20-03-2012 / 17:16:40 / cg" |
3090 "Modified: / 20-03-2012 / 17:16:40 / cg" |
3249 ! |
3091 ! |
3250 |
3092 |
3251 showProgress: label while: block |
3093 showProgress: label while: block |
3252 |
3094 |
3253 self infoPanel progress: label while: block |
3095 self infoPanel progress: label while: [ |
3096 [ |
|
3097 self isWorkingHolder value: true. |
|
3098 block value |
|
3099 ] ensure:[ |
|
3100 self isWorkingHolder value: false. |
|
3101 ] |
|
3102 ] |
|
3254 |
3103 |
3255 "Created: / 10-02-2012 / 10:35:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3104 "Created: / 10-02-2012 / 10:35:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3256 ! |
3105 ! |
3257 |
3106 |
3258 showSource: aBoolean |
3107 showSource: aBoolean |
3624 ! ! |
3473 ! ! |
3625 |
3474 |
3626 !ChangeSetBrowser2 class methodsFor:'documentation'! |
3475 !ChangeSetBrowser2 class methodsFor:'documentation'! |
3627 |
3476 |
3628 version |
3477 version |
3629 ^ '$Id: Tools__ChangeSetBrowser2.st 7963 2012-04-03 12:32:03Z vranyj1 $' |
3478 ^ '$Id: Tools__ChangeSetBrowser2.st 7999 2012-05-17 23:13:53Z vranyj1 $' |
3630 ! |
3479 ! |
3631 |
3480 |
3632 version_CVS |
3481 version_CVS |
3633 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.32 2012/03/20 18:18:17 cg Exp §' |
3482 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.32 2012/03/20 18:18:17 cg Exp §' |
3634 ! |
3483 ! |
3635 |
3484 |
3636 version_SVN |
3485 version_SVN |
3637 ^ '$Id: Tools__ChangeSetBrowser2.st 7963 2012-04-03 12:32:03Z vranyj1 $' |
3486 ^ '$Id: Tools__ChangeSetBrowser2.st 7999 2012-05-17 23:13:53Z vranyj1 $' |
3638 ! ! |
3487 ! ! |