/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-27 18:35:08 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827183508-ugqbp58na4mtt1no
Updated the pixbuf calls to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
try:
18
 
    import pygtk
19
 
    pygtk.require("2.0")
20
 
except:
21
 
    pass
22
 
 
23
17
import subprocess
24
18
 
25
 
import gtk
26
 
import gobject
 
19
from gi.repository import Gtk
 
20
from gi.repository import GObject
27
21
 
28
22
from bzrlib.config import GlobalConfig
29
 
from bzrlib.plugins.gtk import _i18n
30
 
 
31
 
from dialog import error_dialog, warning_dialog
32
 
 
33
 
 
34
 
class ConflictsDialog(gtk.Dialog):
 
23
from bzrlib.plugins.gtk.i18n import _i18n
 
24
from bzrlib.plugins.gtk.dialog import (
 
25
    error_dialog,
 
26
    warning_dialog,
 
27
    )
 
28
 
 
29
 
 
30
class ConflictsDialog(Gtk.Dialog):
35
31
    """ This dialog displays the list of conflicts. """
36
32
 
37
33
    def __init__(self, wt, parent=None):
38
34
        """ Initialize the Conflicts dialog. """
39
 
        gtk.Dialog.__init__(self, title="Conflicts - Olive",
 
35
        Gtk.Dialog.__init__(self, title="Conflicts - Olive",
40
36
                                  parent=parent,
41
37
                                  flags=0,
42
 
                                  buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CANCEL))
43
 
        
 
38
                                  buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CANCEL))
 
39
 
44
40
        # Get arguments
45
41
        self.wt = wt
46
 
        
 
42
 
47
43
        # Create the widgets
48
 
        self._scrolledwindow = gtk.ScrolledWindow()
49
 
        self._treeview = gtk.TreeView()
50
 
        self._label_diff3 = gtk.Label(_i18n("External utility:"))
51
 
        self._entry_diff3 = gtk.Entry()
52
 
        self._image_diff3 = gtk.Image()
53
 
        self._button_diff3 = gtk.Button()
54
 
        self._hbox_diff3 = gtk.HBox()
55
 
        
 
44
        self._scrolledwindow = Gtk.ScrolledWindow()
 
45
        self._treeview = Gtk.TreeView()
 
46
        self._label_diff3 = Gtk.Label(label=_i18n("External utility:"))
 
47
        self._entry_diff3 = Gtk.Entry()
 
48
        self._image_diff3 = Gtk.Image()
 
49
        self._button_diff3 = Gtk.Button()
 
50
        self._hbox_diff3 = Gtk.HBox()
 
51
 
56
52
        # Set callbacks
57
53
        self._button_diff3.connect('clicked', self._on_diff3_clicked)
58
 
        
 
54
 
59
55
        # Set properties
60
 
        self._scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC,
61
 
                                        gtk.POLICY_AUTOMATIC)
62
 
        self._image_diff3.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
 
56
        self._scrolledwindow.set_policy(Gtk.PolicyType.AUTOMATIC,
 
57
                                        Gtk.PolicyType.AUTOMATIC)
 
58
        self._image_diff3.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
63
59
        self._button_diff3.set_image(self._image_diff3)
64
60
        self._entry_diff3.set_text(self._get_diff3())
65
61
        self._hbox_diff3.set_spacing(3)
66
 
        self.vbox.set_spacing(3)
 
62
        content_area = self.get_content_area()
 
63
        content_area.set_spacing(3)
67
64
        self.set_default_size(400, 300)
68
 
        
 
65
 
69
66
        # Construct dialog
70
 
        self._hbox_diff3.pack_start(self._label_diff3, False, False)
71
 
        self._hbox_diff3.pack_start(self._entry_diff3, True, True)
72
 
        self._hbox_diff3.pack_start(self._button_diff3, False, False)
 
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)
73
70
        self._scrolledwindow.add(self._treeview)
74
 
        self.vbox.pack_start(self._scrolledwindow, True, True)
75
 
        self.vbox.pack_start(self._hbox_diff3, False, False)
