/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
1
 
#!/usr/bin/python
2
1
# -*- coding: UTF-8 -*-
3
2
"""Branch window.
4
3
 
10
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
11
10
 
12
11
 
13
 
import os
14
 
 
15
12
import gtk
16
13
import gobject
17
14
import pango
18
15
 
19
16
from bzrlib.osutils import format_date
20
17
 
21
 
from graph import graph
 
18
from graph import distances, graph, same_branch
22
19
from graphcell import CellRendererGraph
23
20
 
24
21
 
36
33
 
37
34
        # Use three-quarters of the screen by default
38
35
        screen = self.get_screen()
39
 
        width = int(screen.get_width() * 0.75)
40
 
        height = int(screen.get_height() * 0.75)
 
36
        monitor = screen.get_monitor_geometry(0)
 
37
        width = int(monitor.width * 0.75)
 
38
        height = int(monitor.height * 0.75)
41
39
        self.set_default_size(width, height)
42
40
 
43
41
        # FIXME AndyFitz!
44
42
        icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
45
43
        self.set_icon(icon)
46
44
 
 
45
        self.accel_group = gtk.AccelGroup()
 
46
        self.add_accel_group(self.accel_group)
 
47
 
47
48
        self.construct()
48
49
 
49
50
    def construct(self):
50
51
        """Construct the window contents."""
 
52
        vbox = gtk.VBox(spacing=0)
 
53
        self.add(vbox)
 
54
 
 
55
        vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
 
56
 
 
57
        paned = gtk.VPaned()
 
58
        paned.pack1(self.construct_top(), resize=True, shrink=False)
 
59
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
 
60
        paned.show()
 
61
        vbox.pack_start(paned, expand=True, fill=True)
 
62
        vbox.set_focus_child(paned)
 
63
 
 
64
        vbox.show()
 
65
 
 
66
    def construct_top(self):
 
67
        """Construct the top-half of the window."""
51
68
        scrollwin = gtk.ScrolledWindow()
52
69
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
53
70
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
54
 
        scrollwin.set_border_width(12)
55
 
        self.add(scrollwin)
56
71
        scrollwin.show()
57
72
 
58
73
        self.treeview = gtk.TreeView()
59
74
        self.treeview.set_rules_hint(True)
60
75
        self.treeview.set_search_column(4)
 
76
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
 
77
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
 
78
        self.treeview.connect("button-release-event", 
 
79
                self._treeview_row_mouseclick)
61
80
        scrollwin.add(self.treeview)
62
81
        self.treeview.show()
63
82
 
64
83
        cell = CellRendererGraph()
65
84
        column = gtk.TreeViewColumn()
66
 
        column.set_resizable(False)
 
85
        column.set_resizable(True)
67
86
        column.pack_start(cell, expand=False)
68
87
        column.add_attribute(cell, "node", 1)
69
88
        column.add_attribute(cell, "in-lines", 2)
96
115
        column.add_attribute(cell, "text", 6)
97
116
        self.treeview.append_column(column)
98
117
 
99
 
    def set_branch(self, branch, start):
 
118
        return scrollwin
 
119
 
 
120
    def construct_navigation(self):
 
121
        """Construct the navigation buttons."""
 
122
        frame = gtk.Frame()
 
123
        frame.set_shadow_type(gtk.SHADOW_OUT)
 
124
        frame.show()
 
125
        
 
126
        hbox = gtk.HBox(spacing=12)
 
127
        frame.add(hbox)
 
128
        hbox.show()
 
129
 
 
130
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
 
131
        self.back_button.set_relief(gtk.RELIEF_NONE)
 
132
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
 
133
                                         0, 0)
 
134
        self.back_button.connect("clicked", self._back_clicked_cb)
 
135
        hbox.pack_start(self.back_button, expand=False, fill=True)
 
136
        self.back_button.show()
 
137
 
 
138
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
 
139
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
 
140
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
 
141
                                        0, 0)
 
142
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
 
143
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
 
144
        self.fwd_button.show()
 
145
 
 
146
        return frame
 
147
 
 
148
    def construct_bottom(self):
 
149
        """Construct the bottom half of the window."""
 
150
        from bzrlib.plugins.gtk.logview import LogView
 
151
        self.logview = LogView()
 
152
        (width, height) = self.get_size()
 
153
        self.logview.set_size_request(width, int(height / 2.5))
 
154
        self.logview.show()
 
155
        self.logview.set_show_callback(self._show_clicked_cb)
 
156
        self.logview.set_go_callback(self._go_clicked_cb)
 
157
        return self.logview
 
158
 
 
159
    def set_branch(self, branch, start, maxnum):
100
160
        """Set the branch and start position for this window.
101
161
 
102
162
        Creates a new TreeModel and populates it with information about
103
163
        the new branch before updating the window title and model of the
