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