/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: Gary van der Merwe
  • Date: 2007-08-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

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)
 
78
        self.treeview.connect("button-release-event", 
 
79
                self._treeview_row_mouseclick)
77
80
        scrollwin.add(self.treeview)
78
81
        self.treeview.show()
79
82
 
80
83
        cell = CellRendererGraph()
81
84
        column = gtk.TreeViewColumn()
82
 
        column.set_resizable(False)
 
85
        column.set_resizable(True)
83
86
        column.pack_start(cell, expand=False)
84
87
        column.add_attribute(cell, "node", 1)
85
88
        column.add_attribute(cell, "in-lines", 2)
112
115
        column.add_attribute(cell, "text", 6)
113
116
        self.treeview.append_column(column)
114
117
 
115
 
        hbox = gtk.HBox(False, spacing=6)
116
 
        vbox.pack_start(hbox, expand=False, fill=False)
 
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)
117
128
        hbox.show()
118
129
 
119
130
        self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
 
131
        self.back_button.set_relief(gtk.RELIEF_NONE)
120
132
        self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
121
133
                                         0, 0)
122
134
        self.back_button.connect("clicked", self._back_clicked_cb)
124
136
        self.back_button.show()
125
137
 
126
138
        self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
 
139
        self.fwd_button.set_relief(gtk.RELIEF_NONE)
127
140
        self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
128
141
                                        0, 0)
129
142
        self.fwd_button.connect("clicked", self._fwd_clicked_cb)
130
143
        hbox.pack_start(self.fwd_button, expand=False, fill=True)
131
144
        self.fwd_button.show()
132
145
 
133
 
        return vbox
 
146
        return frame
134
147
 
135
148
    def construct_bottom(self):
136
149
        """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):
 
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):
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.repository, 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
        tags = []
 
208
        if self.branch.supports_tags():
 
209
            tagdict = self.branch.tags.get_reverse_tag_dict()
 
210
            if tagdict.has_key(revision.revision_id):
 
211
                tags = tagdict[revision.revision_id]
 
212
        self.logview.set_revision(revision, tags)
185
213
 
186
214
    def _back_clicked_cb(self, *args):
187
215
        """Callback for when the back button is clicked."""
188
216
        (path, col) = self.treeview.get_cursor()
189
217
        revision = self.model[path][0]
190
 
        if not len(revision.parent_ids):
 
218
        if not len(self.parent_ids[revision]):
191
219
            return
192
220
 
193
 
        for parent_id in revision.parent_ids:
 
221
        for parent_id in self.parent_ids[revision]:
194
222
            parent = self.revisions[parent_id]
195
223
            if same_branch(revision, parent):
196
224
                self.treeview.set_cursor(self.index[parent])
197
225
                break
198
226
        else:
199
 
            next = self.revisions[revision.parent_ids[0]]
 
227
            next = self.revisions[self.parent_ids[revision][0]]
200
228
            self.treeview.set_cursor(self.index[next])
 
229
        self.treeview.grab_focus()
201
230
 
202
231
    def _fwd_clicked_cb(self, *args):
203
232
        """Callback for when the forward button is clicked."""
213
242
        else:
214
243
            prev = list(self.children[revision])[0]
215
244
            self.treeview.set_cursor(self.index[prev])
 
245
        self.treeview.grab_focus()
 
246
 
 
247
    def _go_clicked_cb(self, revid):
 
248
        """Callback for when the go button for a parent is clicked."""
 
249
        self.treeview.set_cursor(self.index[self.revisions[revid]])
 
250
        self.treeview.grab_focus()
 
251
 
 
252
    def show_diff(self, branch, revid, parentid):
 
253
        """Open a new window to show a diff between the given revisions."""
 
254
        from bzrlib.plugins.gtk.diff import DiffWindow
 
255
        window = DiffWindow()
 
256
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
257
                                                                   revid])
 
258
        description = revid + " - " + branch.nick
 
259
        window.set_diff(description, rev_tree, parent_tree)
 
260
        window.show()
 
261
 
 
262
    def _show_clicked_cb(self, revid, parentid):
 
263
        """Callback for when the show button for a parent is clicked."""
 
264
        self.show_diff(self.branch, revid, parentid)
 
265
        self.treeview.grab_focus()
 
266
 
 
267
    def _treeview_row_mouseclick(self, widget, event):
 
268
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
269
        if event.button == 3:
 
270
            menu = RevisionPopupMenu(self.branch.repository, 
 
271
                [x.revision_id for x in self.selected_revisions()],
 
272
                self.branch)
 
273
            menu.popup(None, None, None, event.button, event.get_time())
 
274
 
 
275
    def selected_revision(self, path):
 
276
        return self.model[path][0]
 
277
 
 
278
    def selected_revisions(self):
 
279
        return [self.selected_revision(path) for path in \
 
280
                self.treeview.get_selection().get_selected_rows()[1]]
 
281
 
 
282
    def _treeview_row_activated_cb(self, widget, path, col):
 
283
        # TODO: more than one parent
 
284
        """Callback for when a treeview row gets activated."""
 
285
        revision = self.selected_revision(path)
 
286
        if len(self.parent_ids[revision]) == 0:
 
287
            # Ignore revisions without parent
 
288
            return
 
289
        parent_id = self.parent_ids[revision][0]
 
290
        self.show_diff(self.branch, revision.revision_id, parent_id)
 
291
        self.treeview.grab_focus()