Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- changeset 3471
- 31a6d4300906
- parent 3349
- 2a034a7f1f54
- child 3515
- 1b8381afe38f
equal
deleted
inserted
replaced
| 3469:53a53c45a3f0 | 3471:31a6d4300906 |
|---|---|
| 267 self.tr('Show repository info'), self.__SVNInfo) | 267 self.tr('Show repository info'), self.__SVNInfo) |
| 268 self.vcsMenuActions.append(act) | 268 self.vcsMenuActions.append(act) |
| 269 menu.addSeparator() | 269 menu.addSeparator() |
| 270 act = menu.addAction( | 270 act = menu.addAction( |
| 271 UI.PixmapCache.getIcon("vcsDiff.png"), | 271 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 272 self.tr('Show difference'), self._VCSDiff) | 272 self.tr('Show differences'), self._VCSDiff) |
| 273 self.vcsMenuActions.append(act) | 273 self.vcsMenuActions.append(act) |
| 274 act = menu.addAction( | 274 act = menu.addAction( |
| 275 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 275 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 276 self.tr('Show difference side-by-side'), self.__SVNSbsDiff) | 276 self.tr('Show differences side-by-side'), self.__SVNSbsDiff) |
| 277 self.vcsMenuActions.append(act) | 277 self.vcsMenuActions.append(act) |
| 278 act = menu.addAction( | 278 act = menu.addAction( |
| 279 UI.PixmapCache.getIcon("vcsDiff.png"), | 279 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 280 self.tr('Show difference (extended)'), | 280 self.tr('Show differences (extended)'), |
| 281 self.__SVNExtendedDiff) | 281 self.__SVNExtendedDiff) |
| 282 self.vcsMenuActions.append(act) | 282 self.vcsMenuActions.append(act) |
| 283 act = menu.addAction( | 283 act = menu.addAction( |
| 284 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 284 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 285 self.tr('Show difference side-by-side (extended)'), | 285 self.tr('Show differences side-by-side (extended)'), |
| 286 self.__SVNSbsExtendedDiff) | 286 self.__SVNSbsExtendedDiff) |
| 287 self.vcsMenuActions.append(act) | 287 self.vcsMenuActions.append(act) |
| 288 act = menu.addAction( | 288 act = menu.addAction( |
| 289 UI.PixmapCache.getIcon("vcsDiff.png"), | 289 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 290 self.tr('Show difference (URLs)'), | 290 self.tr('Show differences (URLs)'), |
| 291 self.__SVNUrlDiff) | 291 self.__SVNUrlDiff) |
| 292 self.vcsMenuActions.append(act) | 292 self.vcsMenuActions.append(act) |
| 293 self.blameAct = menu.addAction( | 293 self.blameAct = menu.addAction( |
| 294 self.tr('Show annotated file'), | 294 self.tr('Show annotated file'), |
| 295 self.__SVNBlame) | 295 self.__SVNBlame) |
| 302 act = menu.addAction( | 302 act = menu.addAction( |
| 303 UI.PixmapCache.getIcon("vcsMerge.png"), | 303 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 304 self.tr('Merge changes'), self._VCSMerge) | 304 self.tr('Merge changes'), self._VCSMerge) |
| 305 self.vcsMenuActions.append(act) | 305 self.vcsMenuActions.append(act) |
| 306 act = menu.addAction( | 306 act = menu.addAction( |
| 307 self.tr('Conflict resolved'), self.__SVNResolve) | 307 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 308 self.vcsMenuActions.append(act) | 308 self.vcsMenuActions.append(act) |
| 309 menu.addSeparator() | 309 menu.addSeparator() |
| 310 act = menu.addAction( | 310 act = menu.addAction( |
| 311 UI.PixmapCache.getIcon("vcsLock.png"), | 311 UI.PixmapCache.getIcon("vcsLock.png"), |
| 312 self.tr('Lock'), self.__SVNLock) | 312 self.tr('Lock'), self.__SVNLock) |
| 408 self.tr('Show status'), self._VCSStatus) | 408 self.tr('Show status'), self._VCSStatus) |
| 409 self.vcsMultiMenuActions.append(act) | 409 self.vcsMultiMenuActions.append(act) |
| 410 menu.addSeparator() | 410 menu.addSeparator() |
| 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'), self._VCSDiff) | 413 self.tr('Show differences'), self._VCSDiff) |
| 414 self.vcsMultiMenuActions.append(act) | 414 self.vcsMultiMenuActions.append(act) |
| 415 act = menu.addAction( | 415 act = menu.addAction( |
| 416 UI.PixmapCache.getIcon("vcsDiff.png"), | 416 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 417 self.tr('Show difference (extended)'), | 417 self.tr('Show differences (extended)'), |
| 418 self.__SVNExtendedDiff) | 418 self.__SVNExtendedDiff) |
| 419 self.vcsMultiMenuActions.append(act) | 419 self.vcsMultiMenuActions.append(act) |
| 420 act = menu.addAction( | 420 act = menu.addAction( |
| 421 UI.PixmapCache.getIcon("vcsDiff.png"), | 421 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 422 self.tr('Show difference (URLs)'), | 422 self.tr('Show differences (URLs)'), |
| 423 self.__SVNUrlDiff) | 423 self.__SVNUrlDiff) |
| 424 self.vcsMultiMenuActions.append(act) | 424 self.vcsMultiMenuActions.append(act) |
| 425 menu.addSeparator() | 425 menu.addSeparator() |
| 426 act = menu.addAction( | 426 act = menu.addAction( |
| 427 UI.PixmapCache.getIcon("vcsRevert.png"), | 427 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 428 self.tr('Revert changes'), self._VCSRevert) | 428 self.tr('Revert changes'), self._VCSRevert) |
| 429 self.vcsMultiMenuActions.append(act) | 429 self.vcsMultiMenuActions.append(act) |
| 430 act = menu.addAction( | 430 act = menu.addAction( |
| 431 self.tr('Conflict resolved'), self.__SVNResolve) | 431 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 432 self.vcsMultiMenuActions.append(act) | 432 self.vcsMultiMenuActions.append(act) |
| 433 menu.addSeparator() | 433 menu.addSeparator() |
| 434 act = menu.addAction( | 434 act = menu.addAction( |
| 435 UI.PixmapCache.getIcon("vcsLock.png"), | 435 UI.PixmapCache.getIcon("vcsLock.png"), |
| 436 self.tr('Lock'), self.__SVNLock) | 436 self.tr('Lock'), self.__SVNLock) |
| 579 self.tr('Show repository info'), self.__SVNInfo) | 579 self.tr('Show repository info'), self.__SVNInfo) |
| 580 self.vcsDirMenuActions.append(act) | 580 self.vcsDirMenuActions.append(act) |
| 581 menu.addSeparator() | 581 menu.addSeparator() |
| 582 act = menu.addAction( | 582 act = menu.addAction( |
| 583 UI.PixmapCache.getIcon("vcsDiff.png"), | 583 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 584 self.tr('Show difference'), self._VCSDiff) | 584 self.tr('Show differences'), self._VCSDiff) |
| 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 (extended)'), | 588 self.tr('Show differences (extended)'), |
| 589 self.__SVNExtendedDiff) | 589 self.__SVNExtendedDiff) |
| 590 self.vcsDirMenuActions.append(act) | 590 self.vcsDirMenuActions.append(act) |
| 591 act = menu.addAction( | 591 act = menu.addAction( |
| 592 UI.PixmapCache.getIcon("vcsDiff.png"), | 592 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 593 self.tr('Show difference (URLs)'), | 593 self.tr('Show differences (URLs)'), |
| 594 self.__SVNUrlDiff) | 594 self.__SVNUrlDiff) |
| 595 self.vcsDirMenuActions.append(act) | 595 self.vcsDirMenuActions.append(act) |
| 596 menu.addSeparator() | 596 menu.addSeparator() |
| 597 act = menu.addAction( | 597 act = menu.addAction( |
| 598 UI.PixmapCache.getIcon("vcsRevert.png"), | 598 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 601 act = menu.addAction( | 601 act = menu.addAction( |
| 602 UI.PixmapCache.getIcon("vcsMerge.png"), | 602 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 603 self.tr('Merge changes'), self._VCSMerge) | 603 self.tr('Merge changes'), self._VCSMerge) |
| 604 self.vcsDirMenuActions.append(act) | 604 self.vcsDirMenuActions.append(act) |
| 605 act = menu.addAction( | 605 act = menu.addAction( |
| 606 self.tr('Conflict resolved'), self.__SVNResolve) | 606 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 607 self.vcsDirMenuActions.append(act) | 607 self.vcsDirMenuActions.append(act) |
| 608 menu.addSeparator() | 608 menu.addSeparator() |
| 609 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 609 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 610 self.vcsDirMenuActions.append(act) | 610 self.vcsDirMenuActions.append(act) |
| 611 act = menu.addAction( | 611 act = menu.addAction( |
| 687 self.tr('Show status'), self._VCSStatus) | 687 self.tr('Show status'), self._VCSStatus) |
| 688 self.vcsDirMultiMenuActions.append(act) | 688 self.vcsDirMultiMenuActions.append(act) |
| 689 menu.addSeparator() | 689 menu.addSeparator() |
| 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'), self._VCSDiff) | 692 self.tr('Show differences'), self._VCSDiff) |
| 693 self.vcsDirMultiMenuActions.append(act) | 693 self.vcsDirMultiMenuActions.append(act) |
| 694 act = menu.addAction( | 694 act = menu.addAction( |
| 695 UI.PixmapCache.getIcon("vcsDiff.png"), | 695 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 696 self.tr('Show difference (extended)'), | 696 self.tr('Show differences (extended)'), |
| 697 self.__SVNExtendedDiff) | 697 self.__SVNExtendedDiff) |
| 698 self.vcsDirMultiMenuActions.append(act) | 698 self.vcsDirMultiMenuActions.append(act) |
| 699 act = menu.addAction( | 699 act = menu.addAction( |
| 700 UI.PixmapCache.getIcon("vcsDiff.png"), | 700 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 701 self.tr('Show difference (URLs)'), | 701 self.tr('Show differences (URLs)'), |
| 702 self.__SVNUrlDiff) | 702 self.__SVNUrlDiff) |
| 703 self.vcsDirMultiMenuActions.append(act) | 703 self.vcsDirMultiMenuActions.append(act) |
| 704 menu.addSeparator() | 704 menu.addSeparator() |
| 705 act = menu.addAction( | 705 act = menu.addAction( |
| 706 UI.PixmapCache.getIcon("vcsRevert.png"), | 706 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 709 act = menu.addAction( | 709 act = menu.addAction( |
| 710 UI.PixmapCache.getIcon("vcsMerge.png"), | 710 UI.PixmapCache.getIcon("vcsMerge.png"), |
| 711 self.tr('Merge changes'), self._VCSMerge) | 711 self.tr('Merge changes'), self._VCSMerge) |
| 712 self.vcsDirMultiMenuActions.append(act) | 712 self.vcsDirMultiMenuActions.append(act) |
| 713 act = menu.addAction( | 713 act = menu.addAction( |
| 714 self.tr('Conflict resolved'), self.__SVNResolve) | 714 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 715 self.vcsDirMultiMenuActions.append(act) | 715 self.vcsDirMultiMenuActions.append(act) |
| 716 menu.addSeparator() | 716 menu.addSeparator() |
| 717 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 717 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 718 self.vcsDirMultiMenuActions.append(act) | 718 self.vcsDirMultiMenuActions.append(act) |
| 719 act = menu.addAction( | 719 act = menu.addAction( |
