/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-07-31 15:52:43 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731155243-ln8istmxbryhb4pz
Mechanical changes made by pygi.convert.sh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
22
22
 
23
23
import subprocess
24
24
 
25
 
import gtk
26
 
import gobject
 
25
from gi.repository import Gtk
 
26
from gi.repository import GObject
27
27
 
28
28
from bzrlib.config import GlobalConfig
29
29
from bzrlib.plugins.gtk import _i18n
33
33
    )
34
34
 
35
35
 
36
 
class ConflictsDialog(gtk.Dialog):
 
36
class ConflictsDialog(Gtk.Dialog):
37
37
    """ This dialog displays the list of conflicts. """
38
38
 
39
39
    def __init__(self, wt, parent=None):
40
40
        """ Initialize the Conflicts dialog. """
41
 
        gtk.Dialog.__init__(self, title="Conflicts - Olive",
 
41
        GObject.GObject.__init__(self, title="Conflicts - Olive",
42
42
                                  parent=parent,
43
43
                                  flags=0,
44
 
                                  buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CANCEL))
 
44
                                  buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CANCEL))
45
45
 
46
46
        # Get arguments
47
47
        self.wt = wt
48
48
 
49
49
        # Create the widgets
50
 
        self._scrolledwindow = gtk.ScrolledWindow()
51
 
        self._treeview = gtk.TreeView()
52
 
        self._label_diff3 = gtk.Label(_i18n("External utility:"))
53
 
        self._entry_diff3 = gtk.Entry()
54
 
        self._image_diff3 = gtk.Image()
55
 
        self._button_diff3 = gtk.Button()
56
 
        self._hbox_diff3 = gtk.HBox()
 
50
        self._scrolledwindow = Gtk.ScrolledWindow()
 
51
        self._treeview = Gtk.TreeView()
 
52
        self._label_diff3 = Gtk.Label(label=_i18n("External utility:"))
 
53
        self._entry_diff3 = Gtk.Entry()
 
54
        self._image_diff3 = Gtk.Image()
 
55
        self._button_diff3 = Gtk.Button()
 
56
        self._hbox_diff3 = Gtk.HBox()
57
57
 
58
58
        # Set callbacks
59
59
        self._button_diff3.connect('clicked', self._on_diff3_clicked)
60
60
 
61
61
        # Set properties
62
 
        self._scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC,
63
 
                                        gtk.POLICY_AUTOMATIC)
64
 
        self._image_diff3.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
 
62
        self._scrolledwindow.set_policy(Gtk.PolicyType.AUTOMATIC,
 
63
                                        Gtk.PolicyType.AUTOMATIC)
 
64
        self._image_diff3.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
65
65
        self._button_diff3.set_image(self._image_diff3)
66
66
        self._entry_diff3.set_text(self._get_diff3())
67
67
        self._hbox_diff3.set_spacing(3)
98
98
    def _create_conflicts(self):
99
99
        """ Construct the list of conflicts. """
100
100
        if len(self.wt.conflicts()) == 0:
101
 
            self.model = gtk.ListStore(gobject.TYPE_STRING)
 
101
            self.model = Gtk.ListStore(GObject.TYPE_STRING)
102
102
            self._treeview.set_model(self.model)
103
 
            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Conflicts'),
104
 
                                         gtk.CellRendererText(), text=0))
 
103
            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Conflicts'),
 
104
                                         Gtk.CellRendererText(), text=0))
105
105
            self._treeview.set_headers_visible(False)
106
106
            self.model.append([ _i18n("No conflicts in working tree.") ])
107
107
            self._button_diff3.set_sensitive(False)
108
108
        else:
109
 
            self.model = gtk.ListStore(gobject.TYPE_STRING,
110
 
                                       gobject.TYPE_STRING,
111
 
                                       gobject.TYPE_STRING)
 
109
            self.model = Gtk.ListStore(GObject.TYPE_STRING,
 
110
                                       GObject.TYPE_STRING,
 
111
                                       GObject.TYPE_STRING)
112
112
            self._treeview.set_model(self.model)
113
 
            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Path'),
114
 
                                         gtk.CellRendererText(), text=0))
115
 
            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Type'),
116
 
                                         gtk.CellRendererText(), text=1))
 
113
            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Path'),
 
114
                                         Gtk.CellRendererText(), text=0))
 
115
            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Type'),
 
116
                                         Gtk.CellRendererText(), text=1))
117
117
            self._treeview.set_search_column(0)
118
118
            for conflict in self.wt.conflicts():
119
119
                if conflict.typestring == 'path conflict':