/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 viz/branchwin.py

  • Committer: Jelmer Vernooij
  • Date: 2007-07-15 18:12:57 UTC
  • Revision ID: jelmer@samba.org-20070715181257-g264qus2zyi3v39z
Add RevisionSelectionBox widget, use in TagDialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
12
12
import gtk
13
13
import gobject
14
14
import pango
15
 
import treemodel
16
15
 
17
 
from bzrlib.plugins.gtk.window import Window
18
16
from bzrlib.osutils import format_date
19
17
 
20
 
from linegraph import linegraph, same_branch
 
18
from graph import distances, graph, same_branch
21
19
from graphcell import CellRendererGraph
22
 
from treemodel import TreeModel
23
 
 
24
 
 
25
 
class BranchWindow(Window):
 
20
 
 
21
 
 
22
class BranchWindow(gtk.Window):
26
23
    """Branch window.
27
24
 
28
25
    This object represents and manages a single window containing information
29
26
    for a particular branch.
30
27
    """
31
28
 
32
 
    def __init__(self, parent=None):
33
 
        Window.__init__(self, parent=parent)
 
29
    def __init__(self):
 
30
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
34
31
        self.set_border_width(0)
35
 
        self.set_title("Revision history")
 
32
        self.set_title("bzrk")
36
33
 
37
34
        # Use three-quarters of the screen by default
38
35
        screen = self.get_screen()
56
53
        self.add(vbox)
57
54
 
58
55
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
59
 
        vbox.pack_start(self.construct_loading_msg(), expand=False, fill=True)
60
 
        
 
56
 
61
57
        paned = gtk.VPaned()
62
58
        paned.pack1(self.construct_top(), resize=True, shrink=False)
63
59
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
66
62
        vbox.set_focus_child(paned)
67
63
 
68
64
        vbox.show()
69
 
    
70
 
    def construct_loading_msg(self):
71
 
        image_loading = gtk.image_new_from_stock(gtk.STOCK_REFRESH,
72
 
                                                 gtk.ICON_SIZE_BUTTON)
73
 
        image_loading.show()
74
 
        
75
 
        label_loading = gtk.Label(_("Please wait, loading ancestral graph..."))
76
 
        label_loading.set_alignment(0.0, 0.5)        
77
 
        label_loading.show()
78
 
        
79
 
        self.loading_msg_box = gtk.HBox()
80
 
        self.loading_msg_box.set_spacing(5)
81
 
        self.loading_msg_box.set_border_width(5)        
82
 
        self.loading_msg_box.pack_start(image_loading, False, False)
83
 
        self.loading_msg_box.pack_start(label_loading, True, True)
84
 
        self.loading_msg_box.show()
85
 
        
86
 
        return self.loading_msg_box
87
65
 
88
66
    def construct_top(self):
89
67
        """Construct the top-half of the window."""
95
73
        self.treeview = gtk.TreeView()
96
74
        self.treeview.set_rules_hint(True)
97
75
        self.treeview.set_search_column(4)
98
 
        self.treeview.get_selection().connect("changed", self._treeselection_changed_cb)
 
76
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
99
77
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
100
78
        self.treeview.connect("button-release-event", 
101
79
                self._treeview_row_mouseclick)
102
 
        self.treeview.set_property('fixed-height-mode', True)
103
80
        scrollwin.add(self.treeview)
104
81
        self.treeview.show()
105
82
 
106
 
        cell = gtk.CellRendererText()
107
 
        cell.set_property("width-chars", 15)
108
 
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
109
 
        column = gtk.TreeViewColumn("Revision No")
 
83
        cell = CellRendererGraph()
 
84
        column = gtk.TreeViewColumn()
110
85
        column.set_resizable(True)
111
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
112
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
113
 
        column.pack_start(cell, expand=True)
114
 
        column.add_attribute(cell, "text", treemodel.REVNO)
 
86
        column.pack_start(cell, expand=False)
 
87
        column.add_attribute(cell, "node", 1)
 
88
        column.add_attribute(cell, "in-lines", 2)
 
89
        column.add_attribute(cell, "out-lines", 3)
115
90
        self.treeview.append_column(column)
116
91
 
117
 
        self.graph_cell = CellRendererGraph()
118
 
        self.graph_column = gtk.TreeViewColumn()
119
 
        self.graph_column.set_resizable(True)
120
 
        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
121
 
        self.graph_column.pack_start(self.graph_cell, expand=False)
122
 
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
123
 
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
124
 
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
125
 
        self.treeview.append_column(self.graph_column)
126
 
 
127
92
        cell = gtk.CellRendererText()
128
 
        cell.set_property("width-chars", 65)
 
93
        cell.set_property("width-chars", 40)
