Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- changeset 3471
- 31a6d4300906
- parent 3349
- 2a034a7f1f54
- child 3515
- 1b8381afe38f
equal
deleted
inserted
replaced
| 3469:53a53c45a3f0 | 3471:31a6d4300906 |
|---|---|
| 261 self.tr('Show status'), self._VCSStatus) | 261 self.tr('Show status'), self._VCSStatus) |
| 262 self.vcsMenuActions.append(act) | 262 self.vcsMenuActions.append(act) |
| 263 menu.addSeparator() | 263 menu.addSeparator() |
| 264 act = menu.addAction( | 264 act = menu.addAction( |
| 265 UI.PixmapCache.getIcon("vcsDiff.png"), | 265 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 266 self.tr('Show difference'), self._VCSDiff) | 266 self.tr('Show differences'), self._VCSDiff) |
| 267 self.vcsMenuActions.append(act) | 267 self.vcsMenuActions.append(act) |
| 268 act = menu.addAction( | 268 act = menu.addAction( |
| 269 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 269 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 270 self.tr('Show difference side-by-side'), self.__SVNSbsDiff) | 270 self.tr('Show differences side-by-side'), self.__SVNSbsDiff) |
| 271 self.vcsMenuActions.append(act) | 271 self.vcsMenuActions.append(act) |
| 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 (extended)'), | 274 self.tr('Show differences (extended)'), |
| 275 self.__SVNExtendedDiff) | 275 self.__SVNExtendedDiff) |
| 276 self.vcsMenuActions.append(act) | 276 self.vcsMenuActions.append(act) |
| 277 act = menu.addAction( | 277 act = menu.addAction( |
| 278 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 278 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 279 self.tr('Show difference side-by-side (extended)'), | 279 self.tr('Show differences side-by-side (extended)'), |
| 280 self.__SVNSbsExtendedDiff) | 280 self.__SVNSbsExtendedDiff) |
| 281 self.vcsMenuActions.append(act) | 281 self.vcsMenuActions.append(act) |
| 282 act = menu.addAction( | 282 act = menu.addAction( |
| 283 UI.PixmapCache.getIcon("vcsDiff.png"), | 283 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 284 self.tr('Show difference (URLs)'), | 284 self.tr('Show differences (URLs)'), |
| 285 self.__SVNUrlDiff) | 285 self.__SVNUrlDiff) |
| 286 self.vcsMenuActions.append(act) | 286 self.vcsMenuActions.append(act) |
| 287 self.blameAct = menu.addAction( | 287 self.blameAct = menu.addAction( |
| 288 self.tr('Show annotated file'), | 288 self.tr('Show annotated file'), |
| 289 self.__SVNBlame) | 289 self.__SVNBlame) |
| 296 act = menu.addAction( | 296 act = menu.addAction( |
| 297 UI.PixmapCache.getIcon("vcsMerge.png"), | 297 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 298 self.tr('Merge changes'), self._VCSMerge) | 298 self.tr('Merge changes'), self._VCSMerge) |
| 299 self.vcsMenuActions.append(act) | 299 self.vcsMenuActions.append(act) |
| 300 act = menu.addAction( | 300 act = menu.addAction( |
| 301 self.tr('Conflict resolved'), self.__SVNResolve) | 301 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 302 self.vcsMenuActions.append(act) | 302 self.vcsMenuActions.append(act) |
| 303 if self.vcs.version >= (1, 2, 0): | 303 if self.vcs.version >= (1, 2, 0): |
| 304 menu.addSeparator() | 304 menu.addSeparator() |
| 305 act = menu.addAction( | 305 act = menu.addAction( |
| 306 UI.PixmapCache.getIcon("vcsLock.png"), | 306 UI.PixmapCache.getIcon("vcsLock.png"), |
| 404 self.tr('Show status'), self._VCSStatus) | 404 self.tr('Show status'), self._VCSStatus) |
| 405 self.vcsMultiMenuActions.append(act) | 405 self.vcsMultiMenuActions.append(act) |
| 406 menu.addSeparator() | 406 menu.addSeparator() |
| 407 act = menu.addAction( | 407 act = menu.addAction( |
| 408 UI.PixmapCache.getIcon("vcsDiff.png"), | 408 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 409 self.tr('Show difference'), self._VCSDiff) | 409 self.tr('Show differences'), self._VCSDiff) |
| 410 self.vcsMultiMenuActions.append(act) | 410 self.vcsMultiMenuActions.append(act) |
| 411 act = menu.addAction( | 411 act = menu.addAction( |
| 412 UI.PixmapCache.getIcon("vcsDiff.png"), | 412 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 413 self.tr('Show difference (extended)'), | 413 self.tr('Show differences (extended)'), |
| 414 self.__SVNExtendedDiff) | 414 self.__SVNExtendedDiff) |
| 415 self.vcsMultiMenuActions.append(act) | 415 self.vcsMultiMenuActions.append(act) |
| 416 act = menu.addAction( | 416 act = menu.addAction( |
| 417 UI.PixmapCache.getIcon("vcsDiff.png"), | 417 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 418 self.tr('Show difference (URLs)'), | 418 self.tr('Show differences (URLs)'), |
| 419 self.__SVNUrlDiff) | 419 self.__SVNUrlDiff) |
| 420 self.vcsMultiMenuActions.append(act) | 420 self.vcsMultiMenuActions.append(act) |
| 421 menu.addSeparator() | 421 menu.addSeparator() |
| 422 act = menu.addAction( | 422 act = menu.addAction( |
| 423 UI.PixmapCache.getIcon("vcsRevert.png"), | 423 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 424 self.tr('Revert changes'), self._VCSRevert) | 424 self.tr('Revert changes'), self._VCSRevert) |
| 425 self.vcsMultiMenuActions.append(act) | 425 self.vcsMultiMenuActions.append(act) |
| 426 act = menu.addAction( | 426 act = menu.addAction( |
| 427 self.tr('Conflict resolved'), self.__SVNResolve) | 427 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 428 self.vcsMultiMenuActions.append(act) | 428 self.vcsMultiMenuActions.append(act) |
| 429 if self.vcs.version >= (1, 2, 0): | 429 if self.vcs.version >= (1, 2, 0): |
| 430 menu.addSeparator() | 430 menu.addSeparator() |
| 431 act = menu.addAction( | 431 act = menu.addAction( |
| 432 UI.PixmapCache.getIcon("vcsLock.png"), | 432 UI.PixmapCache.getIcon("vcsLock.png"), |
| 574 self.tr('Show status'), self._VCSStatus) | 574 self.tr('Show status'), self._VCSStatus) |
| 575 self.vcsDirMenuActions.append(act) | 575 self.vcsDirMenuActions.append(act) |
| 576 menu.addSeparator() | 576 menu.addSeparator() |
| 577 act = menu.addAction( | 577 act = menu.addAction( |
| 578 UI.PixmapCache.getIcon("vcsDiff.png"), | 578 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 579 self.tr('Show difference'), self._VCSDiff) | 579 self.tr('Show differences'), self._VCSDiff) |
| 580 self.vcsDirMenuActions.append(act) | 580 self.vcsDirMenuActions.append(act) |
| 581 act = menu.addAction( | 581 act = menu.addAction( |
| 582 UI.PixmapCache.getIcon("vcsDiff.png"), | 582 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 583 self.tr('Show difference (extended)'), | 583 self.tr('Show differences (extended)'), |
| 584 self.__SVNExtendedDiff) | 584 self.__SVNExtendedDiff) |
| 585 self.vcsDirMenuActions.append(act) | 585 self.vcsDirMenuActions.append(act) |
| 586 act = menu.addAction( | 586 act = menu.addAction( |
| 587 UI.PixmapCache.getIcon("vcsDiff.png"), | 587 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 588 self.tr('Show difference (URLs)'), | 588 self.tr('Show differences (URLs)'), |
| 589 self.__SVNUrlDiff) | 589 self.__SVNUrlDiff) |
| 590 self.vcsDirMenuActions.append(act) | 590 self.vcsDirMenuActions.append(act) |
| 591 menu.addSeparator() | 591 menu.addSeparator() |
| 592 act = menu.addAction( | 592 act = menu.addAction( |
| 593 UI.PixmapCache.getIcon("vcsRevert.png"), | 593 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 596 act = menu.addAction( | 596 act = menu.addAction( |
| 597 UI.PixmapCache.getIcon("vcsMerge.png"), | 597 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 598 self.tr('Merge changes'), self._VCSMerge) | 598 self.tr('Merge changes'), self._VCSMerge) |
| 599 self.vcsDirMenuActions.append(act) | 599 self.vcsDirMenuActions.append(act) |
| 600 act = menu.addAction( | 600 act = menu.addAction( |
| 601 self.tr('Conflict resolved'), self.__SVNResolve) | 601 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 602 self.vcsDirMenuActions.append(act) | 602 self.vcsDirMenuActions.append(act) |
| 603 menu.addSeparator() | 603 menu.addSeparator() |
| 604 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 604 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 605 self.vcsDirMenuActions.append(act) | 605 self.vcsDirMenuActions.append(act) |
| 606 act = menu.addAction( | 606 act = menu.addAction( |
| 683 self.tr('Show status'), self._VCSStatus) | 683 self.tr('Show status'), self._VCSStatus) |
| 684 self.vcsDirMultiMenuActions.append(act) | 684 self.vcsDirMultiMenuActions.append(act) |
| 685 menu.addSeparator() | 685 menu.addSeparator() |
| 686 act = menu.addAction( | 686 act = menu.addAction( |
| 687 UI.PixmapCache.getIcon("vcsDiff.png"), | 687 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 688 self.tr('Show difference'), self._VCSDiff) | 688 self.tr('Show differences'), self._VCSDiff) |
| 689 self.vcsDirMultiMenuActions.append(act) | 689 self.vcsDirMultiMenuActions.append(act) |
| 690 act = menu.addAction( | 690 act = menu.addAction( |
| 691 UI.PixmapCache.getIcon("vcsDiff.png"), | 691 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 692 self.tr('Show difference (extended)'), | 692 self.tr('Show differences (extended)'), |
| 693 self.__SVNExtendedDiff) | 693 self.__SVNExtendedDiff) |
| 694 self.vcsDirMultiMenuActions.append(act) | 694 self.vcsDirMultiMenuActions.append(act) |
| 695 act = menu.addAction( | 695 act = menu.addAction( |
| 696 UI.PixmapCache.getIcon("vcsDiff.png"), | 696 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 697 self.tr('Show difference (URLs)'), | 697 self.tr('Show differences (URLs)'), |
| 698 self.__SVNUrlDiff) | 698 self.__SVNUrlDiff) |
| 699 self.vcsDirMultiMenuActions.append(act) | 699 self.vcsDirMultiMenuActions.append(act) |
| 700 menu.addSeparator() | 700 menu.addSeparator() |
| 701 act = menu.addAction( | 701 act = menu.addAction( |
| 702 UI.PixmapCache.getIcon("vcsRevert.png"), | 702 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 705 act = menu.addAction( | 705 act = menu.addAction( |
| 706 UI.PixmapCache.getIcon("vcsMerge.png"), | 706 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 707 self.tr('Merge changes'), self._VCSMerge) | 707 self.tr('Merge changes'), self._VCSMerge) |
| 708 self.vcsDirMultiMenuActions.append(act) | 708 self.vcsDirMultiMenuActions.append(act) |
| 709 act = menu.addAction( | 709 act = menu.addAction( |
| 710 self.tr('Conflict resolved'), self.__SVNResolve) | 710 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 711 self.vcsDirMultiMenuActions.append(act) | 711 self.vcsDirMultiMenuActions.append(act) |
| 712 menu.addSeparator() | 712 menu.addSeparator() |
| 713 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 713 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 714 self.vcsDirMultiMenuActions.append(act) | 714 self.vcsDirMultiMenuActions.append(act) |
| 715 act = menu.addAction( | 715 act = menu.addAction( |