104
164
        treeview itself.
105
165
        """
 
166
        self.branch = branch
 
167
 
106
168
        # [ revision, node, last_lines, lines, message, committer, timestamp ]
107
 
        model = gtk.ListStore(gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
108
 
                              gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT,
109
 
                              str, str, str)
 
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
110
176
 
111
177
        last_lines = []
112
 
        for revision, node, lines in graph(branch, start):
 
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.
113
185
            message = revision.message.split("\n")[0]
114
186
            if revision.committer is not None:
115
187
                timestamp = format_date(revision.timestamp, revision.timezone)
116
188
            else:
117
189
                timestamp = None
118
 
 
119
 
            model.append([ revision, node, last_lines, lines,
120
 
                           message, revision.committer, timestamp ])
 
190
            self.model.append([revision, node, last_lines, lines,
 
191
                               message, revision.committer, timestamp])
 
192
            self.index[revision] = index
121
193
            last_lines = lines
122
 
 
123
 
        self.set_title(os.path.basename(branch.base) + " - bzrk")
124
 
        self.treeview.set_model(model)
 
194
            if maxnum is not None and index > maxnum:
 
195
                break
 
196
 
 
197
        self.set_title(branch.nick + " - bzrk")
 
198
        self.treeview.set_model(self.model)
 
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)
 
208
 
 
209
    def _back_clicked_cb(self, *args):
 
210
        """Callback for when the back button is clicked."""
 
211
        (path, col) = self.treeview.get_cursor()
 
212
        revision = self.model[path][0]
 
213
        if not len(self.parent_ids[revision]):
 
214
            return
 
215
 
 
216
        for parent_id in self.parent_ids[revision]:
 
217
            parent = self.revisions[parent_id]
 
218
            if same_branch(revision, parent):
 
219
                self.treeview.set_cursor(self.index[parent])
 
220
                break
 
221
        else:
 
222
            next = self.revisions[self.parent_ids[revision][0]]
 
223
            self.treeview.set_cursor(self.index[next])
 
224
        self.treeview.grab_focus()
 
225
 
 
226
    def _fwd_clicked_cb(self, *args):
 
227
        """Callback for when the forward button is clicked."""
 
228
        (path, col) = self.treeview.get_cursor()
 
229
        revision = self.model[path][0]
 
230
        if not len(self.children[revision]):
 
231
            return
 
232
 
 
233
        for child in self.children[revision]:
 
234
            if same_branch(child, revision):
 
235
                self.treeview.set_cursor(self.index[child])
 
236
                break
 
237
        else:
 
238
            prev = list(self.children[revision])[0]
 
239
            self.treeview.set_cursor(self.index[prev])
 
240
        self.treeview.grab_focus()
 
241
 
 
242
    def _go_clicked_cb(self, revid):
 
243
        """Callback for when the go button for a parent is clicked."""
 
244
        self.treeview.set_cursor(self.index[self.revisions[revid]])
 
245
        self.treeview.grab_focus()
 
246
 
 
247
    def show_diff(self, branch, revid, parentid):
 
248
        """Open a new window to show a diff between the given revisions."""
 
249
        from bzrlib.plugins.gtk.diff import DiffWindow
 
250
        window = DiffWindow()
 
251
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
252
                                                                   revid])
 
253
        description = revid + " - " + branch.nick
 
254
        window.set_diff(description, rev_tree, parent_tree)
 
255
        window.show()
 
256
 
 
257
    def _show_clicked_cb(self, revid, parentid):
 
258
        """Callback for when the show button for a parent is clicked."""
 
259
        self.show_diff(self.branch, revid, parentid)
 
260
        self.treeview.grab_focus()
 
261
 
 
262
    def _treeview_row_mouseclick(self, widget, event):
 
263
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
264
        if event.button == 3:
 
265
            menu = RevisionPopupMenu(self.branch.repository, 
 
266
                [x.revision_id for x in self.selected_revisions()],
 
267
                self.branch)
 
268
            menu.popup(None, None, None, event.button, event.get_time())
 
269
 
 
270
    def selected_revision(self, path):
 
271
        return self.model[path][0]
 
272
 
 
273
    def selected_revisions(self):
 
274
        return [self.selected_revision(path) for path in \
 
275
                self.treeview.get_selection().get_selected_rows()[1]]
 
276
 
 
277
    def _treeview_row_activated_cb(self, widget, path, col):
 
278
        # TODO: more than one parent
 
279
        """Callback for when a treeview row gets activated."""
 
280
        revision = self.selected_revision(path)
 
281
        if len(self.parent_ids[revision]) == 0:
 
282
            # Ignore revisions without parent
 
283
            return
 
284
        parent_id = self.parent_ids[revision][0]
 
285
        self.show_diff(self.branch, revision.revision_id, parent_id)
 
286
        self.treeview.grab_focus()