208 font.setBold(True) |
208 font.setBold(True) |
209 act.setFont(font) |
209 act.setFont(font) |
210 menu.addSeparator() |
210 menu.addSeparator() |
211 |
211 |
212 act = menu.addAction( |
212 act = menu.addAction( |
213 UI.PixmapCache.getIcon("vcsUpdate.png"), |
213 UI.PixmapCache.getIcon("vcsUpdate"), |
214 self.tr('Update from repository'), self._VCSUpdate) |
214 self.tr('Update from repository'), self._VCSUpdate) |
215 self.vcsMenuActions.append(act) |
215 self.vcsMenuActions.append(act) |
216 act = menu.addAction( |
216 act = menu.addAction( |
217 UI.PixmapCache.getIcon("vcsCommit.png"), |
217 UI.PixmapCache.getIcon("vcsCommit"), |
218 self.tr('Commit changes to repository...'), |
218 self.tr('Commit changes to repository...'), |
219 self._VCSCommit) |
219 self._VCSCommit) |
220 self.vcsMenuActions.append(act) |
220 self.vcsMenuActions.append(act) |
221 menu.addSeparator() |
221 menu.addSeparator() |
222 act = menu.addAction( |
222 act = menu.addAction( |
223 UI.PixmapCache.getIcon("vcsAdd.png"), |
223 UI.PixmapCache.getIcon("vcsAdd"), |
224 self.tr('Add to repository'), |
224 self.tr('Add to repository'), |
225 self._VCSAdd) |
225 self._VCSAdd) |
226 self.vcsAddMenuActions.append(act) |
226 self.vcsAddMenuActions.append(act) |
227 if 1 in self.browser.specialMenuEntries: |
227 if 1 in self.browser.specialMenuEntries: |
228 self.vcsMenuAddTree = menu.addAction( |
228 self.vcsMenuAddTree = menu.addAction( |
229 UI.PixmapCache.getIcon("vcsAdd.png"), |
229 UI.PixmapCache.getIcon("vcsAdd"), |
230 self.tr('Add tree to repository'), |
230 self.tr('Add tree to repository'), |
231 self._VCSAddTree) |
231 self._VCSAddTree) |
232 self.vcsAddMenuActions.append(self.vcsMenuAddTree) |
232 self.vcsAddMenuActions.append(self.vcsMenuAddTree) |
233 act = menu.addAction( |
233 act = menu.addAction( |
234 UI.PixmapCache.getIcon("vcsRemove.png"), |
234 UI.PixmapCache.getIcon("vcsRemove"), |
235 self.tr('Remove from repository (and disk)'), |
235 self.tr('Remove from repository (and disk)'), |
236 self._VCSRemove) |
236 self._VCSRemove) |
237 self.vcsMenuActions.append(act) |
237 self.vcsMenuActions.append(act) |
238 menu.addSeparator() |
238 menu.addSeparator() |
239 act = menu.addAction(self.tr('Copy'), self.__SVNCopy) |
239 act = menu.addAction(self.tr('Copy'), self.__SVNCopy) |
250 self.tr("Remove from Changelist"), |
250 self.tr("Remove from Changelist"), |
251 self.__SVNRemoveFromChangelist) |
251 self.__SVNRemoveFromChangelist) |
252 self.vcsMenuActions.append(act) |
252 self.vcsMenuActions.append(act) |
253 menu.addSeparator() |
253 menu.addSeparator() |
254 act = menu.addAction( |
254 act = menu.addAction( |
255 UI.PixmapCache.getIcon("vcsLog.png"), |
255 UI.PixmapCache.getIcon("vcsLog"), |
256 self.tr('Show log browser'), self._VCSLogBrowser) |
256 self.tr('Show log browser'), self._VCSLogBrowser) |
257 self.vcsMenuActions.append(act) |
257 self.vcsMenuActions.append(act) |
258 menu.addSeparator() |
258 menu.addSeparator() |
259 act = menu.addAction( |
259 act = menu.addAction( |
260 UI.PixmapCache.getIcon("vcsStatus.png"), |
260 UI.PixmapCache.getIcon("vcsStatus"), |
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"), |
266 self.tr('Show differences'), 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"), |
270 self.tr('Show differences 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"), |
274 self.tr('Show differences (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"), |
279 self.tr('Show differences 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"), |
284 self.tr('Show differences (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) |
290 self.vcsMenuActions.append(self.blameAct) |
290 self.vcsMenuActions.append(self.blameAct) |
291 menu.addSeparator() |
291 menu.addSeparator() |
292 act = menu.addAction( |
292 act = menu.addAction( |
293 UI.PixmapCache.getIcon("vcsRevert.png"), |
293 UI.PixmapCache.getIcon("vcsRevert"), |
294 self.tr('Revert changes'), self._VCSRevert) |
294 self.tr('Revert changes'), self._VCSRevert) |
295 self.vcsMenuActions.append(act) |
295 self.vcsMenuActions.append(act) |
296 act = menu.addAction( |
296 act = menu.addAction( |
297 UI.PixmapCache.getIcon("vcsMerge.png"), |
297 UI.PixmapCache.getIcon("vcsMerge"), |
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('Conflicts 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"), |
307 self.tr('Lock'), self.__SVNLock) |
307 self.tr('Lock'), self.__SVNLock) |
308 self.vcsMenuActions.append(act) |
308 self.vcsMenuActions.append(act) |
309 act = menu.addAction( |
309 act = menu.addAction( |
310 UI.PixmapCache.getIcon("vcsUnlock.png"), |
310 UI.PixmapCache.getIcon("vcsUnlock"), |
311 self.tr('Unlock'), self.__SVNUnlock) |
311 self.tr('Unlock'), self.__SVNUnlock) |
312 self.vcsMenuActions.append(act) |
312 self.vcsMenuActions.append(act) |
313 act = menu.addAction( |
313 act = menu.addAction( |
314 UI.PixmapCache.getIcon("vcsUnlock.png"), |
314 UI.PixmapCache.getIcon("vcsUnlock"), |
315 self.tr('Break Lock'), self.__SVNBreakLock) |
315 self.tr('Break Lock'), self.__SVNBreakLock) |
316 self.vcsMenuActions.append(act) |
316 self.vcsMenuActions.append(act) |
317 act = menu.addAction( |
317 act = menu.addAction( |
318 UI.PixmapCache.getIcon("vcsUnlock.png"), |
318 UI.PixmapCache.getIcon("vcsUnlock"), |
319 self.tr('Steal Lock'), self.__SVNStealLock) |
319 self.tr('Steal Lock'), self.__SVNStealLock) |
320 self.vcsMenuActions.append(act) |
320 self.vcsMenuActions.append(act) |
321 menu.addSeparator() |
321 menu.addSeparator() |
322 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
322 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
323 self.vcsMenuActions.append(act) |
323 self.vcsMenuActions.append(act) |
363 font.setBold(True) |
363 font.setBold(True) |
364 act.setFont(font) |
364 act.setFont(font) |
365 menu.addSeparator() |
365 menu.addSeparator() |
366 |
366 |
367 act = menu.addAction( |
367 act = menu.addAction( |
368 UI.PixmapCache.getIcon("vcsUpdate.png"), |
368 UI.PixmapCache.getIcon("vcsUpdate"), |
369 self.tr('Update from repository'), self._VCSUpdate) |
369 self.tr('Update from repository'), self._VCSUpdate) |
370 self.vcsMultiMenuActions.append(act) |
370 self.vcsMultiMenuActions.append(act) |
371 act = menu.addAction( |
371 act = menu.addAction( |
372 UI.PixmapCache.getIcon("vcsCommit.png"), |
372 UI.PixmapCache.getIcon("vcsCommit"), |
373 self.tr('Commit changes to repository...'), |
373 self.tr('Commit changes to repository...'), |
374 self._VCSCommit) |
374 self._VCSCommit) |
375 self.vcsMultiMenuActions.append(act) |
375 self.vcsMultiMenuActions.append(act) |
376 menu.addSeparator() |
376 menu.addSeparator() |
377 act = menu.addAction( |
377 act = menu.addAction( |
378 UI.PixmapCache.getIcon("vcsAdd.png"), |
378 UI.PixmapCache.getIcon("vcsAdd"), |
379 self.tr('Add to repository'), self._VCSAdd) |
379 self.tr('Add to repository'), self._VCSAdd) |
380 self.vcsAddMultiMenuActions.append(act) |
380 self.vcsAddMultiMenuActions.append(act) |
381 if 1 in self.browser.specialMenuEntries: |
381 if 1 in self.browser.specialMenuEntries: |
382 self.vcsMultiMenuAddTree = menu.addAction( |
382 self.vcsMultiMenuAddTree = menu.addAction( |
383 UI.PixmapCache.getIcon("vcsAdd.png"), |
383 UI.PixmapCache.getIcon("vcsAdd"), |
384 self.tr('Add tree to repository'), self._VCSAddTree) |
384 self.tr('Add tree to repository'), self._VCSAddTree) |
385 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) |
385 self.vcsAddMultiMenuActions.append(self.vcsMultiMenuAddTree) |
386 act = menu.addAction( |
386 act = menu.addAction( |
387 UI.PixmapCache.getIcon("vcsRemove.png"), |
387 UI.PixmapCache.getIcon("vcsRemove"), |
388 self.tr('Remove from repository (and disk)'), |
388 self.tr('Remove from repository (and disk)'), |
389 self._VCSRemove) |
389 self._VCSRemove) |
390 self.vcsMultiMenuActions.append(act) |
390 self.vcsMultiMenuActions.append(act) |
391 if self.vcs.version >= (1, 5, 0): |
391 if self.vcs.version >= (1, 5, 0): |
392 menu.addSeparator() |
392 menu.addSeparator() |
398 self.tr("Remove from Changelist"), |
398 self.tr("Remove from Changelist"), |
399 self.__SVNRemoveFromChangelist) |
399 self.__SVNRemoveFromChangelist) |
400 self.vcsMenuActions.append(act) |
400 self.vcsMenuActions.append(act) |
401 menu.addSeparator() |
401 menu.addSeparator() |
402 act = menu.addAction( |
402 act = menu.addAction( |
403 UI.PixmapCache.getIcon("vcsStatus.png"), |
403 UI.PixmapCache.getIcon("vcsStatus"), |
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"), |
409 self.tr('Show differences'), 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"), |
413 self.tr('Show differences (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"), |
418 self.tr('Show differences (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"), |
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('Conflicts 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"), |
433 self.tr('Lock'), self.__SVNLock) |
433 self.tr('Lock'), self.__SVNLock) |
434 self.vcsMultiMenuActions.append(act) |
434 self.vcsMultiMenuActions.append(act) |
435 act = menu.addAction( |
435 act = menu.addAction( |
436 UI.PixmapCache.getIcon("vcsUnlock.png"), |
436 UI.PixmapCache.getIcon("vcsUnlock"), |
437 self.tr('Unlock'), self.__SVNUnlock) |
437 self.tr('Unlock'), self.__SVNUnlock) |
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('Break Lock'), self.__SVNBreakLock) |
441 self.tr('Break Lock'), self.__SVNBreakLock) |
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('Steal Lock'), self.__SVNStealLock) |
445 self.tr('Steal Lock'), self.__SVNStealLock) |
446 self.vcsMultiMenuActions.append(act) |
446 self.vcsMultiMenuActions.append(act) |
447 menu.addSeparator() |
447 menu.addSeparator() |
448 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
448 act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) |
449 self.vcsMultiMenuActions.append(act) |
449 self.vcsMultiMenuActions.append(act) |
524 font.setBold(True) |
524 font.setBold(True) |
525 act.setFont(font) |
525 act.setFont(font) |
526 menu.addSeparator() |
526 menu.addSeparator() |
527 |
527 |
528 act = menu.addAction( |
528 act = menu.addAction( |
529 UI.PixmapCache.getIcon("vcsUpdate.png"), |
529 UI.PixmapCache.getIcon("vcsUpdate"), |
530 self.tr('Update from repository'), self._VCSUpdate) |
530 self.tr('Update from repository'), self._VCSUpdate) |
531 self.vcsDirMenuActions.append(act) |
531 self.vcsDirMenuActions.append(act) |
532 act = menu.addAction( |
532 act = menu.addAction( |
533 UI.PixmapCache.getIcon("vcsCommit.png"), |
533 UI.PixmapCache.getIcon("vcsCommit"), |
534 self.tr('Commit changes to repository...'), |
534 self.tr('Commit changes to repository...'), |
535 self._VCSCommit) |
535 self._VCSCommit) |
536 self.vcsDirMenuActions.append(act) |
536 self.vcsDirMenuActions.append(act) |
537 menu.addSeparator() |
537 menu.addSeparator() |
538 act = menu.addAction( |
538 act = menu.addAction( |
539 UI.PixmapCache.getIcon("vcsAdd.png"), |
539 UI.PixmapCache.getIcon("vcsAdd"), |
540 self.tr('Add to repository'), self._VCSAdd) |
540 self.tr('Add to repository'), self._VCSAdd) |
541 self.vcsAddDirMenuActions.append(act) |
541 self.vcsAddDirMenuActions.append(act) |
542 act = menu.addAction( |
542 act = menu.addAction( |
543 UI.PixmapCache.getIcon("vcsRemove.png"), |
543 UI.PixmapCache.getIcon("vcsRemove"), |
544 self.tr('Remove from repository (and disk)'), |
544 self.tr('Remove from repository (and disk)'), |
545 self._VCSRemove) |
545 self._VCSRemove) |
546 self.vcsDirMenuActions.append(act) |
546 self.vcsDirMenuActions.append(act) |
547 menu.addSeparator() |
547 menu.addSeparator() |
548 act = menu.addAction(self.tr('Copy'), self.__SVNCopy) |
548 act = menu.addAction(self.tr('Copy'), self.__SVNCopy) |
559 self.tr("Remove from Changelist"), |
559 self.tr("Remove from Changelist"), |
560 self.__SVNRemoveFromChangelist) |
560 self.__SVNRemoveFromChangelist) |
561 self.vcsMenuActions.append(act) |
561 self.vcsMenuActions.append(act) |
562 menu.addSeparator() |
562 menu.addSeparator() |
563 act = menu.addAction( |
563 act = menu.addAction( |
564 UI.PixmapCache.getIcon("vcsLog.png"), |
564 UI.PixmapCache.getIcon("vcsLog"), |
565 self.tr('Show log browser'), self._VCSLogBrowser) |
565 self.tr('Show log browser'), self._VCSLogBrowser) |
566 self.vcsDirMenuActions.append(act) |
566 self.vcsDirMenuActions.append(act) |
567 menu.addSeparator() |
567 menu.addSeparator() |
568 act = menu.addAction( |
568 act = menu.addAction( |
569 UI.PixmapCache.getIcon("vcsStatus.png"), |
569 UI.PixmapCache.getIcon("vcsStatus"), |
570 self.tr('Show status'), self._VCSStatus) |
570 self.tr('Show status'), self._VCSStatus) |
571 self.vcsDirMenuActions.append(act) |
571 self.vcsDirMenuActions.append(act) |
572 menu.addSeparator() |
572 menu.addSeparator() |
573 act = menu.addAction( |
573 act = menu.addAction( |
574 UI.PixmapCache.getIcon("vcsDiff.png"), |
574 UI.PixmapCache.getIcon("vcsDiff"), |
575 self.tr('Show differences'), self._VCSDiff) |
575 self.tr('Show differences'), self._VCSDiff) |
576 self.vcsDirMenuActions.append(act) |
576 self.vcsDirMenuActions.append(act) |
577 act = menu.addAction( |
577 act = menu.addAction( |
578 UI.PixmapCache.getIcon("vcsDiff.png"), |
578 UI.PixmapCache.getIcon("vcsDiff"), |
579 self.tr('Show differences (extended)'), |
579 self.tr('Show differences (extended)'), |
580 self.__SVNExtendedDiff) |
580 self.__SVNExtendedDiff) |
581 self.vcsDirMenuActions.append(act) |
581 self.vcsDirMenuActions.append(act) |
582 act = menu.addAction( |
582 act = menu.addAction( |
583 UI.PixmapCache.getIcon("vcsDiff.png"), |
583 UI.PixmapCache.getIcon("vcsDiff"), |
584 self.tr('Show differences (URLs)'), |
584 self.tr('Show differences (URLs)'), |
585 self.__SVNUrlDiff) |
585 self.__SVNUrlDiff) |
586 self.vcsDirMenuActions.append(act) |
586 self.vcsDirMenuActions.append(act) |
587 menu.addSeparator() |
587 menu.addSeparator() |
588 act = menu.addAction( |
588 act = menu.addAction( |
589 UI.PixmapCache.getIcon("vcsRevert.png"), |
589 UI.PixmapCache.getIcon("vcsRevert"), |
590 self.tr('Revert changes'), self._VCSRevert) |
590 self.tr('Revert changes'), self._VCSRevert) |
591 self.vcsDirMenuActions.append(act) |
591 self.vcsDirMenuActions.append(act) |
592 act = menu.addAction( |
592 act = menu.addAction( |
593 UI.PixmapCache.getIcon("vcsMerge.png"), |
593 UI.PixmapCache.getIcon("vcsMerge"), |
594 self.tr('Merge changes'), self._VCSMerge) |
594 self.tr('Merge changes'), self._VCSMerge) |
595 self.vcsDirMenuActions.append(act) |
595 self.vcsDirMenuActions.append(act) |
596 act = menu.addAction( |
596 act = menu.addAction( |
597 self.tr('Conflicts resolved'), self.__SVNResolve) |
597 self.tr('Conflicts resolved'), self.__SVNResolve) |
598 self.vcsDirMenuActions.append(act) |
598 self.vcsDirMenuActions.append(act) |
643 font.setBold(True) |
643 font.setBold(True) |
644 act.setFont(font) |
644 act.setFont(font) |
645 menu.addSeparator() |
645 menu.addSeparator() |
646 |
646 |
647 act = menu.addAction( |
647 act = menu.addAction( |
648 UI.PixmapCache.getIcon("vcsUpdate.png"), |
648 UI.PixmapCache.getIcon("vcsUpdate"), |
649 self.tr('Update from repository'), self._VCSUpdate) |
649 self.tr('Update from repository'), self._VCSUpdate) |
650 self.vcsDirMultiMenuActions.append(act) |
650 self.vcsDirMultiMenuActions.append(act) |
651 act = menu.addAction( |
651 act = menu.addAction( |
652 UI.PixmapCache.getIcon("vcsCommit.png"), |
652 UI.PixmapCache.getIcon("vcsCommit"), |
653 self.tr('Commit changes to repository...'), |
653 self.tr('Commit changes to repository...'), |
654 self._VCSCommit) |
654 self._VCSCommit) |
655 self.vcsDirMultiMenuActions.append(act) |
655 self.vcsDirMultiMenuActions.append(act) |
656 menu.addSeparator() |
656 menu.addSeparator() |
657 act = menu.addAction( |
657 act = menu.addAction( |
658 UI.PixmapCache.getIcon("vcsAdd.png"), |
658 UI.PixmapCache.getIcon("vcsAdd"), |
659 self.tr('Add to repository'), self._VCSAdd) |
659 self.tr('Add to repository'), self._VCSAdd) |
660 self.vcsAddDirMultiMenuActions.append(act) |
660 self.vcsAddDirMultiMenuActions.append(act) |
661 act = menu.addAction( |
661 act = menu.addAction( |
662 UI.PixmapCache.getIcon("vcsRemove.png"), |
662 UI.PixmapCache.getIcon("vcsRemove"), |
663 self.tr('Remove from repository (and disk)'), |
663 self.tr('Remove from repository (and disk)'), |
664 self._VCSRemove) |
664 self._VCSRemove) |
665 self.vcsDirMultiMenuActions.append(act) |
665 self.vcsDirMultiMenuActions.append(act) |
666 if self.vcs.version >= (1, 5, 0): |
666 if self.vcs.version >= (1, 5, 0): |
667 menu.addSeparator() |
667 menu.addSeparator() |
673 self.tr("Remove from Changelist"), |
673 self.tr("Remove from Changelist"), |
674 self.__SVNRemoveFromChangelist) |
674 self.__SVNRemoveFromChangelist) |
675 self.vcsMenuActions.append(act) |
675 self.vcsMenuActions.append(act) |
676 menu.addSeparator() |
676 menu.addSeparator() |
677 act = menu.addAction( |
677 act = menu.addAction( |
678 UI.PixmapCache.getIcon("vcsStatus.png"), |
678 UI.PixmapCache.getIcon("vcsStatus"), |
679 self.tr('Show status'), self._VCSStatus) |
679 self.tr('Show status'), self._VCSStatus) |
680 self.vcsDirMultiMenuActions.append(act) |
680 self.vcsDirMultiMenuActions.append(act) |
681 menu.addSeparator() |
681 menu.addSeparator() |
682 act = menu.addAction( |
682 act = menu.addAction( |
683 UI.PixmapCache.getIcon("vcsDiff.png"), |
683 UI.PixmapCache.getIcon("vcsDiff"), |
684 self.tr('Show differences'), self._VCSDiff) |
684 self.tr('Show differences'), self._VCSDiff) |
685 self.vcsDirMultiMenuActions.append(act) |
685 self.vcsDirMultiMenuActions.append(act) |
686 act = menu.addAction( |
686 act = menu.addAction( |
687 UI.PixmapCache.getIcon("vcsDiff.png"), |
687 UI.PixmapCache.getIcon("vcsDiff"), |
688 self.tr('Show differences (extended)'), |
688 self.tr('Show differences (extended)'), |
689 self.__SVNExtendedDiff) |
689 self.__SVNExtendedDiff) |
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 (URLs)'), |
693 self.tr('Show differences (URLs)'), |
694 self.__SVNUrlDiff) |
694 self.__SVNUrlDiff) |
695 self.vcsDirMultiMenuActions.append(act) |
695 self.vcsDirMultiMenuActions.append(act) |
696 menu.addSeparator() |
696 menu.addSeparator() |
697 act = menu.addAction( |
697 act = menu.addAction( |
698 UI.PixmapCache.getIcon("vcsRevert.png"), |
698 UI.PixmapCache.getIcon("vcsRevert"), |
699 self.tr('Revert changes'), self._VCSRevert) |
699 self.tr('Revert changes'), self._VCSRevert) |
700 self.vcsDirMultiMenuActions.append(act) |
700 self.vcsDirMultiMenuActions.append(act) |
701 act = menu.addAction( |
701 act = menu.addAction( |
702 UI.PixmapCache.getIcon("vcsMerge.png"), |
702 UI.PixmapCache.getIcon("vcsMerge"), |
703 self.tr('Merge changes'), self._VCSMerge) |
703 self.tr('Merge changes'), self._VCSMerge) |
704 self.vcsDirMultiMenuActions.append(act) |
704 self.vcsDirMultiMenuActions.append(act) |
705 act = menu.addAction( |
705 act = menu.addAction( |
706 self.tr('Conflicts resolved'), self.__SVNResolve) |
706 self.tr('Conflicts resolved'), self.__SVNResolve) |
707 self.vcsDirMultiMenuActions.append(act) |
707 self.vcsDirMultiMenuActions.append(act) |