/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 branchview/treeview.py

  • Committer: Curtis Hovey
  • Date: 2011-08-27 15:31:00 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827153100-ofzge4s4u64bynxq
Always pass a Gtk.TreePath instead of an int or tuple.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
105
105
        :param broken_line_length: After how much lines to break 
106
106
                                   branches.
107
107
        """
108
 
        super(TreeView, self).__init__(homogeneous=False, spacing=0)
 
108
        Gtk.VBox.__init__(self, homogeneous=False, spacing=0)
109
109
 
110
110
        self.progress_widget = ProgressPanel()
111
 
        self.pack_start(self.progress_widget, False, True, 0)
 
111
        self.pack_start(self.progress_widget, expand=False, fill=True)
112
112
        if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
113
113
            # We'are using our own ui, let's tell it to use our widget.
114
114
            ui.ui_factory.set_progress_bar_widget(self.progress_widget)
118
118
                                        Gtk.PolicyType.AUTOMATIC)
119
119
        self.scrolled_window.set_shadow_type(Gtk.ShadowType.IN)
120
120
        self.scrolled_window.show()
121
 
        self.pack_start(self.scrolled_window, True, True, 0)
 
121
        self.pack_start(self.scrolled_window, expand=True, fill=True)
122
122
 
123
123
        self.scrolled_window.add(self.construct_treeview())
124
124
 
131
131
        self.maxnum = maxnum
132
132
        self.compact = compact
133
133
 
134
 
        self.model = treemodel.BranchTreeModel(self.branch, [])
 
134
        self.model = treemodel.TreeModel(self.branch, [])
135
135
        GObject.idle_add(self.populate)
136
136
 
137
137
        self.connect("destroy", self._on_destroy)
260
260
    def back(self):
261
261
        """Signal handler for the Back button."""
262
262
        parents = self.get_parents()
263
 
        if not parents:
 
263
        if not len(parents):
264
264
            return
265
265
 
266
266
        for parent_id in parents:
275
275
    def forward(self):
276
276
        """Signal handler for the Forward button."""
277
277
        children = self.get_children()
278
 
        if not children:
 
278
        if not len(children):
279
279
            return
280
280
 
281
281
        for child_id in children:
312
312
            show_graph = self.graph_column.get_visible()
313
313
 
314
314
            self.branch.lock_read()
315
 
            (linegraphdata, index, columns_len) = linegraph(
316
 
                self.branch.repository.get_graph(),
317
 
                self.start,
318
 
                self.maxnum, 
319
 
                broken_line_length,
320
 
                show_graph,
321
 
                self.mainline_only,
322
 
                self.progress_bar)
 
315
            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
 
316
                                                            self.start,
 
317
                                                            self.maxnum, 
 
318
                                                            broken_line_length,
 
319
                                                            show_graph,
 
320
                                                            self.mainline_only,
 
321
                                                            self.progress_bar)
323
322
 
324
 
            self.model.set_line_graph_data(linegraphdata)
 
323
            self.model.line_graph_data = linegraphdata
325
324
            self.graph_cell.columns_len = columns_len
326
 
            width = self.graph_cell.get_preferred_width(self.treeview)[1]
 
325
            width = self.graph_cell.get_size(self.treeview)[2]
327
326
            if width > 500:
328
327
                width = 500
329
 
            elif width == 0:
330
 
                # The get_preferred_width() call got an insane value.
331
 
                width = 200
332
328
            self.graph_column.set_fixed_width(width)
333
329
            self.graph_column.set_max_width(width)
334
330
            self.index = index
354
350
        # from the key (that is the key is found in a REVNO at the offset 0)
355
351
        # or if a MESSAGE *contains* the key anywhere (that is, the key is
356
352
        # found case insensitively in a MESSAGE at any offset)
357
 
        def search_equal_func(model, column, key, iter, ignored):
 
353
        def search_equal_func(model, column, key, iter):
358
354
            return (model.get_value(iter, treemodel.REVNO).find(key) != 0
359
355
                and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
360
356
 
361
 
        self.treeview.set_search_equal_func(search_equal_func, None)
 
357
        self.treeview.set_search_equal_func(search_equal_func)
362
358
        self.treeview.set_enable_search(True)
363
359
 
364
 
        self.treeview.set_tooltip_column(treemodel.MESSAGE)
365
 
        self.treeview.set_headers_visible(True)
 
360
        set_tooltip(treemodel.MESSAGE)
366
361
 
367
362
        self._prev_cursor_path = None
368
363
        self.treeview.connect("cursor-changed",
384
379
        self.revno_column = Gtk.TreeViewColumn("Revision No")
385
380
        self.revno_column.set_resizable(True)
386
381
        self.revno_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
387
 
        self.revno_column.set_fixed_width(
388
 
            cell.get_preferred_width(self.treeview)[1])
389
 
        self.revno_column.pack_start(cell, True)
 
382
        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
383
        self.revno_column.pack_start(cell, True, True, 0)
390
384
        self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
391
385
        self.treeview.append_column(self.revno_column)
392
386
 
394
388
        self.graph_column = Gtk.TreeViewColumn()
395
389
        self.graph_column.set_resizable(True)
396
390
        self.graph_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
397
 
        self.graph_column.pack_start(self.graph_cell, True)
398
 
        self.graph_column.add_attribute(
399
 
            self.graph_cell, "node", treemodel.NODE)
400
 
        self.graph_column.add_attribute(
401
 
            self.graph_cell, "tags", treemodel.TAGS)
402
 
        self.graph_column.add_attribute(
403
 
            self.graph_cell, "in-lines", treemodel.LAST_LINES)
404
 
        self.graph_column.add_attribute(
405
 
            self.graph_cell, "out-lines", treemodel.LINES)
 
391
        self.graph_column.pack_start(self.graph_cell, True, True, 0)
 
392
        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
 
393
        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
 
394
        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
 
395
        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
406
396
        self.treeview.append_column(self.graph_column)
407
397
 
408
398
        cell = Gtk.CellRendererText()
412
402
        self.summary_column.set_resizable(True)
413
403
        self.summary_column.set_expand(True)
414
404
        self.summary_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
415
 
        self.summary_column.set_fixed_width(
416
 
            cell.get_preferred_width(self.treeview)[1])
417
 
        self.summary_column.pack_start(cell, True)
 
405
        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
 
406
        self.summary_column.pack_start(cell, True, True, 0)
418
407
        self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
419
408
        self.treeview.append_column(self.summary_column)
420
409
 
425
414
        self.authors_column.set_resizable(False)
426
415
        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
427
416
        self.authors_column.set_fixed_width(200)
428
 
        self.authors_column.pack_start(cell, True)
 
417
        self.authors_column.pack_start(cell, True, True, 0)
429
418
        self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
430
419
        self.treeview.append_column(self.authors_column)
431
420
 
437
426
        self.date_column.set_resizable(True)
438
427
        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
439
428
        self.date_column.set_fixed_width(130)
440
 
        self.date_column.pack_start(cell, True)
 
429
        self.date_column.pack_start(cell, True, True, 0)
441
430
        self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
442
431
        self.treeview.append_column(self.date_column)
443
432
 
454
443
    def _on_revision_selected(self, widget, event):
455
444
        from bzrlib.plugins.gtk.revisionmenu import RevisionMenu
456
445
        if event.button == 3:
457
 
            revs = []
458
 
            rev = self.get_revision()
459
 
            if rev is not None:
460
 
                revs.append(rev.revision_id)
461
 
            menu = RevisionMenu(self.branch.repository, revs, self.branch)
 
446
            menu = RevisionMenu(self.branch.repository, 
 
447
                [self.get_revision().revision_id],
 
448
                self.branch)
462
449
            menu.connect('tag-added', lambda w, t, r: self.add_tag(t, r))
463
 
            menu.popup(None, None, None, None, event.button, event.get_time())
 
450
            menu.popup(None, None, None, event.button, event.get_time())
464
451
 
465
452
    def _on_revision_activated(self, widget, path, col):
466
453
        self.emit('revision-activated', path, col)