Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- branch
- Py2 comp.
- changeset 3515
- 1b8381afe38f
- parent 3484
- 645c12de6b0c
- parent 3471
- 31a6d4300906
- child 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3506:d85fadb263a0 | 3515:1b8381afe38f |
|---|---|
| 269 self.tr('Show repository info'), self.__SVNInfo) | 269 self.tr('Show repository info'), self.__SVNInfo) |
| 270 self.vcsMenuActions.append(act) | 270 self.vcsMenuActions.append(act) |
| 271 menu.addSeparator() | 271 menu.addSeparator() |
| 272 act = menu.addAction( | 272 act = menu.addAction( |
| 273 UI.PixmapCache.getIcon("vcsDiff.png"), | 273 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 274 self.tr('Show difference'), self._VCSDiff) | 274 self.tr('Show differences'), self._VCSDiff) |
| 275 self.vcsMenuActions.append(act) | 275 self.vcsMenuActions.append(act) |
| 276 act = menu.addAction( | 276 act = menu.addAction( |
| 277 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 277 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 278 self.tr('Show difference side-by-side'), self.__SVNSbsDiff) | 278 self.tr('Show differences side-by-side'), self.__SVNSbsDiff) |
| 279 self.vcsMenuActions.append(act) | 279 self.vcsMenuActions.append(act) |
| 280 act = menu.addAction( | 280 act = menu.addAction( |
| 281 UI.PixmapCache.getIcon("vcsDiff.png"), | 281 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 282 self.tr('Show difference (extended)'), | 282 self.tr('Show differences (extended)'), |
| 283 self.__SVNExtendedDiff) | 283 self.__SVNExtendedDiff) |
| 284 self.vcsMenuActions.append(act) | 284 self.vcsMenuActions.append(act) |
| 285 act = menu.addAction( | 285 act = menu.addAction( |
| 286 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 286 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 287 self.tr('Show difference side-by-side (extended)'), | 287 self.tr('Show differences side-by-side (extended)'), |
| 288 self.__SVNSbsExtendedDiff) | 288 self.__SVNSbsExtendedDiff) |
| 289 self.vcsMenuActions.append(act) | 289 self.vcsMenuActions.append(act) |
| 290 act = menu.addAction( | 290 act = menu.addAction( |
| 291 UI.PixmapCache.getIcon("vcsDiff.png"), | 291 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 292 self.tr('Show difference (URLs)'), | 292 self.tr('Show differences (URLs)'), |
| 293 self.__SVNUrlDiff) | 293 self.__SVNUrlDiff) |
| 294 self.vcsMenuActions.append(act) | 294 self.vcsMenuActions.append(act) |
| 295 self.blameAct = menu.addAction( | 295 self.blameAct = menu.addAction( |
| 296 self.tr('Show annotated file'), | 296 self.tr('Show annotated file'), |
| 297 self.__SVNBlame) | 297 self.__SVNBlame) |
| 304 act = menu.addAction( | 304 act = menu.addAction( |
| 305 UI.PixmapCache.getIcon("vcsMerge.png"), | 305 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 306 self.tr('Merge changes'), self._VCSMerge) | 306 self.tr('Merge changes'), self._VCSMerge) |
| 307 self.vcsMenuActions.append(act) | 307 self.vcsMenuActions.append(act) |
| 308 act = menu.addAction( | 308 act = menu.addAction( |
| 309 self.tr('Conflict resolved'), self.__SVNResolve) | 309 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 310 self.vcsMenuActions.append(act) | 310 self.vcsMenuActions.append(act) |
| 311 menu.addSeparator() | 311 menu.addSeparator() |
| 312 act = menu.addAction( | 312 act = menu.addAction( |
| 313 UI.PixmapCache.getIcon("vcsLock.png"), | 313 UI.PixmapCache.getIcon("vcsLock.png"), |
| 314 self.tr('Lock'), self.__SVNLock) | 314 self.tr('Lock'), self.__SVNLock) |
| 410 self.tr('Show status'), self._VCSStatus) | 410 self.tr('Show status'), self._VCSStatus) |
| 411 self.vcsMultiMenuActions.append(act) | 411 self.vcsMultiMenuActions.append(act) |
| 412 menu.addSeparator() | 412 menu.addSeparator() |
| 413 act = menu.addAction( | 413 act = menu.addAction( |
| 414 UI.PixmapCache.getIcon("vcsDiff.png"), | 414 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 415 self.tr('Show difference'), self._VCSDiff) | 415 self.tr('Show differences'), self._VCSDiff) |
| 416 self.vcsMultiMenuActions.append(act) | 416 self.vcsMultiMenuActions.append(act) |
| 417 act = menu.addAction( | 417 act = menu.addAction( |
| 418 UI.PixmapCache.getIcon("vcsDiff.png"), | 418 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 419 self.tr('Show difference (extended)'), | 419 self.tr('Show differences (extended)'), |
| 420 self.__SVNExtendedDiff) | 420 self.__SVNExtendedDiff) |
| 421 self.vcsMultiMenuActions.append(act) | 421 self.vcsMultiMenuActions.append(act) |
| 422 act = menu.addAction( | 422 act = menu.addAction( |
| 423 UI.PixmapCache.getIcon("vcsDiff.png"), | 423 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 424 self.tr('Show difference (URLs)'), | 424 self.tr('Show differences (URLs)'), |
| 425 self.__SVNUrlDiff) | 425 self.__SVNUrlDiff) |
| 426 self.vcsMultiMenuActions.append(act) | 426 self.vcsMultiMenuActions.append(act) |
| 427 menu.addSeparator() | 427 menu.addSeparator() |
| 428 act = menu.addAction( | 428 act = menu.addAction( |
| 429 UI.PixmapCache.getIcon("vcsRevert.png"), | 429 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 430 self.tr('Revert changes'), self._VCSRevert) | 430 self.tr('Revert changes'), self._VCSRevert) |
| 431 self.vcsMultiMenuActions.append(act) | 431 self.vcsMultiMenuActions.append(act) |
| 432 act = menu.addAction( | 432 act = menu.addAction( |
| 433 self.tr('Conflict resolved'), self.__SVNResolve) | 433 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 434 self.vcsMultiMenuActions.append(act) | 434 self.vcsMultiMenuActions.append(act) |
| 435 menu.addSeparator() | 435 menu.addSeparator() |
| 436 act = menu.addAction( | 436 act = menu.addAction( |
| 437 UI.PixmapCache.getIcon("vcsLock.png"), | 437 UI.PixmapCache.getIcon("vcsLock.png"), |
| 438 self.tr('Lock'), self.__SVNLock) | 438 self.tr('Lock'), self.__SVNLock) |
| 581 self.tr('Show repository info'), self.__SVNInfo) | 581 self.tr('Show repository info'), self.__SVNInfo) |
| 582 self.vcsDirMenuActions.append(act) | 582 self.vcsDirMenuActions.append(act) |
| 583 menu.addSeparator() | 583 menu.addSeparator() |
| 584 act = menu.addAction( | 584 act = menu.addAction( |
| 585 UI.PixmapCache.getIcon("vcsDiff.png"), | 585 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 586 self.tr('Show difference'), self._VCSDiff) | 586 self.tr('Show differences'), self._VCSDiff) |
| 587 self.vcsDirMenuActions.append(act) | 587 self.vcsDirMenuActions.append(act) |
| 588 act = menu.addAction( | 588 act = menu.addAction( |
| 589 UI.PixmapCache.getIcon("vcsDiff.png"), | 589 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 590 self.tr('Show difference (extended)'), | 590 self.tr('Show differences (extended)'), |
| 591 self.__SVNExtendedDiff) | 591 self.__SVNExtendedDiff) |
| 592 self.vcsDirMenuActions.append(act) | 592 self.vcsDirMenuActions.append(act) |
| 593 act = menu.addAction( | 593 act = menu.addAction( |
| 594 UI.PixmapCache.getIcon("vcsDiff.png"), | 594 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 595 self.tr('Show difference (URLs)'), | 595 self.tr('Show differences (URLs)'), |
| 596 self.__SVNUrlDiff) | 596 self.__SVNUrlDiff) |
| 597 self.vcsDirMenuActions.append(act) | 597 self.vcsDirMenuActions.append(act) |
| 598 menu.addSeparator() | 598 menu.addSeparator() |
| 599 act = menu.addAction( | 599 act = menu.addAction( |
| 600 UI.PixmapCache.getIcon("vcsRevert.png"), | 600 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 603 act = menu.addAction( | 603 act = menu.addAction( |
| 604 UI.PixmapCache.getIcon("vcsMerge.png"), | 604 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 605 self.tr('Merge changes'), self._VCSMerge) | 605 self.tr('Merge changes'), self._VCSMerge) |
| 606 self.vcsDirMenuActions.append(act) | 606 self.vcsDirMenuActions.append(act) |
| 607 act = menu.addAction( | 607 act = menu.addAction( |
| 608 self.tr('Conflict resolved'), self.__SVNResolve) | 608 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 609 self.vcsDirMenuActions.append(act) | 609 self.vcsDirMenuActions.append(act) |
| 610 menu.addSeparator() | 610 menu.addSeparator() |
| 611 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 611 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 612 self.vcsDirMenuActions.append(act) | 612 self.vcsDirMenuActions.append(act) |
| 613 act = menu.addAction( | 613 act = menu.addAction( |
| 689 self.tr('Show status'), self._VCSStatus) | 689 self.tr('Show status'), self._VCSStatus) |
| 690 self.vcsDirMultiMenuActions.append(act) | 690 self.vcsDirMultiMenuActions.append(act) |
| 691 menu.addSeparator() | 691 menu.addSeparator() |
| 692 act = menu.addAction( | 692 act = menu.addAction( |
| 693 UI.PixmapCache.getIcon("vcsDiff.png"), | 693 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 694 self.tr('Show difference'), self._VCSDiff) | 694 self.tr('Show differences'), self._VCSDiff) |
| 695 self.vcsDirMultiMenuActions.append(act) | 695 self.vcsDirMultiMenuActions.append(act) |
| 696 act = menu.addAction( | 696 act = menu.addAction( |
| 697 UI.PixmapCache.getIcon("vcsDiff.png"), | 697 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 698 self.tr('Show difference (extended)'), | 698 self.tr('Show differences (extended)'), |
| 699 self.__SVNExtendedDiff) | 699 self.__SVNExtendedDiff) |
| 700 self.vcsDirMultiMenuActions.append(act) | 700 self.vcsDirMultiMenuActions.append(act) |
| 701 act = menu.addAction( | 701 act = menu.addAction( |
| 702 UI.PixmapCache.getIcon("vcsDiff.png"), | 702 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 703 self.tr('Show difference (URLs)'), | 703 self.tr('Show differences (URLs)'), |
| 704 self.__SVNUrlDiff) | 704 self.__SVNUrlDiff) |
| 705 self.vcsDirMultiMenuActions.append(act) | 705 self.vcsDirMultiMenuActions.append(act) |
| 706 menu.addSeparator() | 706 menu.addSeparator() |
| 707 act = menu.addAction( | 707 act = menu.addAction( |
| 708 UI.PixmapCache.getIcon("vcsRevert.png"), | 708 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 711 act = menu.addAction( | 711 act = menu.addAction( |
| 712 UI.PixmapCache.getIcon("vcsMerge.png"), | 712 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 713 self.tr('Merge changes'), self._VCSMerge) | 713 self.tr('Merge changes'), self._VCSMerge) |
| 714 self.vcsDirMultiMenuActions.append(act) | 714 self.vcsDirMultiMenuActions.append(act) |
| 715 act = menu.addAction( | 715 act = menu.addAction( |
| 716 self.tr('Conflict resolved'), self.__SVNResolve) | 716 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 717 self.vcsDirMultiMenuActions.append(act) | 717 self.vcsDirMultiMenuActions.append(act) |
| 718 menu.addSeparator() | 718 menu.addSeparator() |
| 719 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 719 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 720 self.vcsDirMultiMenuActions.append(act) | 720 self.vcsDirMultiMenuActions.append(act) |
| 721 act = menu.addAction( | 721 act = menu.addAction( |
