Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
- changeset 3471
- 31a6d4300906
- parent 3359
- 6b6c224d67d6
- child 3515
- 1b8381afe38f
equal
deleted
inserted
replaced
| 3469:53a53c45a3f0 | 3471:31a6d4300906 |
|---|---|
| 321 self.tr('Show status'), self._VCSStatus) | 321 self.tr('Show status'), self._VCSStatus) |
| 322 self.vcsMenuActions.append(act) | 322 self.vcsMenuActions.append(act) |
| 323 menu.addSeparator() | 323 menu.addSeparator() |
| 324 act = menu.addAction( | 324 act = menu.addAction( |
| 325 UI.PixmapCache.getIcon("vcsDiff.png"), | 325 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 326 self.tr('Show difference'), self._VCSDiff) | 326 self.tr('Show differences'), self._VCSDiff) |
| 327 self.vcsMenuActions.append(act) | 327 self.vcsMenuActions.append(act) |
| 328 act = menu.addAction( | 328 act = menu.addAction( |
| 329 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 329 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 330 self.tr('Show difference side-by-side'), self.__HgSbsDiff) | 330 self.tr('Show differences side-by-side'), self.__HgSbsDiff) |
| 331 self.vcsMenuActions.append(act) | 331 self.vcsMenuActions.append(act) |
| 332 act = menu.addAction( | 332 act = menu.addAction( |
| 333 UI.PixmapCache.getIcon("vcsDiff.png"), | 333 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 334 self.tr('Show difference (extended)'), | 334 self.tr('Show differences (extended)'), |
| 335 self.__HgExtendedDiff) | 335 self.__HgExtendedDiff) |
| 336 self.vcsMenuActions.append(act) | 336 self.vcsMenuActions.append(act) |
| 337 act = menu.addAction( | 337 act = menu.addAction( |
| 338 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 338 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
| 339 self.tr('Show difference side-by-side (extended)'), | 339 self.tr('Show differences side-by-side (extended)'), |
| 340 self.__HgSbsExtendedDiff) | 340 self.__HgSbsExtendedDiff) |
| 341 self.vcsMenuActions.append(act) | 341 self.vcsMenuActions.append(act) |
| 342 self.annotateAct = menu.addAction( | 342 self.annotateAct = menu.addAction( |
| 343 self.tr('Show annotated file'), | 343 self.tr('Show annotated file'), |
| 344 self.__HgAnnotate) | 344 self.__HgAnnotate) |
| 347 act = menu.addAction( | 347 act = menu.addAction( |
| 348 UI.PixmapCache.getIcon("vcsRevert.png"), | 348 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 349 self.tr('Revert changes'), self.__HgRevert) | 349 self.tr('Revert changes'), self.__HgRevert) |
| 350 self.vcsMenuActions.append(act) | 350 self.vcsMenuActions.append(act) |
| 351 act = menu.addAction( | 351 act = menu.addAction( |
| 352 self.tr('Conflict resolved'), self.__HgResolve) | 352 self.tr('Conflicts resolved'), self.__HgResolve) |
| 353 self.vcsMenuActions.append(act) | 353 self.vcsMenuActions.append(act) |
| 354 menu.addSeparator() | 354 menu.addSeparator() |
| 355 menu.addAction(self.tr('Select all local file entries'), | 355 menu.addAction(self.tr('Select all local file entries'), |
| 356 self.browser.selectLocalEntries) | 356 self.browser.selectLocalEntries) |
| 357 menu.addAction(self.tr('Select all versioned file entries'), | 357 menu.addAction(self.tr('Select all versioned file entries'), |
| 415 self.tr('Show status'), self._VCSStatus) | 415 self.tr('Show status'), self._VCSStatus) |
| 416 self.vcsMultiMenuActions.append(act) | 416 self.vcsMultiMenuActions.append(act) |
| 417 menu.addSeparator() | 417 menu.addSeparator() |
| 418 act = menu.addAction( | 418 act = menu.addAction( |
| 419 UI.PixmapCache.getIcon("vcsDiff.png"), | 419 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 420 self.tr('Show difference'), self._VCSDiff) | 420 self.tr('Show differences'), self._VCSDiff) |
| 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 (extended)'), | 424 self.tr('Show differences (extended)'), |
| 425 self.__HgExtendedDiff) | 425 self.__HgExtendedDiff) |
| 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.__HgRevert) | 430 self.tr('Revert changes'), self.__HgRevert) |
| 431 self.vcsMultiMenuActions.append(act) | 431 self.vcsMultiMenuActions.append(act) |
| 432 act = menu.addAction( | 432 act = menu.addAction( |
| 433 self.tr('Conflict resolved'), self.__HgResolve) | 433 self.tr('Conflicts resolved'), self.__HgResolve) |
| 434 self.vcsMultiMenuActions.append(act) | 434 self.vcsMultiMenuActions.append(act) |
| 435 menu.addSeparator() | 435 menu.addSeparator() |
| 436 menu.addAction(self.tr('Select all local file entries'), | 436 menu.addAction(self.tr('Select all local file entries'), |
| 437 self.browser.selectLocalEntries) | 437 self.browser.selectLocalEntries) |
| 438 menu.addAction(self.tr('Select all versioned file entries'), | 438 menu.addAction(self.tr('Select all versioned file entries'), |
| 539 self.tr('Show status'), self._VCSStatus) | 539 self.tr('Show status'), self._VCSStatus) |
| 540 self.vcsDirMenuActions.append(act) | 540 self.vcsDirMenuActions.append(act) |
| 541 menu.addSeparator() | 541 menu.addSeparator() |
| 542 act = menu.addAction( | 542 act = menu.addAction( |
| 543 UI.PixmapCache.getIcon("vcsDiff.png"), | 543 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 544 self.tr('Show difference'), self._VCSDiff) | 544 self.tr('Show differences'), self._VCSDiff) |
| 545 self.vcsDirMenuActions.append(act) | 545 self.vcsDirMenuActions.append(act) |
| 546 act = menu.addAction( | 546 act = menu.addAction( |
| 547 UI.PixmapCache.getIcon("vcsDiff.png"), | 547 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 548 self.tr('Show difference (extended)'), | 548 self.tr('Show differences (extended)'), |
| 549 self.__HgExtendedDiff) | 549 self.__HgExtendedDiff) |
| 550 self.vcsDirMenuActions.append(act) | 550 self.vcsDirMenuActions.append(act) |
| 551 menu.addSeparator() | 551 menu.addSeparator() |
| 552 act = menu.addAction( | 552 act = menu.addAction( |
| 553 UI.PixmapCache.getIcon("vcsRevert.png"), | 553 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 554 self.tr('Revert changes'), self.__HgRevert) | 554 self.tr('Revert changes'), self.__HgRevert) |
| 555 self.vcsDirMenuActions.append(act) | 555 self.vcsDirMenuActions.append(act) |
| 556 act = menu.addAction( | 556 act = menu.addAction( |
| 557 self.tr('Conflict resolved'), self.__HgResolve) | 557 self.tr('Conflicts resolved'), self.__HgResolve) |
| 558 self.vcsDirMenuActions.append(act) | 558 self.vcsDirMenuActions.append(act) |
| 559 menu.addSeparator() | 559 menu.addSeparator() |
| 560 menu.addAction(self.tr('Select all local file entries'), | 560 menu.addAction(self.tr('Select all local file entries'), |
| 561 self.browser.selectLocalEntries) | 561 self.browser.selectLocalEntries) |
| 562 menu.addAction(self.tr('Select all versioned file entries'), | 562 menu.addAction(self.tr('Select all versioned file entries'), |
| 617 self.tr('Show status'), self._VCSStatus) | 617 self.tr('Show status'), self._VCSStatus) |
| 618 self.vcsDirMultiMenuActions.append(act) | 618 self.vcsDirMultiMenuActions.append(act) |
| 619 menu.addSeparator() | 619 menu.addSeparator() |
| 620 act = menu.addAction( | 620 act = menu.addAction( |
| 621 UI.PixmapCache.getIcon("vcsDiff.png"), | 621 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 622 self.tr('Show difference'), self._VCSDiff) | 622 self.tr('Show differences'), self._VCSDiff) |
| 623 self.vcsDirMultiMenuActions.append(act) | 623 self.vcsDirMultiMenuActions.append(act) |
| 624 act = menu.addAction( | 624 act = menu.addAction( |
| 625 UI.PixmapCache.getIcon("vcsDiff.png"), | 625 UI.PixmapCache.getIcon("vcsDiff.png"), |
| 626 self.tr('Show difference (extended)'), | 626 self.tr('Show differences (extended)'), |
| 627 self.__HgExtendedDiff) | 627 self.__HgExtendedDiff) |
| 628 self.vcsDirMultiMenuActions.append(act) | 628 self.vcsDirMultiMenuActions.append(act) |
| 629 menu.addSeparator() | 629 menu.addSeparator() |
| 630 act = menu.addAction( | 630 act = menu.addAction( |
| 631 UI.PixmapCache.getIcon("vcsRevert.png"), | 631 UI.PixmapCache.getIcon("vcsRevert.png"), |
| 632 self.tr('Revert changes'), self.__HgRevert) | 632 self.tr('Revert changes'), self.__HgRevert) |
| 633 self.vcsDirMultiMenuActions.append(act) | 633 self.vcsDirMultiMenuActions.append(act) |
| 634 act = menu.addAction( | 634 act = menu.addAction( |
| 635 self.tr('Conflict resolved'), self.__HgResolve) | 635 self.tr('Conflicts resolved'), self.__HgResolve) |
| 636 self.vcsDirMultiMenuActions.append(act) | 636 self.vcsDirMultiMenuActions.append(act) |
| 637 menu.addSeparator() | 637 menu.addSeparator() |
| 638 menu.addAction(self.tr('Select all local file entries'), | 638 menu.addAction(self.tr('Select all local file entries'), |
| 639 self.browser.selectLocalEntries) | 639 self.browser.selectLocalEntries) |
| 640 menu.addAction(self.tr('Select all versioned file entries'), | 640 menu.addAction(self.tr('Select all versioned file entries'), |