129
94
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
130
95
        column = gtk.TreeViewColumn("Message")
131
96
        column.set_resizable(True)
132
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
133
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
134
97
        column.pack_start(cell, expand=True)
135
 
        column.add_attribute(cell, "text", treemodel.MESSAGE)
 
98
        column.add_attribute(cell, "text", 4)
136
99
        self.treeview.append_column(column)
137
100
 
138
101
        cell = gtk.CellRendererText()
139
 
        cell.set_property("width-chars", 15)
 
102
        cell.set_property("width-chars", 40)
140
103
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
141
104
        column = gtk.TreeViewColumn("Committer")
142
105
        column.set_resizable(True)
143
 
        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
144
 
        column.set_fixed_width(cell.get_size(self.treeview)[2])
145
 
        column.pack_start(cell, expand=True)
146
 
        column.add_attribute(cell, "text", treemodel.COMMITER)
 
106
        column.pack_start(cell, expand=True)
 
107
        column.add_attribute(cell, "text", 5)
 
108
        self.treeview.append_column(column)
 
109
 
 
110
        cell = gtk.CellRendererText()
 
111
        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
 
112
        column = gtk.TreeViewColumn("Date")
 
113
        column.set_resizable(True)
 
114
        column.pack_start(cell, expand=True)
 
115
        column.add_attribute(cell, "text", 6)
147
116
        self.treeview.append_column(column)
148
117
 
149
118
        return scrollwin
179
148
    def construct_bottom(self):
180
149
        """Construct the bottom half of the window."""
181
150
        from bzrlib.plugins.gtk.logview import LogView
182
 
        self.logview = LogView(None, True, [], True)
 
151
        self.logview = LogView()
183
152
        (width, height) = self.get_size()
184
153
        self.logview.set_size_request(width, int(height / 2.5))
185
154
        self.logview.show()
195
164
        treeview itself.
