/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-08-27 12:41:41 UTC
  • Revision ID: jelmer@samba.org-20070827124141-rsvtyw1bf4bd7wt3
Start working on 0.91 version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/branchwin.py
26
26
    for a particular branch.
27
27
    """
28
28
 
29
 
    def __init__(self, app=None):
 
29
    def __init__(self):
30
30
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
31
31
        self.set_border_width(0)
32
32
        self.set_title("bzrk")
33
33
 
34
 
        self.app = app
35
 
 
36
34
        # Use three-quarters of the screen by default
37
35
        screen = self.get_screen()
38
36
        monitor = screen.get_monitor_geometry(0)
77
75
        self.treeview.set_search_column(4)
78
76
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
79
77
        self.treeview.connect("row-activated", self._treeview_row_activated_cb)
 
78
        self.treeview.connect("button-release-event", 
 
79
                self._treeview_row_mouseclick)
80
80
        scrollwin.add(self.treeview)
81
81
        self.treeview.show()
82
82
 
149
149
        """Construct the bottom half of the window."""
150
150
        from bzrlib.plugins.gtk.logview import LogView
151
151
        self.logview = LogView()
152
 
        self.logview.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
153
 
        self.logview.set_shadow_type(gtk.SHADOW_NONE)
154
152
        (width, height) = self.get_size()
155
153
        self.logview.set_size_request(width, int(height / 2.5))
156
154
        self.logview.show()
174
172
                                   gobject.TYPE_PYOBJECT,
175
173
                                   str, str, str)
176
174
        self.index = {}
 
175
        self.set_title(branch.nick + " - bzrk")
 
176
        gobject.idle_add(self.populate_model, start, maxnum)
 
177
 
 
178
    def populate_model(self, start, maxnum):
177
179
        index = 0
178
 
 
 
180
        
179
181
        last_lines = []
180
182
        (self.revisions, colours, self.children, self.parent_ids,
181
 
         merge_sorted) = distances(branch, start)
 
183
            merge_sorted) = distances(self.branch.repository, start)
182
184
        for (index, (revision, node, lines)) in enumerate(graph(
183
185
                self.revisions, colours, merge_sorted)):
184
186
            # FIXME: at this point we should be able to show the graph order
195
197
            last_lines = lines
196
198
            if maxnum is not None and index > maxnum:
197
199
                break
198
 
 
199
 
        self.set_title(branch.nick + " - bzrk")
200
200
        self.treeview.set_model(self.model)
201
 
 
 
201
        return False
 
202
    
 
203
    
202
204
    def _treeview_cursor_cb(self, *args):
203
205
        """Callback for when the treeview cursor changes."""
204
206
        (path, col) = self.treeview.get_cursor()
206
208
 
207
209
        self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
208
210
        self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
209
 
        self.logview.set_revision(revision)
 
211
        tags = []
 
212
        if self.branch.supports_tags():
 
213
            tagdict = self.branch.tags.get_reverse_tag_dict()
 
214
            if tagdict.has_key(revision.revision_id):
 
215
                tags = tagdict[revision.revision_id]
 
216
        self.logview.set_revision(revision, tags)
210
217
 
211
218
    def _back_clicked_cb(self, *args):
212
219
        """Callback for when the back button is clicked."""
246
253
        self.treeview.set_cursor(self.index[self.revisions[revid]])
247
254
        self.treeview.grab_focus()
248
255
 
 
256
    def show_diff(self, branch, revid, parentid):
 
257
        """Open a new window to show a diff between the given revisions."""
 
258
        from bzrlib.plugins.gtk.diff import DiffWindow
 
259
        window = DiffWindow()
 
260
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
 
261
                                                                   revid])
 
262
        description = revid + " - " + branch.nick
 
263
        window.set_diff(description, rev_tree, parent_tree)
 
264
        window.show()
 
265
 
249
266
    def _show_clicked_cb(self, revid, parentid):
250
267
        """Callback for when the show button for a parent is clicked."""
251
 
        if self.app is not None:
252
 
            self.app.show_diff(self.branch, revid, parentid)
 
268
        self.show_diff(self.branch, revid, parentid)
253
269
        self.treeview.grab_focus()
254
270
 
 
271
    def _treeview_row_mouseclick(self, widget, event):
 
272
        from bzrlib.plugins.gtk.revisionmenu import RevisionPopupMenu
 
273
        if event.button == 3:
 
274
            menu = RevisionPopupMenu(self.branch.repository, 
 
275
                [x.revision_id for x in self.selected_revisions()],
 
276
                self.branch)
 
277
            menu.popup(None, None, None, event.button, event.get_time())
 
278
 
 
279
    def selected_revision(self, path):
 
280
        return self.model[path][0]
 
281
 
 
282
    def selected_revisions(self):
 
283
        return [self.selected_revision(path) for path in \
 
284
                self.treeview.get_selection().get_selected_rows()[1]]
 
285
 
255
286
    def _treeview_row_activated_cb(self, widget, path, col):
256
287
        # TODO: more than one parent
257
288
        """Callback for when a treeview row gets activated."""
258
 
        revision = self.model[path][0]
 
289
        revision = self.selected_revision(path)
259
290
        if len(self.parent_ids[revision]) == 0:
260
291
            # Ignore revisions without parent
261
292
            return
262
293
        parent_id = self.parent_ids[revision][0]
263
 
        if self.app is not None:
264
 
            self.app.show_diff(self.branch, revision.revision_id, parent_id)
 
294
        self.show_diff(self.branch, revision.revision_id, parent_id)
265
295
        self.treeview.grab_focus()