/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: Aaron Bentley
  • Date: 2008-02-23 07:39:17 UTC
  • mfrom: (423.1.18 gtk)
  • Revision ID: aaron@aaronbentley.com-20080223073917-klpzk6zb2cfry4qp
Merge with mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
branchview/treeview.py
49
49
                    gobject.PARAM_READABLE),
50
50
 
51
51
        'revno-column-visible': (gobject.TYPE_BOOLEAN,
52
 
                                 'Revision number',
 
52
                                 'Revision number column',
53
53
                                 'Show revision number column',
54
54
                                 True,
55
55
                                 gobject.PARAM_READWRITE),
56
56
 
 
57
        'graph-column-visible': (gobject.TYPE_BOOLEAN,
 
58
                                 'Graph column',
 
59
                                 'Show graph column',
 
60
                                 True,
 
61
                                 gobject.PARAM_READWRITE),
 
62
 
57
63
        'date-column-visible': (gobject.TYPE_BOOLEAN,
58
64
                                 'Date',
59
65
                                 'Show date column',
64
70
                    'Compact view',
65
71
                    'Break ancestry lines to save space',
66
72
                    True,
67
 
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE)
 
73
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
 
74
 
 
75
        'mainline-only': (gobject.TYPE_BOOLEAN,
 
76
                    'Mainline only',
 
77
                    'Only show the mainline history.',
 
78
                    False,
 
79
                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
68
80
 
69
81
    }
70
82
 
75
87
        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
76
88
                              gobject.TYPE_NONE,
77
89
                              ()),
 
90
        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
 
91
                              gobject.TYPE_NONE,
 
92
                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
78
93
        'tag-added': (gobject.SIGNAL_RUN_FIRST,
79
94
                              gobject.TYPE_NONE,
80
95
                              (gobject.TYPE_STRING, gobject.TYPE_STRING))
97
112
                lambda x: self.loading_msg_box.hide())
98
113
 
99
114
        self.scrolled_window = gtk.ScrolledWindow()
100
 
        self.scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
115
        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
 
116
                                        gtk.POLICY_AUTOMATIC)
101
117
        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
102
118
        self.scrolled_window.show()
103
119
        self.pack_start(self.scrolled_window, expand=True, fill=True)
120
136
    def do_get_property(self, property):
121
137
        if property.name == 'revno-column-visible':
122
138
            return self.revno_column.get_visible()
 
139
        elif property.name == 'graph-column-visible':
 
140
            return self.graph_column.get_visible()
123
141
        elif property.name == 'date-column-visible':
124
142
            return self.date_column.get_visible()
125
143
        elif property.name == 'compact':
126
144
            return self.compact
 
145
        elif property.name == 'mainline-only':
 
146
            return self.mainline_only
127
147
        elif property.name == 'branch':
128
148
            return self.branch
129
149
        elif property.name == 'revision':
140
160
    def do_set_property(self, property, value):
141
161
        if property.name == 'revno-column-visible':
142
162
            self.revno_column.set_visible(value)
 
163
        elif property.name == 'graph-column-visible':
 
164
            self.graph_column.set_visible(value)
143
165
        elif property.name == 'date-column-visible':
144
166
            self.date_column.set_visible(value)
145
167
        elif property.name == 'compact':
146
168
            self.compact = value
 
169
        elif property.name == 'mainline-only':
 
170
            self.mainline_only = value
147
171
        elif property.name == 'branch':
148
172
            self.branch = value
149
173
        elif property.name == 'revision':
256
280
            broken_line_length = 32
257
281
        else:
258
282
            broken_line_length = None
 
283
        
 
284
        show_graph = self.graph_column.get_visible()
259
285
 
260
286
        self.branch.lock_read()
261
287
        (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
262
288
                                                        self.start,
263
289
                                                        self.maxnum, 
264
 
                                                        broken_line_length)
 
290
                                                        broken_line_length,
 
291
                                                        show_graph,
 
292
                                                        self.mainline_only)
265
293
 
266
294
        self.model = TreeModel(self.branch, linegraphdata)
267
295
        self.graph_cell.columns_len = columns_len
282
310
 
283
311
        return False
284
312
 
285
 
    def show_diff(self, revid=None, parentid=None):
286
 
        """Open a new window to show a diff between the given revisions."""
287
 
        from bzrlib.plugins.gtk.diff import DiffWindow
288
 
        window = DiffWindow(parent=self)
289
 
 
290
 
        parents = self.get_parents()
291
 
 
292
 
        if revid is None:
293
 
            revid = self.get_revision().revision_id
294
 
 
295
 
            if parentid is None and len(parents) > 0:
296
 
                parentid = parents[0]
297
 
 
298
 
        if parentid is None:
299
 
            parentid = NULL_REVISION
300
 
 
301
 
        rev_tree    = self.branch.repository.revision_tree(revid)
302
 
        parent_tree = self.branch.repository.revision_tree(parentid)
303
 
 
304
 
        description = revid + " - " + self.branch.nick
305
 
        window.set_diff(description, rev_tree, parent_tree)
306
 
        window.show()
307
 
 
308
313
    def construct_treeview(self):
309
314
        self.treeview = gtk.TreeView()
310
315
 
422
427
            menu.popup(None, None, None, event.button, event.get_time())
423
428
 
424
429
    def _on_revision_activated(self, widget, path, col):
425
 
        # TODO: more than one parent
426
 
        """Callback for when a treeview row gets activated."""
427
 
        revision_id = self.model[path][treemodel.REVID]
428
 
        parents = self.model[path][treemodel.PARENTS]
429
 
 
430
 
        if len(parents) == 0:
431
 
            parent_id = None
432
 
        else:
433
 
            parent_id = parents[0]
434
 
 
435
 
        self.show_diff(revision_id, parent_id)
436
 
        self.treeview.grab_focus()
 
430
        self.emit('revision-activated', path, col)