/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Curtis Hovey
  • Date: 2012-02-04 14:05:59 UTC
  • mfrom: (772.2.5 handle-patch)
  • Revision ID: sinzui.is@verizon.net-20120204140559-307aeiy47rieqxsf
Merged bzr-handle-patch gtk3 fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
435
435
    differences between two revisions on a branch.
436
436
    """
437
437
 
 
438
    SHOW_WIDGETS = True
 
439
 
438
440
    def __init__(self, parent=None, operations=None):
439
441
        super(DiffWindow, self).__init__(parent=parent)
440
442
        self.set_border_width(0)
441
 
        self.set_title("bzrk diff")
 
443
        self.set_title("bzr diff")
442
444
 
443
445
        # Use two thirds of the screen by default
444
446
        screen = self.get_screen()
452
454
        """Construct the window contents."""
453
455
        self.vbox = Gtk.VBox()
454
456
        self.add(self.vbox)
455
 
        self.vbox.show()
 
457
        if self.SHOW_WIDGETS:
 
458
            self.vbox.show()
456
459
        self.diff = DiffWidget()
457
460
        self.vbox.pack_end(self.diff, True, True, 0)
458
 
        self.diff.show_all()
 
461
        if self.SHOW_WIDGETS:
 
462
            self.diff.show_all()
459
463
        # Build after DiffWidget to connect signals
460
464
        menubar = self._get_menu_bar()
461
465
        self.vbox.pack_start(menubar, False, False, 0)
471
475
        mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
472
476
            _i18n("Wrap _Long Lines"))
473
477
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
474
 
        mb_view_wrapsource.show()
475
478
        mb_view_menu.append(mb_view_wrapsource)
476
 
        mb_view.show()
477
479
        mb_view.set_submenu(mb_view_menu)
478
 
        mb_view.show()
479
480
        menubar.append(mb_view)
480
 
        menubar.show()
 
481
        if self.SHOW_WIDGETS:
 
482
            menubar.show_all()
481
483
        return menubar
482
484
 
483
485
    def _get_button_bar(self, operations):
491
493
        hbox.set_layout(Gtk.ButtonBoxStyle.START)
492
494
        for title, method in operations:
493
495
            merge_button = Gtk.Button(title)
494
 
            merge_button.show()
 
496
            if self.SHOW_WIDGETS:
 
497
                merge_button.show()
495
498
            merge_button.set_relief(Gtk.ReliefStyle.NONE)
496
499
            merge_button.connect("clicked", method)
497
 
            hbox.pack_start(merge_button, expand=False, fill=True)
498
 
        hbox.show()
 
500
            hbox.pack_start(merge_button, False, True, 0)
 
501
        if self.SHOW_WIDGETS:
 
502
            hbox.show()
499
503
        return hbox
500
504
 
501
505
    def _get_merge_target(self):