/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 conflicts.py

  • Committer: Curtis Hovey
  • Date: 2011-08-12 19:50:45 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812195045-y86bmaibs3pw5w6d
Updated buffer.getText() calls and ModifierType enums.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
20
20
from gi.repository import GObject
21
21
 
22
22
from bzrlib.config import GlobalConfig
23
 
from bzrlib.plugins.gtk.i18n import _i18n
 
23
from bzrlib.plugins.gtk import _i18n
24
24
from bzrlib.plugins.gtk.dialog import (
25
25
    error_dialog,
26
26
    warning_dialog,
32
32
 
33
33
    def __init__(self, wt, parent=None):
34
34
        """ Initialize the Conflicts dialog. """
35
 
        Gtk.Dialog.__init__(self, title="Conflicts - Olive",
 
35
        GObject.GObject.__init__(self, title="Conflicts - Olive",
36
36
                                  parent=parent,
37
37
                                  flags=0,
38
38
                                  buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CANCEL))
59
59
        self._button_diff3.set_image(self._image_diff3)
60
60
        self._entry_diff3.set_text(self._get_diff3())
61
61
        self._hbox_diff3.set_spacing(3)
62
 
        content_area = self.get_content_area()
63
 
        content_area.set_spacing(3)
 
62
        self.vbox.set_spacing(3)
64
63
        self.set_default_size(400, 300)
65
64
 
66
65
        # Construct dialog
67
 
        self._hbox_diff3.pack_start(self._label_diff3, False, False, 0)
68
 
        self._hbox_diff3.pack_start(self._entry_diff3, True, True, 0)
69
 
        self._hbox_diff3.pack_start(self._button_diff3, False, False, 0)
 
66
        self._hbox_diff3.pack_start(self._label_diff3, False, False)
 
67
        self._hbox_diff3.pack_start(self._entry_diff3, True, True)
 
68
        self._hbox_diff3.pack_start(self._button_diff3, False, False)
70
69
        self._scrolledwindow.add(self._treeview)
71
 
        content_area.pack_start(self._scrolledwindow, True, True, 0)
72
 
        content_area.pack_start(self._hbox_diff3, False, False, 0)
 
70
        self.vbox.pack_start(self._scrolledwindow, True, True)
 
71
        self.vbox.pack_start(self._hbox_diff3, False, False)
73
72
 
74
73
        # Create the conflict list
75
74
        self._create_conflicts()
76
75
 
77
76
        # Show the dialog
78
 
        content_area.show_all()
 
77
        self.vbox.show_all()
79
78
 
80
79
    def _get_diff3(self):
81
80
        """ Get the specified diff3 utility. Default is meld. """