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

  • Committer: Daniel Schierbeck
  • Date: 2007-12-11 23:20:49 UTC
  • mfrom: (412.1.15 refactor)
  • Revision ID: daniel.schierbeck@gmail.com-20071211232049-3uj3jncnbeea1qqc
Merged refactoring of the revisionview.

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
pygtk.require("2.0")
20
20
import gtk
21
21
import pango
 
22
import gobject
22
23
 
23
24
from bzrlib.osutils import format_date
24
 
from bzrlib.util import bencode
 
25
from bzrlib.util.bencode import bdecode
25
26
 
26
27
class RevisionView(gtk.Notebook):
27
28
    """ Custom widget for commit log details.
30
31
    start.
31
32
    """
32
33
 
33
 
    def __init__(self, revision=None, tags=[],
34
 
                 show_children=False, branch=None):
 
34
    __gproperties__ = {
 
35
        'branch': (
 
36
            gobject.TYPE_PYOBJECT,
 
37
            'Branch',
 
38
            'The branch holding the revision being displayed',
 
39
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
40
        ),
 
41
 
 
42
        'revision': (
 
43
            gobject.TYPE_PYOBJECT,
 
44
            'Revision',
 
45
            'The revision being displayed',
 
46
            gobject.PARAM_READWRITE
 
47
        ),
 
48
 
 
49
        'children': (
 
50
            gobject.TYPE_PYOBJECT,
 
51
            'Children',
 
52
            'Child revisions',
 
53
            gobject.PARAM_READWRITE
 
54
        ),
 
55
 
 
56
        'file-id': (
 
57
            gobject.TYPE_PYOBJECT,
 
58
            'File Id',
 
59
            'The file id',
 
60
            gobject.PARAM_READWRITE
 
61
        )
 
62
    }
 
63
 
 
64
 
 
65
    def __init__(self, branch=None):
35
66
        gtk.Notebook.__init__(self)
36
 
        self.show_children = show_children
37
67
 
38
68
        self._create_general()
39
69
        self._create_relations()
42
72
        self.set_current_page(0)
43
73
        
44
74
        self._show_callback = None
45
 
        self._go_callback = None
46
75
        self._clicked_callback = None
47
76
 
 
77
        self._revision = None
48
78
        self._branch = branch
49
79
 
50
 
        if revision is not None:
51
 
            self.set_revision(revision, tags=tags)
 
80
        if self._branch is not None and self._branch.supports_tags():
 
81
            self._tagdict = self._branch.tags.get_reverse_tag_dict()
 
82
        else:
 
83
            self._tagdict = {}
 
84
 
52
85
        self.set_file_id(None)
53
86
 
 
87
    def do_get_property(self, property):
 
88
        if property.name == 'branch':
 
89
            return self._branch
 
90
        elif property.name == 'revision':
 
91
            return self._revision
 
92
        elif property.name == 'children':
 
93
            return self._children
 
94
        elif property.name == 'file-id':
 
95
            return self._file_id
 
96
        else:
 
97
            raise AttributeError, 'unknown property %s' % property.name
 
98
 
 
99
    def do_set_property(self, property, value):
 
100
        if property.name == 'branch':
 
101
            self._branch = value
 
102
        elif property.name == 'revision':
 
103
            self._set_revision(value)
 
104
        elif property.name == 'children':
 
105
            self.set_children(value)
 
106
        elif property.name == 'file-id':
 
107
            self._file_id = value
 
108
        else:
 
109
            raise AttributeError, 'unknown property %s' % property.name
 
110
 
54
111
    def set_show_callback(self, callback):
55
112
        self._show_callback = callback
56
113
 
57
 
    def set_go_callback(self, callback):
58
 
        self._go_callback = callback
59
 
 
60
114
    def set_file_id(self, file_id):
61
115
        """Set a specific file id that we want to track.
62
116
 
63
117
        This just effects the display of a per-file commit message.
64
118
        If it is set to None, then all commit messages will be shown.
65
119
        """
66
 
        self._file_id = file_id
67
 
 
68
 
    def set_revision(self, revision, tags=[], children=[]):
 
120
        self.set_property('file-id', file_id)
 
121
 
 
122
    def set_revision(self, revision):
 
123
        if revision != self._revision:
 
124
            self.set_property('revision', revision)
 
125
 
 
126
    def get_revision(self):
 
127
        return self.get_property('revision')
 
128
 
 
129
    def _set_revision(self, revision):
 
130
        if revision is None: return
 
131
 
69
132
        self._revision = revision
70
 
        self.revision_id.set_text(revision.revision_id)
71
133
        if revision.committer is not None:
72
134
            self.committer.set_text(revision.committer)
73
135
        else:
84
146
        if revision.timestamp is not None:
85
147
            self.timestamp.set_text(format_date(revision.timestamp,
86
148
                                                revision.timezone))
87
 
        self.message_buffer.set_text(revision.message)
88
149
        try:
89
150
            self.branchnick_label.set_text(revision.properties['branch-nick'])
90
151
        except KeyError:
94
155
                                      self.parents_widgets,
95
156
                                      self.parents_table)
96
157
        
97
 
        if self.show_children:
98
 
            self._add_parents_or_children(children,
99
 
                                          self.children_widgets,
100
 
                                          self.children_table)
101
 
        
102
 
        self._add_tags(tags)
103
 
 
104
158
        file_info = revision.properties.get('file-info', None)
105
159
        if file_info is not None:
106
 
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
 
160
            file_info = bdecode(file_info.encode('UTF-8'))
107
161
 
108
162
        if file_info:
109
163
            if self._file_id is None:
125
179
        else:
126
180
            self.file_info_box.hide()
127
181
 
 
182
    def set_children(self, children):
 
183
        self._add_parents_or_children(children,
 
184
                                      self.children_widgets,
 
185
                                      self.children_table)
 
186
 
128
187
    def _show_clicked_cb(self, widget, revid, parentid):
129
188
        """Callback for when the show button for a parent is clicked."""
130
189
        self._show_callback(revid, parentid)
131
190
 
132
191
    def _go_clicked_cb(self, widget, revid):
133
192
        """Callback for when the go button for a parent is clicked."""
134
 
        self._go_callback(revid)
135
193
 
136
 
    def _add_tags(self, tags):
 
194
    def _add_tags(self, *args):
 
195
        if self._tagdict.has_key(self._revision.revision_id):
 
196
            tags = self._tagdict[self._revision.revision_id]
 
197
        else:
 
198
            tags = []
 
199
            
137
200
        if tags == []:
138
201
            self.tags_list.hide()
139
202
            self.tags_label.hide()
183
246
                hbox.pack_start(button, expand=False, fill=True)
184
247
                button.show()
185
248
 
186
 
            if self._go_callback is not None:
187
 
                button = gtk.Button(revid)
188
 
                button.connect("clicked", self._go_clicked_cb, revid)
189
 
            else:
190
 
                button = gtk.Label(revid)
 
249
            button = gtk.Button(revid)
 
250
            button.connect("clicked",
 
251
                    lambda w, r: self.set_revision(self._branch.repository.get_revision(r)), revid)
191
252
            button.set_use_underline(False)
192
253
            hbox.pack_start(button, expand=False, fill=True)
193
254
            button.show()
204
265
        vbox = gtk.VBox(False, 6)
205
266
        vbox.set_border_width(6)
206
267
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
207
 
        if self.show_children:
208
 
            vbox.pack_start(self._create_children(), expand=False, fill=True)
 
268
        vbox.pack_start(self._create_children(), expand=False, fill=True)
209
269
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
210
270
        vbox.show()
211
271
 
224
284
        label.show()
225
285
 
226
286
        align = gtk.Alignment(0.0, 0.5)
227
 
        self.revision_id = gtk.Label()
228
 
        self.revision_id.set_selectable(True)
229
 
        align.add(self.revision_id)
 
287
        revision_id = gtk.Label()
 
288
        revision_id.set_selectable(True)
 
289
        self.connect('notify::revision', 
 
290
                lambda w, p: revision_id.set_text(self._revision.revision_id))
 
291
        align.add(revision_id)
230
292
        self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
231
293
        align.show()
232
 
        self.revision_id.show()
 
294
        revision_id.show()
233
295
 
234
296
        align = gtk.Alignment(1.0, 0.5)
235
297
        self.author_label = gtk.Label()
312
374
        self.tags_list.show()
313
375
        self.tags_widgets = []
314
376
 
 
377
        self.connect('notify::revision', self._add_tags)
 
378
 
315
379
        return self.table
316
380
 
317
381
    
350
414
        align.show()
351
415
 
352
416
        return table
353
 
    
354
 
 
355
417
 
356
418
    def _create_message_view(self):
357
 
        self.message_buffer = gtk.TextBuffer()
 
419
        msg_buffer = gtk.TextBuffer()
 
420
        self.connect('notify::revision',
 
421
                lambda w, p: msg_buffer.set_text(self._revision.message))
358
422
        window = gtk.ScrolledWindow()
359
423
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
360
424
        window.set_shadow_type(gtk.SHADOW_IN)
361
 
        tv = gtk.TextView(self.message_buffer)
 
425
        tv = gtk.TextView(msg_buffer)
362
426
        tv.set_editable(False)
363
427
        tv.set_wrap_mode(gtk.WRAP_WORD)
364
428
        tv.modify_font(pango.FontDescription("Monospace"))