196
165
        """
197
166
        self.branch = branch
198
 
        self.set_title(branch.nick + " - revision history")
199
 
        gobject.idle_add(self.populate_model, start, maxnum)
200
 
 
201
 
    def populate_model(self, start, maxnum):
202
 
        (linegraphdata, index, columns_len) = linegraph(self.branch,
203
 
                                                        start,
204
 
                                                        maxnum)
205
 
        self.model = TreeModel(self.branch, linegraphdata)
206
 
        self.graph_cell.columns_len = columns_len
207
 
        width = self.graph_cell.get_size(self.treeview)[2]
208
 
        self.graph_column.set_fixed_width(width)
209
 
        self.graph_column.set_max_width(width)
210
 
        self.index = index
 
167
 
 
168
        # [ revision, node, last_lines, lines, message, committer, timestamp ]
 
169
        self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
 
170
                                   gobject.TYPE_PYOBJECT,
 
171
                                   gobject.TYPE_PYOBJECT,
 
172
                                   gobject.TYPE_PYOBJECT,
 
173
                                   str, str, str)
 
174
        self.index = {}
 
175
        index = 0
 
176
 
 
177
        last_lines = []
 
178
        (self.revisions, colours, self.children, self.parent_ids,
 
179
            merge_sorted) = distances(branch, start)
 
180
        for (index, (revision, node, lines)) in enumerate(graph(
 
181
                self.revisions, colours, merge_sorted)):
 
182
            # FIXME: at this point we should be able to show the graph order
 
183
            # and lines with no message or commit data - and then incrementally
 
184
            # fill the timestamp, committer etc data as desired.
 
185
            message = revision.message.split("\n")[0]
 
186
            if revision.committer is not None:
 
187
                timestamp = format_date(revision.timestamp, revision.timezone)
 
188
            else:
 
189
                timestamp = None
 
190
            self.model.append([revision, node, last_lines, lines,
 
191
                               message, revision.committer, timestamp])
 
192
            self.index[revision] = index
 
193
            last_lines = lines
 
194
            if maxnum is not None and index > maxnum:
 
195
                break
 
196
 
 
197
        self.set_title(branch.nick + " - bzrk")
211
198
        self.treeview.set_model(self.model)
212
 
        self.treeview.get_selection().select_path(0)
213
 
        self.loading_msg_box.hide()
214
 
        return False
215
 
    
216
 
    def _treeselection_changed_cb(self, selection, *args):
217
 
        """Callback for when the treeview changes."""
218
 
        (model, selected_rows) = selection.get_selected_rows()
219
 
        if len(selected_rows) > 0:
220
 
            iter = self.model.get_iter(selected_rows[0])
221
 
            revision = self.model.get_value(iter, treemodel.REVISION)
222
 
            parents = self.model.get_value(iter, treemodel.PARENTS)
223
 
            children = self.model.get_value(iter, treemodel.CHILDREN)
224
 
            
225
 
            self.back_button.set_sensitive(len(parents) > 0)
226
 
            self.fwd_button.set_sensitive(len(children) > 0)
227
 
            tags = []
228
 
            if self.branch.supports_tags():
229
 
                tagdict = self.branch.tags.get_reverse_tag_dict()
230
 
                if tagdict.has_key(revision.revision_id):
231
 
                    tags = tagdict[revision.revision_id]
232
 
            self.logview.set_revision(revision, tags, children)
 
199
 
 
200
    def _treeview_cursor_cb(self, *args):
 
201
        """Callback for when the treeview cursor changes."""
 
202
        (path, col) = self.treeview.get_cursor()
 
203
        revision = self.model[path][0]
 
204
 
 
205
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
 
206
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
 
207
        self.logview.set_revision(revision)
233
208
 
234
209
    def _back_clicked_cb(self, *args):
235
210
        """Callback for when the back button is clicked."""
236
211
        (path, col) = self.treeview.get_cursor()
237
212
        revision = self.model[path][0]
238
 
        parents = self.model[path][4]
239
 
        if not len(parents):
 
213
        if not len(self.parent_ids[revision]):
240
214
            return
241
215
 
242
 
        for parent_id in parents:
243
 
            parent = self.revisions[self.index[parent_id]]
 
216
        for parent_id in self.parent_ids[revision]:
 
217
            parent = self.revisions[parent_id]
244
218
            if same_branch(revision, parent):
245
 
                self.treeview.set_cursor(self.index[parent_id])
 
219
                self.treeview.set_cursor(self.index[parent])
246
220
                break
247
221
        else:
248
 
            self.treeview.set_cursor(self.index[parents[0]])
 
222
            next = self.revisions[self.parent_ids[revision][0]]
 
223
            self.treeview.set_cursor(self.index[next])
249
224
        self.treeview.grab_focus()
250
225
 
251
226
    def _fwd_clicked_cb(self, *args):
252
227
        """Callback for when the forward button is clicked."""
253
228
        (path, col) = self.treeview.get_cursor()
254
229
        revision = self.model[path][0]
255
 
        children = self.model[path][5]
256
 
        if not len(children):
 
230
        if not len(self.children[revision]):
257
231
            return
258
232
 
259
 
        for child_id in children:
260
 
            child = self.revisions[self.index[child_id]]
 
233
        for child in self.children[revision]:
261
234
            if same_branch(child, revision):
262
 
                self.treeview.set_cursor(self.index[child_id])
 
235
                self.treeview.set_cursor(self.index[child])
263
236
                break
264
237
        else:
265
 
            self.treeview.set_cursor(self.index[children[0]])
 
238
            prev = list(self.children[revision])[0]
 
239
            self.treeview.set_cursor(self.index[prev])
266
240
        self.treeview.grab_focus()
267
241
 
268
242
    def _go_clicked_cb(self, revid):
269
243
        """Callback for when the go button for a parent is clicked."""
270
 
        self.treeview.set_cursor(self.index[revid])
 
244
        self.treeview.set_cursor(self.index[self.revisions[revid]])
271
245
        self.treeview.grab_focus()
272
246
 
273
247
    def show_diff(self, branch, revid, parentid):
274
248
        """Open a new window to show a diff between the given revisions."""
275
249
        from bzrlib.plugins.gtk.diff import DiffWindow
276
 
        window = DiffWindow(parent=self)
 
250
        window = DiffWindow()
277
251
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
278
252
                                                                   revid])
279
253
        description = revid + " - " + branch.nick
294
268
            menu.popup(None, None, None, event.button, event.get_time())
295
269
 
296
270
    def selected_revision(self, path):
297
 
        return self.model[path][treemodel.REVISION]
 
271
        return self.model[path][0]
298
272
 
299
273
    def selected_revisions(self):
300
274
        return [self.selected_revision(path) for path in \
303
277
    def _treeview_row_activated_cb(self, widget, path, col):
304
278
        # TODO: more than one parent
305
279
        """Callback for when a treeview row gets activated."""
306
 
        revision_id = self.model[path][treemodel.REVID]
307
 
        parents = self.model[path][treemodel.PARENTS]
308
 
        if len(parents) == 0:
 
280
        revision = self.selected_revision(path)
 
281
        if len(self.parent_ids[revision]) == 0:
309
282
            # Ignore revisions without parent
310
283
            return
311
 
        parent_id = parents[0]
312
 
        self.show_diff(self.branch, revision_id, parent_id)
 
284
        parent_id = self.parent_ids[revision][0]
 
285
        self.show_diff(self.branch, revision.revision_id, parent_id)
313
286
        self.treeview.grab_focus()