/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

Merge Johns' gcommit improvements and fix conflicts against trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
logview.py
21
21
import pango
22
22
 
23
23
from bzrlib.osutils import format_date
 
24
from bzrlib.util import bencode
24
25
 
25
26
 
26
27
class LogView(gtk.ScrolledWindow):
46
47
 
47
48
        if revision is not None:
48
49
            self.set_revision(revision, tags=tags)
 
50
        self.set_file_id(None)
49
51
 
50
52
    def set_show_callback(self, callback):
51
53
        self._show_callback = callback
53
55
    def set_go_callback(self, callback):
54
56
        self._go_callback = callback
55
57
 
 
58
    def set_file_id(self, file_id):
 
59
        """Set a specific file id that we want to track.
 
60
 
 
61
        This just effects the display of a per-file commit message.
 
62
        If it is set to None, then all commit messages will be shown.
 
63
        """
 
64
        self._file_id = file_id
 
65
 
56
66
    def set_revision(self, revision, tags=[], children=[]):
57
67
        self._revision = revision
58
68
        self.revision_id.set_text(revision.revision_id)
89
99
        
90
100
        self._add_tags(tags)
91
101
 
 
102
        file_info = revision.properties.get('file-info', None)
 
103
        if file_info is not None:
 
104
            file_info = bencode.bdecode(file_info.encode('UTF-8'))
 
105
 
 
106
        if file_info:
 
107
            if self._file_id is None:
 
108
                text = []
 
109
                for fi in file_info:
 
110
                    text.append('%(path)s\n%(message)s' % fi)
 
111
                self.file_info_buffer.set_text('\n'.join(text))
 
112
                self.file_info_label.set_markup("<b>File Messages:</b>")
 
113
                self.file_info_box.show()
 
114
            else:
 
115
                text = []
 
116
                for fi in file_info:
 
117
                    if fi['file_id'] == self._file_id:
 
118
                        text.append(fi['message'])
 
119
                if text:
 
120
                    self.file_info_buffer.set_text('\n'.join(text))
 
121
                    self.file_info_label.set_markup("<b>File Message:</b>")
 
122
                    self.file_info_box.show()
 
123
                else:
 
124
                    self.file_info_box.hide()
 
125
        else:
 
126
            self.file_info_box.hide()
 
127
 
92
128
    def _show_clicked_cb(self, widget, revid, parentid):
93
129
        """Callback for when the show button for a parent is clicked."""
94
130
        self._show_callback(revid, parentid)
164
200
        if self.show_children:
165
201
            vbox.pack_start(self._create_children(), expand=False, fill=True)
166
202
        vbox.pack_start(self._create_message_view())
 
203
        vbox.pack_start(self._create_file_info_view(), expand=True, fill=True)
167
204
        self.add_with_viewport(vbox)
168
205
        vbox.show()
169
206
 
320
357
        tv.show()
321
358
        return tv
322
359
 
 
360
    def _create_file_info_view(self):
 
361
        self.file_info_box = gtk.VBox()
 
362
        self.file_info_label = gtk.Label()
 
363
        self.file_info_label.set_markup("<b>File Messages:</b>")
 
364
        self.file_info_label.show()
 
365
        self.file_info_buffer = gtk.TextBuffer()
 
366
        tv = gtk.TextView(self.file_info_buffer)
 
367
        tv.set_editable(False)
 
368
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
369
        tv.modify_font(pango.FontDescription("Monospace"))
 
370
        tv.show()
 
371
        self.file_info_box.pack_start(self.file_info_label)
 
372
        self.file_info_box.pack_start(tv)
 
373
        self.file_info_box.hide() # Only shown when there are per-file messages
 
374
        return self.file_info_box
 
375