/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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