76
 
        
 
71
        content_area.pack_start(self._scrolledwindow, True, True, 0)
 
72
        content_area.pack_start(self._hbox_diff3, False, False, 0)
 
73
 
77
74
        # Create the conflict list
78
75
        self._create_conflicts()
79
 
        
 
76
 
80
77
        # Show the dialog
81
 
        self.vbox.show_all()
82
 
    
 
78
        content_area.show_all()
 
79
 
83
80
    def _get_diff3(self):
84
81
        """ Get the specified diff3 utility. Default is meld. """
85
82
        config = GlobalConfig()
87
84
        if diff3 is None:
88
85
            diff3 = 'meld'
89
86
        return diff3
90
 
    
 
87
 
91
88
    def _set_diff3(self, cmd):
92
89
        """ Set the default diff3 utility to cmd. """
93
90
        config = GlobalConfig()
94
91
        config.set_user_option('gconflicts_diff3', cmd)
95
 
    
 
92
 
96
93
    def _create_conflicts(self):
97
94
        """ Construct the list of conflicts. """
98
95
        if len(self.wt.conflicts()) == 0:
99
 
            self.model = gtk.ListStore(gobject.TYPE_STRING)
 
96
            self.model = Gtk.ListStore(GObject.TYPE_STRING)
100
97
            self._treeview.set_model(self.model)
101
 
            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Conflicts'),
102
 
                                         gtk.CellRendererText(), text=0))
103
 
            self._treeview.set_headers_visible(False)            
 
98
            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Conflicts'),
 
99
                                         Gtk.CellRendererText(), text=0))
 
100
            self._treeview.set_headers_visible(False)
104
101
            self.model.append([ _i18n("No conflicts in working tree.") ])
105
102
            self._button_diff3.set_sensitive(False)
106
103
        else:
107
 
            self.model = gtk.ListStore(gobject.TYPE_STRING,
108
 
                                       gobject.TYPE_STRING,
109
 
                                       gobject.TYPE_STRING)
 
104
            self.model = Gtk.ListStore(GObject.TYPE_STRING,
 
105
                                       GObject.TYPE_STRING,
 
106
                                       GObject.TYPE_STRING)
110
107
            self._treeview.set_model(self.model)
111
 
            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Path'),
112
 
                                         gtk.CellRendererText(), text=0))
113
 
            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Type'),
114
 
                                         gtk.CellRendererText(), text=1))
 
108
            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Path'),
 
109
                                         Gtk.CellRendererText(), text=0))
 
110
            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Type'),
 
111
                                         Gtk.CellRendererText(), text=1))
115
112
            self._treeview.set_search_column(0)
116
113
            for conflict in self.wt.conflicts():
117
114
                if conflict.typestring == 'path conflict':
134
131
                    t = _i18n("deleting parent")
135
132
                else:
136
133
                    t = _i18n("unknown type of conflict")
137
 
                
138
 
                self.model.append([ conflict.path, t, conflict.typestring ]) 
139
 
    
 
134
 
 
135
                self.model.append([ conflict.path, t, conflict.typestring ])
 
136
 
140
137
    def _get_selected_file(self):
141
138
        """ Return the selected conflict's filename. """
142
139
        treeselection = self._treeview.get_selection()
143
140
        (model, iter) = treeselection.get_selected()
144
 
        
 
141
 
145
142
        if iter is None:
146
143
            return None
147
144
        else:
148
145
            return model.get_value(iter, 0)
149
 
    
 
146
 
150
147
    def _get_selected_type(self):
151
148
        """ Return the type of the selected conflict. """
152
149
        treeselection = self._treeview.get_selection()
153
150
        (model, iter) = treeselection.get_selected()
154
 
        
 
151
 
155
152
        if iter is None:
156
153
            return None
157
154
        else:
158
155
            return model.get_value(iter, 2)
159
 
    
 
156
 
160
157
    def _on_diff3_clicked(self, widget):
161
158
        """ Launch external utility to resolve conflicts. """
162
159
        self._set_diff3(self._entry_diff3.get_text())