/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 16:23:15 UTC
  • mfrom: (170 trunk)
  • mto: (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315162315-rs1sbxjh31n314zc
Merge from trunk.

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
52
49
 
53
50
    def construct(self):
54
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
 
55
57
        paned = gtk.VPaned()
56
58
        paned.pack1(self.construct_top(), resize=True, shrink=False)
57
 
        paned.pack2(self.construct_bottom(), resize=True, shrink=True)
58
 
        self.add(paned)
 
59
        paned.pack2(self.construct_bottom(), resize=False, shrink=True)
59
60
        paned.show()
 
61
        vbox.pack_start(paned, expand=True, fill=True)
 
62
        vbox.set_focus_child(paned)
 
63
 
 
64
        vbox.show()
60
65
 
61
66
    def construct_top(self):
62
67
        """Construct the top-half of the window."""
63
 
        vbox = gtk.VBox(spacing=6)
64
 
        vbox.set_border_width(12)
65
 
        vbox.show()
66
 
 
67
68
        scrollwin = gtk.ScrolledWindow()
68
69
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
69
70
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
70
 
        vbox.pack_start(scrollwin, expand=True, fill=True)
71
71
        scrollwin.show()
72
72
 
73
73
        self.treeview = gtk.TreeView()
74
74
        self.treeview.set_rules_hint(True)
75
75
        self.treeview.set_search_column(4)
76
76
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
 
77
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
77
78
        scrollwin.add(self.treeview)
78
79
        self.treeview.show()
79
80
 
80
81
        cell = CellRendererGraph()
81
82
        column = gtk.TreeViewColumn()
82
 
        column.set_resizable(False)
 
83
        column.set_resizable(True)
83
84
        column.pack_start(cell, expand=False)
84
85
        column.add_attribute(cell, "node", 1)
85
86
        column.add_attribute(cell, "in-lines", 2)
112
113
        column.add_attribute(cell, "text", 6)
113
114
        self.treeview.append_column(column)
114
115
 
115
 
        hbox = gtk.HBox(False, spacing=6)
116
 
        vbox.pack_start(hbox, expand=False, fill=False)
 
116
        return scrollwin
 
117
 
 
118
    def construct_navigation(self):
 
119
        """Construct the navigation buttons."""
 
120
        frame = gtk.Frame()
 
121
        frame.set_shadow_type(gtk.SHADOW_OUT)
 
122
        frame.show()
 
123
        
 
124
        hbox = gtk.HBox(spacing=12)
 
125
        frame.add(hbox)
117
126
        hbox.show()
118
127
 
119
128
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
 
129
        self.back_button.set_relief(gtk.RELIEF_NONE)
120
130
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
121
131
                                         0, 0)
122
132
        self.back_button.connect("clicked", self._back_clicked_cb)
124
134
        self.back_button.show()
125
135
 
126
136
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
 
137
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
127
138
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
128
139
                                        0, 0)
129
140
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
130
141
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
131
142
        self.fwd_button.show()
132
143
 
133
 
        return vbox
 
144
        return frame
134
145
 
135
146
    def construct_bottom(self):
136
147
        """Construct the bottom half of the window."""
137
 
        label = gtk.Label("test")
138
 
        label.show()
139
 
 
140
 
        return label
141
 
 
142
 
    def set_branch(self, branch, start):
 
148
        from bzrlib.plugins.gtk.logview import LogView
 
149
        self.logview = LogView()
 
150
        self.logview.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
151
        self.logview.set_shadow_type(gtk.SHADOW_NONE)
 
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):
143
160
        """Set the branch and start position for this window.
144
161
 
145
162
        Creates a new TreeModel and populates it with information about
146
163
        the new branch before updating the window title and model of the
147
164
        treeview itself.
148
165
        """
 
166
        self.branch = branch
 
167
 
149
168
        # [ revision, node, last_lines, lines, message, committer, timestamp ]
150
169
        self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
151
170
                                   gobject.TYPE_PYOBJECT,
156
175
        index = 0
157
176
 
158
177
        last_lines = []
159
 
        (revids, self.revisions, colours, self.children) \
160
 
                 = distances(branch, start)
161
 
        for revision, node, lines in graph(revids, self.revisions, colours):
 
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.
162
185
            message = revision.message.split("\n")[0]
163
186
            if revision.committer is not None:
164
187
                timestamp = format_date(revision.timestamp, revision.timezone)
165
188
            else:
166
189
                timestamp = None
167
 
 
168
 
            self.model.append([ revision, node, last_lines, lines,
169
 
                                message, revision.committer, timestamp ])
 
190
            self.model.append([revision, node, last_lines, lines,
 
191
                               message, revision.committer, timestamp])
170
192
            self.index[revision] = index
171
 
            index += 1
172
 
 
173
193
            last_lines = lines
 
194
            if maxnum is not None and index > maxnum:
 
195
                break
174
196
 
175
 
        self.set_title(os.path.basename(branch.base) + " - bzrk")
 
197
        self.set_title(branch.nick + " - bzrk")
176
198
        self.treeview.set_model(self.model)
177
199
 
178
200
    def _treeview_cursor_cb(self, *args):
180
202
        (path, col) = self.treeview.get_cursor()
181
203
        revision = self.model[path][0]
182
204
 
183
 
        self.back_button.set_sensitive(len(revision.parent_ids) > 0)
 
205
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
184
206
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
 
207
        self.logview.set_revision(revision)
185
208
 
186
209
    def _back_clicked_cb(self, *args):
187
210
        """Callback for when the back button is clicked."""
188
211
        (path, col) = self.treeview.get_cursor()
189
212
        revision = self.model[path][0]
190
 
        if not len(revision.parent_ids):
 
213
        if not len(self.parent_ids[revision]):
191
214
            return
192
215
 
193
 
        for parent_id in revision.parent_ids:
 
216
        for parent_id in self.parent_ids[revision]:
194
217
            parent = self.revisions[parent_id]
195
218
            if same_branch(revision, parent):
196
219
                self.treeview.set_cursor(self.index[parent])
197
220
                break
198
221
        else:
199
 
            next = self.revisions[revision.parent_ids[0]]
 
222
            next = self.revisions[self.parent_ids[revision][0]]
200
223
            self.treeview.set_cursor(self.index[next])
 
224
        self.treeview.grab_focus()
201
225
 
202
226
    def _fwd_clicked_cb(self, *args):
203
227
        """Callback for when the forward button is clicked."""
213
237
        else:
214
238
            prev = list(self.children[revision])[0]
215
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
        rev_tree = branch.repository.revision_tree(revid)
 
252
        parent_tree = branch.repository.revision_tree(parentid)
 
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_activated_cb(self, widget, path, col):
 
263
        # TODO: more than one parent
 
264
        """Callback for when a treeview row gets activated."""
 
265
        revision = self.model[path][0]
 
266
        if len(self.parent_ids[revision]) == 0:
 
267
            # Ignore revisions without parent
 
268
            return
 
269
        parent_id = self.parent_ids[revision][0]
 
270
        self.show_diff(self.branch, revision.revision_id, parent_id)
 
271
        self.treeview.grab_focus()