194 font = act.font() |
194 font = act.font() |
195 font.setBold(True) |
195 font.setBold(True) |
196 act.setFont(font) |
196 act.setFont(font) |
197 menu.addSeparator() |
197 menu.addSeparator() |
198 |
198 |
199 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), |
199 act = menu.addAction( |
|
200 UI.PixmapCache.getIcon("vcsCommit.png"), |
200 self.trUtf8('Commit changes to repository...'), |
201 self.trUtf8('Commit changes to repository...'), |
201 self._VCSCommit) |
202 self._VCSCommit) |
202 self.vcsMenuActions.append(act) |
203 self.vcsMenuActions.append(act) |
203 menu.addSeparator() |
204 menu.addSeparator() |
204 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), |
205 act = menu.addAction( |
|
206 UI.PixmapCache.getIcon("vcsAdd.png"), |
205 self.trUtf8('Add to repository'), |
207 self.trUtf8('Add to repository'), |
206 self._VCSAdd) |
208 self._VCSAdd) |
207 self.vcsAddMenuActions.append(act) |
209 self.vcsAddMenuActions.append(act) |
208 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
210 act = menu.addAction( |
|
211 UI.PixmapCache.getIcon("vcsRemove.png"), |
209 self.trUtf8('Remove from repository (and disk)'), |
212 self.trUtf8('Remove from repository (and disk)'), |
210 self._VCSRemove) |
213 self._VCSRemove) |
211 self.vcsMenuActions.append(act) |
214 self.vcsMenuActions.append(act) |
212 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
215 act = menu.addAction( |
|
216 UI.PixmapCache.getIcon("vcsRemove.png"), |
213 self.trUtf8('Remove from repository only'), |
217 self.trUtf8('Remove from repository only'), |
214 self.__HgForget) |
218 self.__HgForget) |
215 self.vcsMenuActions.append(act) |
219 self.vcsMenuActions.append(act) |
216 menu.addSeparator() |
220 menu.addSeparator() |
217 act = menu.addAction(self.trUtf8('Copy'), self.__HgCopy) |
221 act = menu.addAction(self.trUtf8('Copy'), self.__HgCopy) |
218 self.vcsMenuActions.append(act) |
222 self.vcsMenuActions.append(act) |
219 act = menu.addAction(self.trUtf8('Move'), self.__HgMove) |
223 act = menu.addAction(self.trUtf8('Move'), self.__HgMove) |
220 self.vcsMenuActions.append(act) |
224 self.vcsMenuActions.append(act) |
221 menu.addSeparator() |
225 menu.addSeparator() |
222 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), |
226 act = menu.addAction( |
|
227 UI.PixmapCache.getIcon("vcsLog.png"), |
223 self.trUtf8('Show log'), self._VCSLog) |
228 self.trUtf8('Show log'), self._VCSLog) |
224 self.vcsMenuActions.append(act) |
229 self.vcsMenuActions.append(act) |
225 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), |
230 act = menu.addAction( |
|
231 UI.PixmapCache.getIcon("vcsLog.png"), |
226 self.trUtf8('Show log browser'), self.__HgLogBrowser) |
232 self.trUtf8('Show log browser'), self.__HgLogBrowser) |
227 self.vcsMenuActions.append(act) |
233 self.vcsMenuActions.append(act) |
228 menu.addSeparator() |
234 menu.addSeparator() |
229 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), |
235 act = menu.addAction( |
|
236 UI.PixmapCache.getIcon("vcsStatus.png"), |
230 self.trUtf8('Show status'), self._VCSStatus) |
237 self.trUtf8('Show status'), self._VCSStatus) |
231 self.vcsMenuActions.append(act) |
238 self.vcsMenuActions.append(act) |
232 menu.addSeparator() |
239 menu.addSeparator() |
233 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
240 act = menu.addAction( |
|
241 UI.PixmapCache.getIcon("vcsDiff.png"), |
234 self.trUtf8('Show difference'), self._VCSDiff) |
242 self.trUtf8('Show difference'), self._VCSDiff) |
235 self.vcsMenuActions.append(act) |
243 self.vcsMenuActions.append(act) |
236 act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
244 act = menu.addAction( |
|
245 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
237 self.trUtf8('Show difference side-by-side'), self.__HgSbsDiff) |
246 self.trUtf8('Show difference side-by-side'), self.__HgSbsDiff) |
238 self.vcsMenuActions.append(act) |
247 self.vcsMenuActions.append(act) |
239 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
248 act = menu.addAction( |
|
249 UI.PixmapCache.getIcon("vcsDiff.png"), |
240 self.trUtf8('Show difference (extended)'), |
250 self.trUtf8('Show difference (extended)'), |
241 self.__HgExtendedDiff) |
251 self.__HgExtendedDiff) |
242 self.vcsMenuActions.append(act) |
252 self.vcsMenuActions.append(act) |
243 act = menu.addAction(UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
253 act = menu.addAction( |
|
254 UI.PixmapCache.getIcon("vcsSbsDiff.png"), |
244 self.trUtf8('Show difference side-by-side (extended)'), |
255 self.trUtf8('Show difference side-by-side (extended)'), |
245 self.__HgSbsExtendedDiff) |
256 self.__HgSbsExtendedDiff) |
246 self.vcsMenuActions.append(act) |
257 self.vcsMenuActions.append(act) |
247 self.annotateAct = menu.addAction(self.trUtf8('Show annotated file'), |
258 self.annotateAct = menu.addAction( |
|
259 self.trUtf8('Show annotated file'), |
248 self.__HgAnnotate) |
260 self.__HgAnnotate) |
249 self.vcsMenuActions.append(self.annotateAct) |
261 self.vcsMenuActions.append(self.annotateAct) |
250 menu.addSeparator() |
262 menu.addSeparator() |
251 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
263 act = menu.addAction( |
|
264 UI.PixmapCache.getIcon("vcsRevert.png"), |
252 self.trUtf8('Revert changes'), self.__HgRevert) |
265 self.trUtf8('Revert changes'), self.__HgRevert) |
253 self.vcsMenuActions.append(act) |
266 self.vcsMenuActions.append(act) |
254 act = menu.addAction( |
267 act = menu.addAction( |
255 self.trUtf8('Conflict resolved'), self.__HgResolve) |
268 self.trUtf8('Conflict resolved'), self.__HgResolve) |
256 self.vcsMenuActions.append(act) |
269 self.vcsMenuActions.append(act) |
289 font = act.font() |
302 font = act.font() |
290 font.setBold(True) |
303 font.setBold(True) |
291 act.setFont(font) |
304 act.setFont(font) |
292 menu.addSeparator() |
305 menu.addSeparator() |
293 |
306 |
294 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), |
307 act = menu.addAction( |
|
308 UI.PixmapCache.getIcon("vcsCommit.png"), |
295 self.trUtf8('Commit changes to repository...'), |
309 self.trUtf8('Commit changes to repository...'), |
296 self._VCSCommit) |
310 self._VCSCommit) |
297 self.vcsMultiMenuActions.append(act) |
311 self.vcsMultiMenuActions.append(act) |
298 menu.addSeparator() |
312 menu.addSeparator() |
299 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), |
313 act = menu.addAction( |
|
314 UI.PixmapCache.getIcon("vcsAdd.png"), |
300 self.trUtf8('Add to repository'), self._VCSAdd) |
315 self.trUtf8('Add to repository'), self._VCSAdd) |
301 self.vcsAddMultiMenuActions.append(act) |
316 self.vcsAddMultiMenuActions.append(act) |
302 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
317 act = menu.addAction( |
|
318 UI.PixmapCache.getIcon("vcsRemove.png"), |
303 self.trUtf8('Remove from repository (and disk)'), |
319 self.trUtf8('Remove from repository (and disk)'), |
304 self._VCSRemove) |
320 self._VCSRemove) |
305 self.vcsMultiMenuActions.append(act) |
321 self.vcsMultiMenuActions.append(act) |
306 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
322 act = menu.addAction( |
|
323 UI.PixmapCache.getIcon("vcsRemove.png"), |
307 self.trUtf8('Remove from repository only'), |
324 self.trUtf8('Remove from repository only'), |
308 self.__HgForget) |
325 self.__HgForget) |
309 self.vcsMultiMenuActions.append(act) |
326 self.vcsMultiMenuActions.append(act) |
310 menu.addSeparator() |
327 menu.addSeparator() |
311 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), |
328 act = menu.addAction( |
|
329 UI.PixmapCache.getIcon("vcsStatus.png"), |
312 self.trUtf8('Show status'), self._VCSStatus) |
330 self.trUtf8('Show status'), self._VCSStatus) |
313 self.vcsMultiMenuActions.append(act) |
331 self.vcsMultiMenuActions.append(act) |
314 menu.addSeparator() |
332 menu.addSeparator() |
315 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
333 act = menu.addAction( |
|
334 UI.PixmapCache.getIcon("vcsDiff.png"), |
316 self.trUtf8('Show difference'), self._VCSDiff) |
335 self.trUtf8('Show difference'), self._VCSDiff) |
317 self.vcsMultiMenuActions.append(act) |
336 self.vcsMultiMenuActions.append(act) |
318 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
337 act = menu.addAction( |
|
338 UI.PixmapCache.getIcon("vcsDiff.png"), |
319 self.trUtf8('Show difference (extended)'), |
339 self.trUtf8('Show difference (extended)'), |
320 self.__HgExtendedDiff) |
340 self.__HgExtendedDiff) |
321 self.vcsMultiMenuActions.append(act) |
341 self.vcsMultiMenuActions.append(act) |
322 menu.addSeparator() |
342 menu.addSeparator() |
323 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
343 act = menu.addAction( |
|
344 UI.PixmapCache.getIcon("vcsRevert.png"), |
324 self.trUtf8('Revert changes'), self.__HgRevert) |
345 self.trUtf8('Revert changes'), self.__HgRevert) |
325 self.vcsMultiMenuActions.append(act) |
346 self.vcsMultiMenuActions.append(act) |
326 act = menu.addAction( |
347 act = menu.addAction( |
327 self.trUtf8('Conflict resolved'), self.__HgResolve) |
348 self.trUtf8('Conflict resolved'), self.__HgResolve) |
328 self.vcsMultiMenuActions.append(act) |
349 self.vcsMultiMenuActions.append(act) |
395 font = act.font() |
416 font = act.font() |
396 font.setBold(True) |
417 font.setBold(True) |
397 act.setFont(font) |
418 act.setFont(font) |
398 menu.addSeparator() |
419 menu.addSeparator() |
399 |
420 |
400 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), |
421 act = menu.addAction( |
|
422 UI.PixmapCache.getIcon("vcsCommit.png"), |
401 self.trUtf8('Commit changes to repository...'), |
423 self.trUtf8('Commit changes to repository...'), |
402 self._VCSCommit) |
424 self._VCSCommit) |
403 self.vcsDirMenuActions.append(act) |
425 self.vcsDirMenuActions.append(act) |
404 menu.addSeparator() |
426 menu.addSeparator() |
405 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), |
427 act = menu.addAction( |
|
428 UI.PixmapCache.getIcon("vcsAdd.png"), |
406 self.trUtf8('Add to repository'), self._VCSAdd) |
429 self.trUtf8('Add to repository'), self._VCSAdd) |
407 self.vcsAddDirMenuActions.append(act) |
430 self.vcsAddDirMenuActions.append(act) |
408 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
431 act = menu.addAction( |
|
432 UI.PixmapCache.getIcon("vcsRemove.png"), |
409 self.trUtf8('Remove from repository (and disk)'), |
433 self.trUtf8('Remove from repository (and disk)'), |
410 self._VCSRemove) |
434 self._VCSRemove) |
411 self.vcsDirMenuActions.append(act) |
435 self.vcsDirMenuActions.append(act) |
412 menu.addSeparator() |
436 menu.addSeparator() |
413 act = menu.addAction(self.trUtf8('Copy'), self.__HgCopy) |
437 act = menu.addAction(self.trUtf8('Copy'), self.__HgCopy) |
414 self.vcsDirMenuActions.append(act) |
438 self.vcsDirMenuActions.append(act) |
415 act = menu.addAction(self.trUtf8('Move'), self.__HgMove) |
439 act = menu.addAction(self.trUtf8('Move'), self.__HgMove) |
416 self.vcsDirMenuActions.append(act) |
440 self.vcsDirMenuActions.append(act) |
417 menu.addSeparator() |
441 menu.addSeparator() |
418 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), |
442 act = menu.addAction( |
|
443 UI.PixmapCache.getIcon("vcsLog.png"), |
419 self.trUtf8('Show log'), self._VCSLog) |
444 self.trUtf8('Show log'), self._VCSLog) |
420 self.vcsDirMenuActions.append(act) |
445 self.vcsDirMenuActions.append(act) |
421 act = menu.addAction(UI.PixmapCache.getIcon("vcsLog.png"), |
446 act = menu.addAction( |
|
447 UI.PixmapCache.getIcon("vcsLog.png"), |
422 self.trUtf8('Show log browser'), self.__HgLogBrowser) |
448 self.trUtf8('Show log browser'), self.__HgLogBrowser) |
423 self.vcsDirMenuActions.append(act) |
449 self.vcsDirMenuActions.append(act) |
424 menu.addSeparator() |
450 menu.addSeparator() |
425 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), |
451 act = menu.addAction( |
|
452 UI.PixmapCache.getIcon("vcsStatus.png"), |
426 self.trUtf8('Show status'), self._VCSStatus) |
453 self.trUtf8('Show status'), self._VCSStatus) |
427 self.vcsDirMenuActions.append(act) |
454 self.vcsDirMenuActions.append(act) |
428 menu.addSeparator() |
455 menu.addSeparator() |
429 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
456 act = menu.addAction( |
|
457 UI.PixmapCache.getIcon("vcsDiff.png"), |
430 self.trUtf8('Show difference'), self._VCSDiff) |
458 self.trUtf8('Show difference'), self._VCSDiff) |
431 self.vcsDirMenuActions.append(act) |
459 self.vcsDirMenuActions.append(act) |
432 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
460 act = menu.addAction( |
|
461 UI.PixmapCache.getIcon("vcsDiff.png"), |
433 self.trUtf8('Show difference (extended)'), |
462 self.trUtf8('Show difference (extended)'), |
434 self.__HgExtendedDiff) |
463 self.__HgExtendedDiff) |
435 self.vcsDirMenuActions.append(act) |
464 self.vcsDirMenuActions.append(act) |
436 menu.addSeparator() |
465 menu.addSeparator() |
437 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
466 act = menu.addAction( |
|
467 UI.PixmapCache.getIcon("vcsRevert.png"), |
438 self.trUtf8('Revert changes'), self.__HgRevert) |
468 self.trUtf8('Revert changes'), self.__HgRevert) |
439 self.vcsDirMenuActions.append(act) |
469 self.vcsDirMenuActions.append(act) |
440 act = menu.addAction( |
470 act = menu.addAction( |
441 self.trUtf8('Conflict resolved'), self.__HgResolve) |
471 self.trUtf8('Conflict resolved'), self.__HgResolve) |
442 self.vcsDirMenuActions.append(act) |
472 self.vcsDirMenuActions.append(act) |
477 font = act.font() |
507 font = act.font() |
478 font.setBold(True) |
508 font.setBold(True) |
479 act.setFont(font) |
509 act.setFont(font) |
480 menu.addSeparator() |
510 menu.addSeparator() |
481 |
511 |
482 act = menu.addAction(UI.PixmapCache.getIcon("vcsCommit.png"), |
512 act = menu.addAction( |
|
513 UI.PixmapCache.getIcon("vcsCommit.png"), |
483 self.trUtf8('Commit changes to repository...'), |
514 self.trUtf8('Commit changes to repository...'), |
484 self._VCSCommit) |
515 self._VCSCommit) |
485 self.vcsDirMultiMenuActions.append(act) |
516 self.vcsDirMultiMenuActions.append(act) |
486 menu.addSeparator() |
517 menu.addSeparator() |
487 act = menu.addAction(UI.PixmapCache.getIcon("vcsAdd.png"), |
518 act = menu.addAction( |
|
519 UI.PixmapCache.getIcon("vcsAdd.png"), |
488 self.trUtf8('Add to repository'), self._VCSAdd) |
520 self.trUtf8('Add to repository'), self._VCSAdd) |
489 self.vcsAddDirMultiMenuActions.append(act) |
521 self.vcsAddDirMultiMenuActions.append(act) |
490 act = menu.addAction(UI.PixmapCache.getIcon("vcsRemove.png"), |
522 act = menu.addAction( |
|
523 UI.PixmapCache.getIcon("vcsRemove.png"), |
491 self.trUtf8('Remove from repository (and disk)'), |
524 self.trUtf8('Remove from repository (and disk)'), |
492 self._VCSRemove) |
525 self._VCSRemove) |
493 self.vcsDirMultiMenuActions.append(act) |
526 self.vcsDirMultiMenuActions.append(act) |
494 menu.addSeparator() |
527 menu.addSeparator() |
495 act = menu.addAction(UI.PixmapCache.getIcon("vcsStatus.png"), |
528 act = menu.addAction( |
|
529 UI.PixmapCache.getIcon("vcsStatus.png"), |
496 self.trUtf8('Show status'), self._VCSStatus) |
530 self.trUtf8('Show status'), self._VCSStatus) |
497 self.vcsDirMultiMenuActions.append(act) |
531 self.vcsDirMultiMenuActions.append(act) |
498 menu.addSeparator() |
532 menu.addSeparator() |
499 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
533 act = menu.addAction( |
|
534 UI.PixmapCache.getIcon("vcsDiff.png"), |
500 self.trUtf8('Show difference'), self._VCSDiff) |
535 self.trUtf8('Show difference'), self._VCSDiff) |
501 self.vcsDirMultiMenuActions.append(act) |
536 self.vcsDirMultiMenuActions.append(act) |
502 act = menu.addAction(UI.PixmapCache.getIcon("vcsDiff.png"), |
537 act = menu.addAction( |
|
538 UI.PixmapCache.getIcon("vcsDiff.png"), |
503 self.trUtf8('Show difference (extended)'), |
539 self.trUtf8('Show difference (extended)'), |
504 self.__HgExtendedDiff) |
540 self.__HgExtendedDiff) |
505 self.vcsDirMultiMenuActions.append(act) |
541 self.vcsDirMultiMenuActions.append(act) |
506 menu.addSeparator() |
542 menu.addSeparator() |
507 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
543 act = menu.addAction( |
|
544 UI.PixmapCache.getIcon("vcsRevert.png"), |
508 self.trUtf8('Revert changes'), self.__HgRevert) |
545 self.trUtf8('Revert changes'), self.__HgRevert) |
509 self.vcsDirMultiMenuActions.append(act) |
546 self.vcsDirMultiMenuActions.append(act) |
510 act = menu.addAction( |
547 act = menu.addAction( |
511 self.trUtf8('Conflict resolved'), self.__HgResolve) |
548 self.trUtf8('Conflict resolved'), self.__HgResolve) |
512 self.vcsDirMultiMenuActions.append(act) |
549 self.vcsDirMultiMenuActions.append(act) |
650 DeleteFilesConfirmationDialog |
687 DeleteFilesConfirmationDialog |
651 if self.isTranslationsBrowser: |
688 if self.isTranslationsBrowser: |
652 items = self.browser.getSelectedItems([ProjectBrowserFileItem]) |
689 items = self.browser.getSelectedItems([ProjectBrowserFileItem]) |
653 names = [itm.fileName() for itm in items] |
690 names = [itm.fileName() for itm in items] |
654 |
691 |
655 dlg = DeleteFilesConfirmationDialog(self.parent(), |
692 dlg = DeleteFilesConfirmationDialog( |
|
693 self.parent(), |
656 self.trUtf8("Remove from repository only"), |
694 self.trUtf8("Remove from repository only"), |
657 self.trUtf8("Do you really want to remove these files" |
695 self.trUtf8( |
|
696 "Do you really want to remove these files" |
658 " from the repository?"), |
697 " from the repository?"), |
659 names) |
698 names) |
660 else: |
699 else: |
661 items = self.browser.getSelectedItems() |
700 items = self.browser.getSelectedItems() |
662 names = [itm.fileName() for itm in items] |
701 names = [itm.fileName() for itm in items] |
663 files = [self.browser.project.getRelativePath(name) \ |
702 files = [self.browser.project.getRelativePath(name) \ |
664 for name in names] |
703 for name in names] |
665 |
704 |
666 dlg = DeleteFilesConfirmationDialog(self.parent(), |
705 dlg = DeleteFilesConfirmationDialog( |
|
706 self.parent(), |
667 self.trUtf8("Remove from repository only"), |
707 self.trUtf8("Remove from repository only"), |
668 self.trUtf8("Do you really want to remove these files" |
708 self.trUtf8( |
|
709 "Do you really want to remove these files" |
669 " from the repository?"), |
710 " from the repository?"), |
670 files) |
711 files) |
671 |
712 |
672 if dlg.exec_() == QDialog.Accepted: |
713 if dlg.exec_() == QDialog.Accepted: |
673 self.vcs.hgForget(names) |
714 self.vcs.hgForget(names) |