Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- changeset 7533
- 88261c96484b
- parent 7518
- 6dea4abd3097
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7532:1358e9d67a1c | 7533:88261c96484b |
|---|---|
| 210 font.setBold(True) | 210 font.setBold(True) |
| 211 act.setFont(font) | 211 act.setFont(font) |
| 212 menu.addSeparator() | 212 menu.addSeparator() |
| 213 | 213 |
| 214 act = menu.addAction( | 214 act = menu.addAction( |
| 215 UI.PixmapCache.getIcon("vcsUpdate.png"), | 215 UI.PixmapCache.getIcon("vcsUpdate"), |
| 216 self.tr('Update from repository'), self._VCSUpdate) | 216 self.tr('Update from repository'), self._VCSUpdate) |
| 217 self.vcsMenuActions.append(act) | 217 self.vcsMenuActions.append(act) |
| 218 act = menu.addAction( | 218 act = menu.addAction( |
| 219 UI.PixmapCache.getIcon("vcsCommit.png"), | 219 UI.PixmapCache.getIcon("vcsCommit"), |
| 220 self.tr('Commit changes to repository...'), | 220 self.tr('Commit changes to repository...'), |
| 221 self._VCSCommit) | 221 self._VCSCommit) |
| 222 self.vcsMenuActions.append(act) | 222 self.vcsMenuActions.append(act) |
| 223 menu.addSeparator() | 223 menu.addSeparator() |
| 224 act = menu.addAction( | 224 act = menu.addAction( |
| 225 UI.PixmapCache.getIcon("vcsAdd.png"), | 225 UI.PixmapCache.getIcon("vcsAdd"), |
| 226 self.tr('Add to repository'), | 226 self.tr('Add to repository'), |
| 227 self._VCSAdd) | 227 self._VCSAdd) |
| 228 self.vcsAddMenuActions.append(act) | 228 self.vcsAddMenuActions.append(act) |
| 229 if 1 in self.browser.specialMenuEntries: | 229 if 1 in self.browser.specialMenuEntries: |
| 230 self.vcsMenuAddTree = menu.addAction( | 230 self.vcsMenuAddTree = menu.addAction( |
| 231 UI.PixmapCache.getIcon("vcsAdd.png"), | 231 UI.PixmapCache.getIcon("vcsAdd"), |
| 232 self.tr('Add tree to repository'), | 232 self.tr('Add tree to repository'), |
| 233 self._VCSAddTree) | 233 self._VCSAddTree) |
| 234 self.vcsAddMenuActions.append(self.vcsMenuAddTree) | 234 self.vcsAddMenuActions.append(self.vcsMenuAddTree) |
| 235 act = menu.addAction( | 235 act = menu.addAction( |
| 236 UI.PixmapCache.getIcon("vcsRemove.png"), | 236 UI.PixmapCache.getIcon("vcsRemove"), |
| 237 self.tr('Remove from repository (and disk)'), | 237 self.tr('Remove from repository (and disk)'), |
| 238 self._VCSRemove) | 238 self._VCSRemove) |
| 239 self.vcsMenuActions.append(act) | 239 self.vcsMenuActions.append(act) |
| 240 menu.addSeparator() | 240 menu.addSeparator() |
| 241 act = menu.addAction( | 241 act = menu.addAction( |
| 253 self.tr("Remove from Changelist"), | 253 self.tr("Remove from Changelist"), |
| 254 self.__SVNRemoveFromChangelist) | 254 self.__SVNRemoveFromChangelist) |
| 255 self.vcsMenuActions.append(act) | 255 self.vcsMenuActions.append(act) |
| 256 menu.addSeparator() | 256 menu.addSeparator() |
| 257 act = menu.addAction( | 257 act = menu.addAction( |
| 258 UI.PixmapCache.getIcon("vcsLog.png"), | 258 UI.PixmapCache.getIcon("vcsLog"), |
| 259 self.tr('Show log browser'), self._VCSLogBrowser) | 259 self.tr('Show log browser'), self._VCSLogBrowser) |
| 260 self.vcsMenuActions.append(act) | 260 self.vcsMenuActions.append(act) |
| 261 menu.addSeparator() | 261 menu.addSeparator() |
| 262 act = menu.addAction( | 262 act = menu.addAction( |
| 263 UI.PixmapCache.getIcon("vcsStatus.png"), | 263 UI.PixmapCache.getIcon("vcsStatus"), |
| 264 self.tr('Show status'), self._VCSStatus) | 264 self.tr('Show status'), self._VCSStatus) |
| 265 self.vcsMenuActions.append(act) | 265 self.vcsMenuActions.append(act) |
| 266 act = menu.addAction( | 266 act = menu.addAction( |
| 267 UI.PixmapCache.getIcon("vcsRepo.png"), | 267 UI.PixmapCache.getIcon("vcsRepo"), |
| 268 self.tr('Show repository info'), self.__SVNInfo) | 268 self.tr('Show repository info'), self.__SVNInfo) |
| 269 self.vcsMenuActions.append(act) | 269 self.vcsMenuActions.append(act) |
| 270 menu.addSeparator() | 270 menu.addSeparator() |
| 271 act = menu.addAction( | 271 act = menu.addAction( |
| 272 UI.PixmapCache.getIcon("vcsDiff.png"), | 272 UI.PixmapCache.getIcon("vcsDiff"), |
| 273 self.tr('Show differences'), self._VCSDiff) | 273 self.tr('Show differences'), self._VCSDiff) |
| 274 self.vcsMenuActions.append(act) | 274 self.vcsMenuActions.append(act) |
| 275 act = menu.addAction( | 275 act = menu.addAction( |
| 276 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 276 UI.PixmapCache.getIcon("vcsSbsDiff"), |
| 277 self.tr('Show differences side-by-side'), self.__SVNSbsDiff) | 277 self.tr('Show differences side-by-side'), self.__SVNSbsDiff) |
| 278 self.vcsMenuActions.append(act) | 278 self.vcsMenuActions.append(act) |
| 279 act = menu.addAction( | 279 act = menu.addAction( |
| 280 UI.PixmapCache.getIcon("vcsDiff.png"), | 280 UI.PixmapCache.getIcon("vcsDiff"), |
| 281 self.tr('Show differences (extended)'), | 281 self.tr('Show differences (extended)'), |
| 282 self.__SVNExtendedDiff) | 282 self.__SVNExtendedDiff) |
| 283 self.vcsMenuActions.append(act) | 283 self.vcsMenuActions.append(act) |
| 284 act = menu.addAction( | 284 act = menu.addAction( |
| 285 UI.PixmapCache.getIcon("vcsSbsDiff.png"), | 285 UI.PixmapCache.getIcon("vcsSbsDiff"), |
| 286 self.tr('Show differences side-by-side (extended)'), | 286 self.tr('Show differences side-by-side (extended)'), |
| 287 self.__SVNSbsExtendedDiff) | 287 self.__SVNSbsExtendedDiff) |
| 288 self.vcsMenuActions.append(act) | 288 self.vcsMenuActions.append(act) |
| 289 act = menu.addAction( | 289 act = menu.addAction( |
| 290 UI.PixmapCache.getIcon("vcsDiff.png"), | 290 UI.PixmapCache.getIcon("vcsDiff"), |
| 291 self.tr('Show differences (URLs)'), | 291 self.tr('Show differences (URLs)'), |
| 292 self.__SVNUrlDiff) | 292 self.__SVNUrlDiff) |
| 293 self.vcsMenuActions.append(act) | 293 self.vcsMenuActions.append(act) |
| 294 self.blameAct = menu.addAction( | 294 self.blameAct = menu.addAction( |
| 295 self.tr('Show annotated file'), | 295 self.tr('Show annotated file'), |
| 296 self.__SVNBlame) | 296 self.__SVNBlame) |
| 297 self.vcsMenuActions.append(self.blameAct) | 297 self.vcsMenuActions.append(self.blameAct) |
| 298 menu.addSeparator() | 298 menu.addSeparator() |
| 299 act = menu.addAction( | 299 act = menu.addAction( |
| 300 UI.PixmapCache.getIcon("vcsRevert.png"), | 300 UI.PixmapCache.getIcon("vcsRevert"), |
| 301 self.tr('Revert changes'), self._VCSRevert) | 301 self.tr('Revert changes'), self._VCSRevert) |
| 302 self.vcsMenuActions.append(act) | 302 self.vcsMenuActions.append(act) |
| 303 act = menu.addAction( | 303 act = menu.addAction( |
| 304 UI.PixmapCache.getIcon("vcsMerge.png"), | 304 UI.PixmapCache.getIcon("vcsMerge"), |
| 305 self.tr('Merge changes'), self._VCSMerge) | 305 self.tr('Merge changes'), self._VCSMerge) |
| 306 self.vcsMenuActions.append(act) | 306 self.vcsMenuActions.append(act) |
| 307 act = menu.addAction( | 307 act = menu.addAction( |
| 308 self.tr('Conflicts resolved'), self.__SVNResolve) | 308 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 309 self.vcsMenuActions.append(act) | 309 self.vcsMenuActions.append(act) |
| 310 menu.addSeparator() | 310 menu.addSeparator() |
| 311 act = menu.addAction( | 311 act = menu.addAction( |
| 312 UI.PixmapCache.getIcon("vcsLock.png"), | 312 UI.PixmapCache.getIcon("vcsLock"), |
| 313 self.tr('Lock'), self.__SVNLock) | 313 self.tr('Lock'), self.__SVNLock) |
| 314 self.vcsMenuActions.append(act) | 314 self.vcsMenuActions.append(act) |
| 315 act = menu.addAction( | 315 act = menu.addAction( |
| 316 UI.PixmapCache.getIcon("vcsUnlock.png"), | 316 UI.PixmapCache.getIcon("vcsUnlock"), |
| 317 self.tr('Unlock'), self.__SVNUnlock) | 317 self.tr('Unlock'), self.__SVNUnlock) |
| 318 self.vcsMenuActions.append(act) | 318 self.vcsMenuActions.append(act) |
| 319 act = menu.addAction( | 319 act = menu.addAction( |
| 320 UI.PixmapCache.getIcon("vcsUnlock.png"), | 320 UI.PixmapCache.getIcon("vcsUnlock"), |
| 321 self.tr('Break Lock'), self.__SVNBreakLock) | 321 self.tr('Break Lock'), self.__SVNBreakLock) |
| 322 self.vcsMenuActions.append(act) | 322 self.vcsMenuActions.append(act) |
| 323 act = menu.addAction( | 323 act = menu.addAction( |
| 324 UI.PixmapCache.getIcon("vcsUnlock.png"), | 324 UI.PixmapCache.getIcon("vcsUnlock"), |
| 325 self.tr('Steal Lock'), self.__SVNStealLock) | 325 self.tr('Steal Lock'), self.__SVNStealLock) |
| 326 self.vcsMenuActions.append(act) | 326 self.vcsMenuActions.append(act) |
| 327 menu.addSeparator() | 327 menu.addSeparator() |
| 328 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 328 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 329 self.vcsMenuActions.append(act) | 329 self.vcsMenuActions.append(act) |
| 368 font.setBold(True) | 368 font.setBold(True) |
| 369 act.setFont(font) | 369 act.setFont(font) |
| 370 menu.addSeparator() | 370 menu.addSeparator() |
| 371 | 371 |
| 372 act = menu.addAction( | 372 act = menu.addAction( |
| 373 UI.PixmapCache.getIcon("vcsUpdate.png"), | 373 UI.PixmapCache.getIcon("vcsUpdate"), |
| 374 self.tr('Update from repository'), self._VCSUpdate) | 374 self.tr('Update from repository'), self._VCSUpdate) |
| 375 self.vcsMultiMenuActions.append(act) | 375 self.vcsMultiMenuActions.append(act) |
| 376 act = menu.addAction( | 376 act = menu.addAction( |
| 377 UI.PixmapCache.getIcon("vcsCommit.png"), | 377 UI.PixmapCache.getIcon("vcsCommit"), |
| 378 self.tr('Commit changes to repository...'), | 378 self.tr('Commit changes to repository...'), |
| 379 self._VCSCommit) | 379 self._VCSCommit) |
| 380 self.vcsMultiMenuActions.append(act) | 380 self.vcsMultiMenuActions.append(act) |
| 381 menu.addSeparator() | 381 menu.addSeparator() |
| 382 act = menu.addAction( | 382 act = menu.addAction( |
| 383 UI.PixmapCache.getIcon("vcsAdd.png"), | 383 UI.PixmapCache.getIcon("vcsAdd"), |
| 384 self.tr('Add to repository'), self._VCSAdd) | 384 self.tr('Add to repository'), self._VCSAdd) |
| 385 self.vcsAddMultiMenuActions.append(act) | 385 self.vcsAddMultiMenuActions.append(act) |
| 386 if 1 in self.browser.specialMenuEntries: | 386 if 1 in self.browser.specialMenuEntries: |
| 387 self.vcsMultiMenuAddTree = menu.addAction( | 387 self.vcsMultiMenuAddTree = menu.addAction( |
| 388 UI.PixmapCache.getIcon("vcsAdd.png"), | 388 UI.PixmapCache.getIcon("vcsAdd"), |
| 389 self.tr('Add tree to repository'), self._VCSAddTree) | 389 self.tr('Add tree to repository'), self._VCSAddTree) |
| 390 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) | 390 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) |
| 391 act = menu.addAction( | 391 act = menu.addAction( |
| 392 UI.PixmapCache.getIcon("vcsRemove.png"), | 392 UI.PixmapCache.getIcon("vcsRemove"), |
| 393 self.tr('Remove from repository (and disk)'), | 393 self.tr('Remove from repository (and disk)'), |
| 394 self._VCSRemove) | 394 self._VCSRemove) |
| 395 self.vcsMultiMenuActions.append(act) | 395 self.vcsMultiMenuActions.append(act) |
| 396 if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): | 396 if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): |
| 397 menu.addSeparator() | 397 menu.addSeparator() |
| 403 self.tr("Remove from Changelist"), | 403 self.tr("Remove from Changelist"), |
| 404 self.__SVNRemoveFromChangelist) | 404 self.__SVNRemoveFromChangelist) |
| 405 self.vcsMenuActions.append(act) | 405 self.vcsMenuActions.append(act) |
| 406 menu.addSeparator() | 406 menu.addSeparator() |
| 407 act = menu.addAction( | 407 act = menu.addAction( |
| 408 UI.PixmapCache.getIcon("vcsStatus.png"), | 408 UI.PixmapCache.getIcon("vcsStatus"), |
| 409 self.tr('Show status'), self._VCSStatus) | 409 self.tr('Show status'), self._VCSStatus) |
| 410 self.vcsMultiMenuActions.append(act) | 410 self.vcsMultiMenuActions.append(act) |
| 411 menu.addSeparator() | 411 menu.addSeparator() |
| 412 act = menu.addAction( | 412 act = menu.addAction( |
| 413 UI.PixmapCache.getIcon("vcsDiff.png"), | 413 UI.PixmapCache.getIcon("vcsDiff"), |
| 414 self.tr('Show differences'), self._VCSDiff) | 414 self.tr('Show differences'), self._VCSDiff) |
| 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"), |
| 418 self.tr('Show differences (extended)'), | 418 self.tr('Show differences (extended)'), |
| 419 self.__SVNExtendedDiff) | 419 self.__SVNExtendedDiff) |
| 420 self.vcsMultiMenuActions.append(act) | 420 self.vcsMultiMenuActions.append(act) |
| 421 act = menu.addAction( | 421 act = menu.addAction( |
| 422 UI.PixmapCache.getIcon("vcsDiff.png"), | 422 UI.PixmapCache.getIcon("vcsDiff"), |
| 423 self.tr('Show differences (URLs)'), | 423 self.tr('Show differences (URLs)'), |
| 424 self.__SVNUrlDiff) | 424 self.__SVNUrlDiff) |
| 425 self.vcsMultiMenuActions.append(act) | 425 self.vcsMultiMenuActions.append(act) |
| 426 menu.addSeparator() | 426 menu.addSeparator() |
| 427 act = menu.addAction( | 427 act = menu.addAction( |
| 428 UI.PixmapCache.getIcon("vcsRevert.png"), | 428 UI.PixmapCache.getIcon("vcsRevert"), |
| 429 self.tr('Revert changes'), self._VCSRevert) | 429 self.tr('Revert changes'), self._VCSRevert) |
| 430 self.vcsMultiMenuActions.append(act) | 430 self.vcsMultiMenuActions.append(act) |
| 431 act = menu.addAction( | 431 act = menu.addAction( |
| 432 self.tr('Conflicts resolved'), self.__SVNResolve) | 432 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 433 self.vcsMultiMenuActions.append(act) | 433 self.vcsMultiMenuActions.append(act) |
| 434 menu.addSeparator() | 434 menu.addSeparator() |
| 435 act = menu.addAction( | 435 act = menu.addAction( |
| 436 UI.PixmapCache.getIcon("vcsLock.png"), | 436 UI.PixmapCache.getIcon("vcsLock"), |
| 437 self.tr('Lock'), self.__SVNLock) | 437 self.tr('Lock'), self.__SVNLock) |
| 438 self.vcsMultiMenuActions.append(act) | 438 self.vcsMultiMenuActions.append(act) |
| 439 act = menu.addAction( | 439 act = menu.addAction( |
| 440 UI.PixmapCache.getIcon("vcsUnlock.png"), | 440 UI.PixmapCache.getIcon("vcsUnlock"), |
| 441 self.tr('Unlock'), self.__SVNUnlock) | 441 self.tr('Unlock'), self.__SVNUnlock) |
| 442 self.vcsMultiMenuActions.append(act) | 442 self.vcsMultiMenuActions.append(act) |
| 443 act = menu.addAction( | 443 act = menu.addAction( |
| 444 UI.PixmapCache.getIcon("vcsUnlock.png"), | 444 UI.PixmapCache.getIcon("vcsUnlock"), |
| 445 self.tr('Break Lock'), self.__SVNBreakLock) | 445 self.tr('Break Lock'), self.__SVNBreakLock) |
| 446 self.vcsMultiMenuActions.append(act) | 446 self.vcsMultiMenuActions.append(act) |
| 447 act = menu.addAction( | 447 act = menu.addAction( |
| 448 UI.PixmapCache.getIcon("vcsUnlock.png"), | 448 UI.PixmapCache.getIcon("vcsUnlock"), |
| 449 self.tr('Steal Lock'), self.__SVNStealLock) | 449 self.tr('Steal Lock'), self.__SVNStealLock) |
| 450 self.vcsMultiMenuActions.append(act) | 450 self.vcsMultiMenuActions.append(act) |
| 451 menu.addSeparator() | 451 menu.addSeparator() |
| 452 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) | 452 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
| 453 self.vcsMultiMenuActions.append(act) | 453 self.vcsMultiMenuActions.append(act) |
| 526 font.setBold(True) | 526 font.setBold(True) |
| 527 act.setFont(font) | 527 act.setFont(font) |
| 528 menu.addSeparator() | 528 menu.addSeparator() |
| 529 | 529 |
| 530 act = menu.addAction( | 530 act = menu.addAction( |
| 531 UI.PixmapCache.getIcon("vcsUpdate.png"), | 531 UI.PixmapCache.getIcon("vcsUpdate"), |
| 532 self.tr('Update from repository'), self._VCSUpdate) | 532 self.tr('Update from repository'), self._VCSUpdate) |
| 533 self.vcsDirMenuActions.append(act) | 533 self.vcsDirMenuActions.append(act) |
| 534 act = menu.addAction( | 534 act = menu.addAction( |
| 535 UI.PixmapCache.getIcon("vcsCommit.png"), | 535 UI.PixmapCache.getIcon("vcsCommit"), |
| 536 self.tr('Commit changes to repository...'), | 536 self.tr('Commit changes to repository...'), |
| 537 self._VCSCommit) | 537 self._VCSCommit) |
| 538 self.vcsDirMenuActions.append(act) | 538 self.vcsDirMenuActions.append(act) |
| 539 menu.addSeparator() | 539 menu.addSeparator() |
| 540 act = menu.addAction( | 540 act = menu.addAction( |
| 541 UI.PixmapCache.getIcon("vcsAdd.png"), | 541 UI.PixmapCache.getIcon("vcsAdd"), |
| 542 self.tr('Add to repository'), self._VCSAdd) | 542 self.tr('Add to repository'), self._VCSAdd) |
| 543 self.vcsAddDirMenuActions.append(act) | 543 self.vcsAddDirMenuActions.append(act) |
| 544 act = menu.addAction( | 544 act = menu.addAction( |
| 545 UI.PixmapCache.getIcon("vcsRemove.png"), | 545 UI.PixmapCache.getIcon("vcsRemove"), |
| 546 self.tr('Remove from repository (and disk)'), | 546 self.tr('Remove from repository (and disk)'), |
| 547 self._VCSRemove) | 547 self._VCSRemove) |
| 548 self.vcsDirMenuActions.append(act) | 548 self.vcsDirMenuActions.append(act) |
| 549 menu.addSeparator() | 549 menu.addSeparator() |
| 550 act = menu.addAction(self.tr('Copy'), self.__SVNCopy) | 550 act = menu.addAction(self.tr('Copy'), self.__SVNCopy) |
| 561 self.tr("Remove from Changelist"), | 561 self.tr("Remove from Changelist"), |
| 562 self.__SVNRemoveFromChangelist) | 562 self.__SVNRemoveFromChangelist) |
| 563 self.vcsMenuActions.append(act) | 563 self.vcsMenuActions.append(act) |
| 564 menu.addSeparator() | 564 menu.addSeparator() |
| 565 act = menu.addAction( | 565 act = menu.addAction( |
| 566 UI.PixmapCache.getIcon("vcsLog.png"), | 566 UI.PixmapCache.getIcon("vcsLog"), |
| 567 self.tr('Show log browser'), self._VCSLogBrowser) | 567 self.tr('Show log browser'), self._VCSLogBrowser) |
| 568 self.vcsDirMenuActions.append(act) | 568 self.vcsDirMenuActions.append(act) |
| 569 menu.addSeparator() | 569 menu.addSeparator() |
| 570 act = menu.addAction( | 570 act = menu.addAction( |
| 571 UI.PixmapCache.getIcon("vcsStatus.png"), | 571 UI.PixmapCache.getIcon("vcsStatus"), |
| 572 self.tr('Show status'), self._VCSStatus) | 572 self.tr('Show status'), self._VCSStatus) |
| 573 self.vcsDirMenuActions.append(act) | 573 self.vcsDirMenuActions.append(act) |
| 574 act = menu.addAction( | 574 act = menu.addAction( |
| 575 UI.PixmapCache.getIcon("vcsRepo.png"), | 575 UI.PixmapCache.getIcon("vcsRepo"), |
| 576 self.tr('Show repository info'), self.__SVNInfo) | 576 self.tr('Show repository info'), self.__SVNInfo) |
| 577 self.vcsDirMenuActions.append(act) | 577 self.vcsDirMenuActions.append(act) |
| 578 menu.addSeparator() | 578 menu.addSeparator() |
| 579 act = menu.addAction( | 579 act = menu.addAction( |
| 580 UI.PixmapCache.getIcon("vcsDiff.png"), | 580 UI.PixmapCache.getIcon("vcsDiff"), |
| 581 self.tr('Show differences'), self._VCSDiff) | 581 self.tr('Show differences'), self._VCSDiff) |
| 582 self.vcsDirMenuActions.append(act) | 582 self.vcsDirMenuActions.append(act) |
| 583 act = menu.addAction( | 583 act = menu.addAction( |
| 584 UI.PixmapCache.getIcon("vcsDiff.png"), | 584 UI.PixmapCache.getIcon("vcsDiff"), |
| 585 self.tr('Show differences (extended)'), | 585 self.tr('Show differences (extended)'), |
| 586 self.__SVNExtendedDiff) | 586 self.__SVNExtendedDiff) |
| 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"), |
| 590 self.tr('Show differences (URLs)'), | 590 self.tr('Show differences (URLs)'), |
| 591 self.__SVNUrlDiff) | 591 self.__SVNUrlDiff) |
| 592 self.vcsDirMenuActions.append(act) | 592 self.vcsDirMenuActions.append(act) |
| 593 menu.addSeparator() | 593 menu.addSeparator() |
| 594 act = menu.addAction( | 594 act = menu.addAction( |
| 595 UI.PixmapCache.getIcon("vcsRevert.png"), | 595 UI.PixmapCache.getIcon("vcsRevert"), |
| 596 self.tr('Revert changes'), self._VCSRevert) | 596 self.tr('Revert changes'), self._VCSRevert) |
| 597 self.vcsDirMenuActions.append(act) | 597 self.vcsDirMenuActions.append(act) |
| 598 act = menu.addAction( | 598 act = menu.addAction( |
| 599 UI.PixmapCache.getIcon("vcsMerge.png"), | 599 UI.PixmapCache.getIcon("vcsMerge"), |
| 600 self.tr('Merge changes'), self._VCSMerge) | 600 self.tr('Merge changes'), self._VCSMerge) |
| 601 self.vcsDirMenuActions.append(act) | 601 self.vcsDirMenuActions.append(act) |
| 602 act = menu.addAction( | 602 act = menu.addAction( |
| 603 self.tr('Conflicts resolved'), self.__SVNResolve) | 603 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 604 self.vcsDirMenuActions.append(act) | 604 self.vcsDirMenuActions.append(act) |
| 648 font.setBold(True) | 648 font.setBold(True) |
| 649 act.setFont(font) | 649 act.setFont(font) |
| 650 menu.addSeparator() | 650 menu.addSeparator() |
| 651 | 651 |
| 652 act = menu.addAction( | 652 act = menu.addAction( |
| 653 UI.PixmapCache.getIcon("vcsUpdate.png"), | 653 UI.PixmapCache.getIcon("vcsUpdate"), |
| 654 self.tr('Update from repository'), self._VCSUpdate) | 654 self.tr('Update from repository'), self._VCSUpdate) |
| 655 self.vcsDirMultiMenuActions.append(act) | 655 self.vcsDirMultiMenuActions.append(act) |
| 656 act = menu.addAction( | 656 act = menu.addAction( |
| 657 UI.PixmapCache.getIcon("vcsCommit.png"), | 657 UI.PixmapCache.getIcon("vcsCommit"), |
| 658 self.tr('Commit changes to repository...'), | 658 self.tr('Commit changes to repository...'), |
| 659 self._VCSCommit) | 659 self._VCSCommit) |
| 660 self.vcsDirMultiMenuActions.append(act) | 660 self.vcsDirMultiMenuActions.append(act) |
| 661 menu.addSeparator() | 661 menu.addSeparator() |
| 662 act = menu.addAction( | 662 act = menu.addAction( |
| 663 UI.PixmapCache.getIcon("vcsAdd.png"), | 663 UI.PixmapCache.getIcon("vcsAdd"), |
| 664 self.tr('Add to repository'), self._VCSAdd) | 664 self.tr('Add to repository'), self._VCSAdd) |
| 665 self.vcsAddDirMultiMenuActions.append(act) | 665 self.vcsAddDirMultiMenuActions.append(act) |
| 666 act = menu.addAction( | 666 act = menu.addAction( |
| 667 UI.PixmapCache.getIcon("vcsRemove.png"), | 667 UI.PixmapCache.getIcon("vcsRemove"), |
| 668 self.tr('Remove from repository (and disk)'), | 668 self.tr('Remove from repository (and disk)'), |
| 669 self._VCSRemove) | 669 self._VCSRemove) |
| 670 self.vcsDirMultiMenuActions.append(act) | 670 self.vcsDirMultiMenuActions.append(act) |
| 671 if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): | 671 if pysvn.svn_version >= (1, 5, 0) and pysvn.version >= (1, 6, 0): |
| 672 menu.addSeparator() | 672 menu.addSeparator() |
| 678 self.tr("Remove from Changelist"), | 678 self.tr("Remove from Changelist"), |
| 679 self.__SVNRemoveFromChangelist) | 679 self.__SVNRemoveFromChangelist) |
| 680 self.vcsMenuActions.append(act) | 680 self.vcsMenuActions.append(act) |
| 681 menu.addSeparator() | 681 menu.addSeparator() |
| 682 act = menu.addAction( | 682 act = menu.addAction( |
| 683 UI.PixmapCache.getIcon("vcsStatus.png"), | 683 UI.PixmapCache.getIcon("vcsStatus"), |
| 684 self.tr('Show status'), self._VCSStatus) | 684 self.tr('Show status'), self._VCSStatus) |
| 685 self.vcsDirMultiMenuActions.append(act) | 685 self.vcsDirMultiMenuActions.append(act) |
| 686 menu.addSeparator() | 686 menu.addSeparator() |
| 687 act = menu.addAction( | 687 act = menu.addAction( |
| 688 UI.PixmapCache.getIcon("vcsDiff.png"), | 688 UI.PixmapCache.getIcon("vcsDiff"), |
| 689 self.tr('Show differences'), self._VCSDiff) | 689 self.tr('Show differences'), self._VCSDiff) |
| 690 self.vcsDirMultiMenuActions.append(act) | 690 self.vcsDirMultiMenuActions.append(act) |
| 691 act = menu.addAction( | 691 act = menu.addAction( |
| 692 UI.PixmapCache.getIcon("vcsDiff.png"), | 692 UI.PixmapCache.getIcon("vcsDiff"), |
| 693 self.tr('Show differences (extended)'), | 693 self.tr('Show differences (extended)'), |
| 694 self.__SVNExtendedDiff) | 694 self.__SVNExtendedDiff) |
| 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"), |
| 698 self.tr('Show differences (URLs)'), | 698 self.tr('Show differences (URLs)'), |
| 699 self.__SVNUrlDiff) | 699 self.__SVNUrlDiff) |
| 700 self.vcsDirMultiMenuActions.append(act) | 700 self.vcsDirMultiMenuActions.append(act) |
| 701 menu.addSeparator() | 701 menu.addSeparator() |
| 702 act = menu.addAction( | 702 act = menu.addAction( |
| 703 UI.PixmapCache.getIcon("vcsRevert.png"), | 703 UI.PixmapCache.getIcon("vcsRevert"), |
| 704 self.tr('Revert changes'), self._VCSRevert) | 704 self.tr('Revert changes'), self._VCSRevert) |
| 705 self.vcsDirMultiMenuActions.append(act) | 705 self.vcsDirMultiMenuActions.append(act) |
| 706 act = menu.addAction( | 706 act = menu.addAction( |
| 707 UI.PixmapCache.getIcon("vcsMerge.png"), | 707 UI.PixmapCache.getIcon("vcsMerge"), |
| 708 self.tr('Merge changes'), self._VCSMerge) | 708 self.tr('Merge changes'), self._VCSMerge) |
| 709 self.vcsDirMultiMenuActions.append(act) | 709 self.vcsDirMultiMenuActions.append(act) |
| 710 act = menu.addAction( | 710 act = menu.addAction( |
| 711 self.tr('Conflicts resolved'), self.__SVNResolve) | 711 self.tr('Conflicts resolved'), self.__SVNResolve) |
| 712 self.vcsDirMultiMenuActions.append(act) | 712 self.vcsDirMultiMenuActions.append(act) |
