/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 logview.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-09-30 21:58:29 UTC
  • mfrom: (256.2.64 gtk)
  • Revision ID: szilveszter.farkas@gmail.com-20070930215829-ty0js2529sni7ziv
Merge the vizchanges/brokenlines branch from Gary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
logview.py
30
30
    start.
31
31
    """
32
32
 
33
 
    def __init__(self, revision=None, scroll=True, tags=[]):
 
33
    def __init__(self, revision=None, scroll=True, tags=[],
 
34
                 show_children=False):
34
35
        super(LogView, self).__init__()
35
36
        if scroll:
36
37
            self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
37
38
        else:
38
39
            self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER)
39
40
        self.set_shadow_type(gtk.SHADOW_NONE)
 
41
        self.show_children = show_children
40
42
        self._create()
41
43
        self._show_callback = None
42
44
        self._go_callback = None
51
53
    def set_go_callback(self, callback):
52
54
        self._go_callback = callback
53
55
 
54
 
    def set_revision(self, revision, tags=[]):
 
56
    def set_revision(self, revision, tags=[], children=[]):
55
57
        self._revision = revision
56
58
        self.revision_id.set_text(revision.revision_id)
57
59
        if revision.committer is not None:
76
78
        except KeyError:
77
79
            self.branchnick_label.set_text("")
78
80
 
79
 
        self._add_parents(revision.parent_ids)
 
81
        self._add_parents_or_children(revision.parent_ids,
 
82
                                      self.parents_widgets,
 
83
                                      self.parents_table)
 
84
        
 
85
        if self.show_children:
 
86
            self._add_parents_or_children(children,
 
87
                                          self.children_widgets,
 
88
                                          self.children_table)
 
89
        
80
90
        self._add_tags(tags)
81
91
 
82
92
    def _show_clicked_cb(self, widget, revid, parentid):
107
117
        self.tags_label.show_all()
108
118
        
109
119
 
110
 
    def _add_parents(self, parent_ids):
111
 
        for widget in self.parents_widgets:
112
 
            self.parents_table.remove(widget)
113
 
            
114
 
        self.parents_widgets = []
115
 
        self.parents_table.resize(max(len(parent_ids), 1), 2)
 
120
    def _add_parents_or_children(self, revids, widgets, table):
 
121
        while len(widgets) > 0:
 
122
            widget = widgets.pop()
 
123
            table.remove(widget)
 
124
        
 
125
        table.resize(max(len(revids), 1), 2)
116
126
 
117
 
        for idx, parent_id in enumerate(parent_ids):
 
127
        for idx, revid in enumerate(revids):
118
128
            align = gtk.Alignment(0.0, 0.0)
119
 
            self.parents_widgets.append(align)
120
 
            self.parents_table.attach(align, 1, 2, idx, idx + 1,
 
129
            widgets.append(align)
 
130
            table.attach(align, 1, 2, idx, idx + 1,
121
131
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
122
132
            align.show()
123
133
 
134
144
                button = gtk.Button()
135
145
                button.add(image)
136
146
                button.connect("clicked", self._show_clicked_cb,
137
 
                               self._revision.revision_id, parent_id)
 
147
                               self._revision.revision_id, revid)
138
148
                hbox.pack_start(button, expand=False, fill=True)
139
149
                button.show()
140
150
 
141
151
            if self._go_callback is not None:
142
 
                button = gtk.Button(parent_id)
143
 
                button.connect("clicked", self._go_clicked_cb, parent_id)
 
152
                button = gtk.Button(revid)
 
153
                button.connect("clicked", self._go_clicked_cb, revid)
144
154
            else:
145
 
                button = gtk.Label(parent_id)
 
155
                button = gtk.Label(revid)
146
156
            button.set_use_underline(False)
147
157
            hbox.pack_start(button, expand=False, fill=True)
148
158
            button.show()
151
161
        vbox = gtk.VBox(False, 6)
152
162
        vbox.set_border_width(6)
153
163
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
154
 
        vbox.pack_start(self._create_parents_table(), expand=False, fill=True)
 
164
        vbox.pack_start(self._create_parents_and_children(), expand=False, fill=True)
155
165
        vbox.pack_start(self._create_message_view())
156
166
        self.add_with_viewport(vbox)
157
167
        vbox.show()
261
271
 
262
272
        return self.table
263
273
 
264
 
    def _create_parents_table(self):
265
 
        self.parents_table = gtk.Table(rows=1, columns=2)
266
 
        self.parents_table.set_row_spacings(3)
267
 
        self.parents_table.set_col_spacings(6)
268
 
        self.parents_table.show()
 
274
    
 
275
    def _create_parents_and_children(self):
 
276
        hbox = gtk.HBox(True, 6)
 
277
        
 
278
        self.parents_table = self._create_parents_or_children_table(
 
279
            "<b>Parents:</b>")
269
280
        self.parents_widgets = []
 
281
        hbox.pack_start(self.parents_table)
 
282
        
 
283
        if self.show_children:
 
284
            self.children_table = self._create_parents_or_children_table(
 
285
                "<b>Children:</b>")
 
286
            self.children_widgets = []
 
287
            hbox.pack_start(self.children_table)
 
288
        
 
289
        hbox.show()
 
290
        return hbox
 
291
        
 
292
    def _create_parents_or_children_table(self, text):
 
293
        table = gtk.Table(rows=1, columns=2)
 
294
        table.set_row_spacings(3)
 
295
        table.set_col_spacings(6)
 
296
        table.show()
270
297
 
271
298
        label = gtk.Label()
272
 
        label.set_markup("<b>Parents:</b>")
 
299
        label.set_markup(text)
273
300
        align = gtk.Alignment(0.0, 0.5)
274
301
        align.add(label)
275
 
        self.parents_table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
302
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
276
303
        label.show()
277
304
        align.show()
278
305
 
279
 
        return self.parents_table
 
306
        return table
 
307
    
 
308
 
280
309
 
281
310
    def _create_message_view(self):
282
311
        self.message_buffer = gtk.TextBuffer()