/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionview.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
import pygtk
19
 
pygtk.require("2.0")
20
 
import gtk
21
 
import pango
22
 
import gobject
 
18
from gi.repository import Gtk
 
19
from gi.repository import Pango
 
20
from gi.repository import GObject
23
21
import webbrowser
24
22
 
25
23
from bzrlib import trace
26
24
from bzrlib.osutils import format_date
27
 
from bzrlib.util.bencode import bdecode
 
25
from bzrlib.bencode import bdecode
28
26
from bzrlib.testament import Testament
29
27
 
30
28
from bzrlib.plugins.gtk import icon_path
31
29
 
 
30
from bzrlib.plugins.gtk.avatarsbox import AvatarsBox
 
31
 
32
32
try:
33
33
    from bzrlib.plugins.gtk import seahorse
34
34
except ImportError:
48
48
            webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
49
49
    webbrowser.open(uri)
50
50
 
51
 
gtk.link_button_set_uri_hook(_open_link)
52
51
 
53
 
class BugsTab(gtk.VBox):
 
52
class BugsTab(Gtk.VBox):
54
53
 
55
54
    def __init__(self):
56
 
        super(BugsTab, self).__init__(False, 6)
57
 
    
58
 
        table = gtk.Table(rows=2, columns=2)
 
55
        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
 
56
 
 
57
        table = Gtk.Table(rows=2, columns=2)
59
58
 
60
59
        table.set_row_spacings(6)
61
60
        table.set_col_spacing(0, 16)
62
61
 
63
 
        image = gtk.Image()
 
62
        image = Gtk.Image()
64
63
        image.set_from_file(icon_path("bug.png"))
65
 
        table.attach(image, 0, 1, 0, 1, gtk.FILL)
 
64
        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
66
65
 
67
 
        align = gtk.Alignment(0.0, 0.1)
68
 
        self.label = gtk.Label()
 
66
        align = Gtk.Alignment.new(0.0, 0.1, 0, 0)
 
67
        self.label = Gtk.Label()
69
68
        align.add(self.label)
70
 
        table.attach(align, 1, 2, 0, 1, gtk.FILL)
 
69
        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
71
70
 
72
71
        treeview = self.construct_treeview()
73
 
        table.attach(treeview, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND)
 
72
        table.attach(treeview, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND)
74
73
 
75
74
        self.set_border_width(6)
76
 
        self.pack_start(table, expand=False)
 
75
        self.pack_start(table, False, True, 0)
77
76
 
78
77
        self.clear()
79
78
        self.show_all()
88
87
                (url, status) = bugline.split(" ")
89
88
                if status == "fixed":
90
89
                    self.add_bug(url, status)
91
 
        
 
90
 
92
91
        if self.num_bugs == 0:
93
92
            return
94
93
        elif self.num_bugs == 1:
101
100
                              "%d %s." % (self.num_bugs, label))
102
101
 
103
102
    def construct_treeview(self):
104
 
        self.bugs = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
105
 
        self.treeview = gtk.TreeView(self.bugs)
 
103
        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
 
104
        self.treeview = Gtk.TreeView(model=self.bugs)
106
105
        self.treeview.set_headers_visible(False)
107
106
 
108
 
        uri_column = gtk.TreeViewColumn('Bug URI', gtk.CellRendererText(), text=0)
 
107
        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
109
108
        self.treeview.append_column(uri_column)
110
109
 
111
110
        self.treeview.connect('row-activated', self.on_row_activated)
112
111
 
113
 
        win = gtk.ScrolledWindow()
114
 
        win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
115
 
        win.set_shadow_type(gtk.SHADOW_IN)
 
112
        win = Gtk.ScrolledWindow()
 
113
        win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
114
        win.set_shadow_type(Gtk.ShadowType.IN)
116
115
        win.add(self.treeview)
117
116
 
118
117
        return win
137
136
        _open_link(self, uri)
138
137
 
139
138
 
140
 
class SignatureTab(gtk.VBox):
 
139
class SignatureTab(Gtk.VBox):
141
140
 
142
141
    def __init__(self, repository):
143
142
        self.key = None
144
143
        self.revision = None
145
144
        self.repository = repository
146
145
 
147
 
        super(SignatureTab, self).__init__(False, 6)
148
 
        signature_box = gtk.Table(rows=3, columns=3)
 
146
        super(SignatureTab, self).__init__(homogeneous=False, spacing=6)
 
147
        signature_box = Gtk.Table(rows=3, columns=3)
149
148
        signature_box.set_col_spacing(0, 16)
150
149
        signature_box.set_col_spacing(1, 12)
151
150
        signature_box.set_row_spacings(6)
152
151
 
153
 
        self.signature_image = gtk.Image()
154
 
        signature_box.attach(self.signature_image, 0, 1, 0, 1, gtk.FILL)
 
152
        self.signature_image = Gtk.Image()
 
153
        signature_box.attach(self.signature_image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
155
154
 
156
 
        align = gtk.Alignment(0.0, 0.1)
157
 
        self.signature_label = gtk.Label()
 
155
        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
 
156
        self.signature_label = Gtk.Label()
158
157
        align.add(self.signature_label)
159
 
        signature_box.attach(align, 1, 3, 0, 1, gtk.FILL)
 
158
        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
160
159
 
161
 
        align = gtk.Alignment(0.0, 0.5)
162
 
        self.signature_key_id_label = gtk.Label()
 
160
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
161
        self.signature_key_id_label = Gtk.Label()
163
162
        self.signature_key_id_label.set_markup("<b>Key Id:</b>")
164
163
        align.add(self.signature_key_id_label)
165
 
        signature_box.attach(align, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
 
164
        signature_box.attach(align, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
166
165
 
167
 
        align = gtk.Alignment(0.0, 0.5)
168
 
        self.signature_key_id = gtk.Label()
 
166
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
167
        self.signature_key_id = Gtk.Label()
169
168
        self.signature_key_id.set_selectable(True)
170
169
        align.add(self.signature_key_id)
171
 
        signature_box.attach(align, 2, 3, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
170
        signature_box.attach(align, 2, 3, 1, 2, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
172
171
 
173
 
        align = gtk.Alignment(0.0, 0.5)
174
 
        self.signature_fingerprint_label = gtk.Label()
 
172
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
173
        self.signature_fingerprint_label = Gtk.Label()
175
174
        self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
176
175
        align.add(self.signature_fingerprint_label)
177
 
        signature_box.attach(align, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
 
176
        signature_box.attach(align, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
178
177
 
179
 
        align = gtk.Alignment(0.0, 0.5)
180
 
        self.signature_fingerprint = gtk.Label()
 
178
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
179
        self.signature_fingerprint = Gtk.Label()
181
180
        self.signature_fingerprint.set_selectable(True)
182
181
        align.add(self.signature_fingerprint)
183
 
        signature_box.attach(align, 2, 3, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
182
        signature_box.attach(align, 2, 3, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
184
183
 
185
 
        align = gtk.Alignment(0.0, 0.5)
186
 
        self.signature_trust_label = gtk.Label()
 
184
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
185
        self.signature_trust_label = Gtk.Label()
187
186
        self.signature_trust_label.set_markup("<b>Trust:</b>")
188
187
        align.add(self.signature_trust_label)
189
 
        signature_box.attach(align, 1, 2, 3, 4, gtk.FILL, gtk.FILL)
 
188
        signature_box.attach(align, 1, 2, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
190
189
 
191
 
        align = gtk.Alignment(0.0, 0.5)
192
 
        self.signature_trust = gtk.Label()
 
190
        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
 
191
        self.signature_trust = Gtk.Label()
193
192
        self.signature_trust.set_selectable(True)
194
193
        align.add(self.signature_trust)
195
 
        signature_box.attach(align, 2, 3, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
194
        signature_box.attach(align, 2, 3, 3, 4, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
196
195
 
197
196
        self.set_border_width(6)
198
 
        self.pack_start(signature_box, expand=False)
 
197
        self.pack_start(signature_box, False, True, 0)
199
198
        self.show_all()
200
199
 
201
200
    def set_revision(self, revision):
285
284
        self.signature_trust.set_text('This key is ' + trust_text)
286
285
 
287
286
 
288
 
class RevisionView(gtk.Notebook):
 
287
class RevisionView(Gtk.Notebook):
289
288
    """ Custom widget for commit log details.
290
289
 
291
290
    A variety of bzr tools may need to implement such a thing. This is a
294
293
 
295
294
    __gproperties__ = {
296
295
        'branch': (
297
 
            gobject.TYPE_PYOBJECT,
 
296
            GObject.TYPE_PYOBJECT,
298
297
            'Branch',
299
298
            'The branch holding the revision being displayed',
300
 
            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
 
299
            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
301
300
        ),
302
301
 
303
302
        'revision': (
304
 
            gobject.TYPE_PYOBJECT,
 
303
            GObject.TYPE_PYOBJECT,
305
304
            'Revision',
306
305
            'The revision being displayed',
307
 
            gobject.PARAM_READWRITE
 
306
            GObject.PARAM_READWRITE
308
307
        ),
309
308
 
310
309
        'children': (
311
 
            gobject.TYPE_PYOBJECT,
 
310
            GObject.TYPE_PYOBJECT,
312
311
            'Children',
313
312
            'Child revisions',
314
 
            gobject.PARAM_READWRITE
 
313
            GObject.PARAM_READWRITE
315
314
        ),
316
315
 
317
316
        'file-id': (
318
 
            gobject.TYPE_PYOBJECT,
 
317
            GObject.TYPE_PYOBJECT,
319
318
            'File Id',
320
319
            'The file id',
321
 
            gobject.PARAM_READWRITE
 
320
            GObject.PARAM_READWRITE
322
321
        )
323
322
    }
324
323
 
325
324
    def __init__(self, branch=None, repository=None):
326
 
        gtk.Notebook.__init__(self)
 
325
        super(RevisionView, self).__init__()
327
326
 
328
327
        self._revision = None
329
328
        self._branch = branch
331
330
            self._repository = branch.repository
332
331
        else:
333
332
            self._repository = repository
 
333
        self.signature_table = None
334
334
 
335
335
        self._create_general()
336
336
        self._create_relations()
397
397
 
398
398
    def _set_revision(self, revision):
399
399
        if revision is None: return
400
 
 
 
400
        
 
401
        self.avatarsbox.reset()
 
402
        
401
403
        self._revision = revision
402
404
        if revision.committer is not None:
403
405
            self.committer.set_text(revision.committer)
 
406
            self.avatarsbox.add(revision.committer, "committer")
404
407
        else:
405
408
            self.committer.set_text("")
 
409
            self.avatarsbox.hide()
406
410
        author = revision.properties.get('author', '')
 
411
        self.avatarsbox.merge(revision.get_apparent_authors(), "author")
407
412
        if author != '':
408
413
            self.author.set_text(author)
409
414
            self.author.show()
465
470
        self._add_tags()
466
471
 
467
472
    def _update_signature(self, widget, param):
 
473
        if not has_seahorse:
 
474
            return
468
475
        if self.get_current_page() == PAGE_SIGNATURE:
469
476
            self.signature_table.set_revision(self._revision)
470
477
 
479
486
                                      self.children_table)
480
487
 
481
488
    def _switch_page_cb(self, notebook, page, page_num):
 
489
        if not has_seahorse:
 
490
            return
482
491
        if page_num == PAGE_SIGNATURE:
483
492
            self.signature_table.set_revision(self._revision)
484
493
 
518
527
        table.resize(max(len(revids), 1), 2)
519
528
 
520
529
        for idx, revid in enumerate(revids):
521
 
            align = gtk.Alignment(0.0, 0.0, 1, 1)
 
530
            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
522
531
            widgets.append(align)
523
532
            table.attach(align, 1, 2, idx, idx + 1,
524
 
                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
 
533
                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
525
534
            align.show()
526
535
 
527
 
            hbox = gtk.HBox(False, spacing=6)
 
536
            hbox = Gtk.HBox(homogeneous=False, spacing=6)
528
537
            align.add(hbox)
529
538
            hbox.show()
530
539
 
531
 
            image = gtk.Image()
 
540
            image = Gtk.Image()
532
541
            image.set_from_stock(
533
 
                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
 
542
                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
534
543
            image.show()
535
544
 
536
545
            if self._show_callback is not None:
537
 
                button = gtk.Button()
 
546
                button = Gtk.Button()
538
547
                button.add(image)
539
548
                button.connect("clicked", self._show_clicked_cb,
540
549
                               self._revision.revision_id, revid)
541
 
                hbox.pack_start(button, expand=False, fill=True)
 
550
                hbox.pack_start(button, False, True, 0)
542
551
                button.show()
543
552
 
544
 
            button = gtk.Button()
545
 
            revid_label = gtk.Label(str(revid))
546
 
            revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
553
            button = Gtk.Button()
 
554
            revid_label = Gtk.Label(label=str(revid))
 
555
            revid_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
547
556
            revid_label.set_alignment(0.0, 0.5)
548
557
            button.add(revid_label)
549
558
            button.connect("clicked",
550
 
                    lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
 
559
                    lambda w, r: self.set_revision(
 
560
                        self._repository.get_revision(r)), revid)
551
561
            button.set_use_underline(False)
552
 
            hbox.pack_start(button, expand=True, fill=True)
 
562
            hbox.pack_start(button, True, True, 0)
553
563
            button.show_all()
554
564
 
555
565
    def _create_general(self):
556
 
        vbox = gtk.VBox(False, 6)
 
566
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
557
567
        vbox.set_border_width(6)
558
 
        vbox.pack_start(self._create_headers(), expand=False, fill=True)
559
 
        vbox.pack_start(self._create_message_view())
560
 
        self.append_page(vbox, tab_label=gtk.Label("General"))
 
568
        vbox.pack_start(self._create_headers(), False, True, 0)
 
569
        vbox.pack_start(self._create_message_view(), True, True, 0)
 
570
        self.append_page(vbox, Gtk.Label(label="General"))
561
571
        vbox.show()
562
572
 
563
573
    def _create_relations(self):
564
 
        vbox = gtk.VBox(False, 6)
 
574
        vbox = Gtk.VBox(homogeneous=False, spacing=6)
565
575
        vbox.set_border_width(6)
566
 
        vbox.pack_start(self._create_parents(), expand=False, fill=True)
567
 
        vbox.pack_start(self._create_children(), expand=False, fill=True)
568
 
        self.append_page(vbox, tab_label=gtk.Label("Relations"))
 
576
        vbox.pack_start(self._create_parents(), False, True, 0)
 
577
        vbox.pack_start(self._create_children(), False, True, 0)
 
578
        self.append_page(vbox, Gtk.Label(label="Relations"))
569
579
        vbox.show()
570
580
 
571
581
    def _create_signature(self):
572
582
        self.signature_table = SignatureTab(self._repository)
573
 
        self.append_page(self.signature_table, tab_label=gtk.Label('Signature'))
 
583
        self.append_page(
 
584
            self.signature_table, Gtk.Label(label='Signature'))
574
585
        self.connect_after('notify::revision', self._update_signature)
575
586
 
576
587
    def _create_headers(self):
577
 
        self.table = gtk.Table(rows=5, columns=2)
 
588
        self.avatarsbox = AvatarsBox()
 
589
        
 
590
        self.table = Gtk.Table(rows=5, columns=2)
578
591
        self.table.set_row_spacings(6)
579
592
        self.table.set_col_spacings(6)
580
593
        self.table.show()
 
594
        
 
595
        self.avatarsbox.pack_start(self.table, True, True, 0)
 
596
        self.avatarsbox.show()
581
597
 
582
598
        row = 0
583
599
 
584
 
        label = gtk.Label()
 
600
        label = Gtk.Label()
585
601
        label.set_alignment(1.0, 0.5)
586
602
        label.set_markup("<b>Revision Id:</b>")
587
 
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
603
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
588
604
        label.show()
589
605
 
590
 
        revision_id = gtk.Label()
591
 
        revision_id.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
606
        revision_id = Gtk.Label()
 
607
        revision_id.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
592
608
        revision_id.set_alignment(0.0, 0.5)
593
609
        revision_id.set_selectable(True)
594
610
        self.connect('notify::revision', 
595
611
                lambda w, p: revision_id.set_text(self._revision.revision_id))
596
 
        self.table.attach(revision_id, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
612
        self.table.attach(revision_id, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
597
613
        revision_id.show()
598
614
 
599
615
        row += 1
600
 
        self.author_label = gtk.Label()
 
616
        self.author_label = Gtk.Label()
601
617
        self.author_label.set_alignment(1.0, 0.5)
602
618
        self.author_label.set_markup("<b>Author:</b>")
603
 
        self.table.attach(self.author_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
619
        self.table.attach(self.author_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
604
620
        self.author_label.show()
605
621
 
606
 
        self.author = gtk.Label()
607
 
        self.author.set_ellipsize(pango.ELLIPSIZE_END)
 
622
        self.author = Gtk.Label()
 
623
        self.author.set_ellipsize(Pango.EllipsizeMode.END)
608
624
        self.author.set_alignment(0.0, 0.5)
609
625
        self.author.set_selectable(True)
610
 
        self.table.attach(self.author, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
626
        self.table.attach(self.author, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
611
627
        self.author.show()
612
628
        self.author.hide()
613
629
 
614
630
        row += 1
615
 
        label = gtk.Label()
 
631
        label = Gtk.Label()
616
632
        label.set_alignment(1.0, 0.5)
617
633
        label.set_markup("<b>Committer:</b>")
618
 
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
634
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
619
635
        label.show()
620
636
 
621
 
        self.committer = gtk.Label()
622
 
        self.committer.set_ellipsize(pango.ELLIPSIZE_END)
 
637
        self.committer = Gtk.Label()
 
638
        self.committer.set_ellipsize(Pango.EllipsizeMode.END)
623
639
        self.committer.set_alignment(0.0, 0.5)
624
640
        self.committer.set_selectable(True)
625
 
        self.table.attach(self.committer, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
641
        self.table.attach(self.committer, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
626
642
        self.committer.show()
627
643
 
628
644
        row += 1
629
 
        self.branchnick_label = gtk.Label()
 
645
        self.branchnick_label = Gtk.Label()
630
646
        self.branchnick_label.set_alignment(1.0, 0.5)
631
647
        self.branchnick_label.set_markup("<b>Branch nick:</b>")
632
 
        self.table.attach(self.branchnick_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
648
        self.table.attach(self.branchnick_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
633
649
        self.branchnick_label.show()
634
650
 
635
 
        self.branchnick = gtk.Label()
636
 
        self.branchnick.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
651
        self.branchnick = Gtk.Label()
 
652
        self.branchnick.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
637
653
        self.branchnick.set_alignment(0.0, 0.5)
638
654
        self.branchnick.set_selectable(True)
639
 
        self.table.attach(self.branchnick, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
655
        self.table.attach(self.branchnick, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
640
656
        self.branchnick.show()
641
657
 
642
658
        row += 1
643
 
        label = gtk.Label()
 
659
        label = Gtk.Label()
644
660
        label.set_alignment(1.0, 0.5)
645
661
        label.set_markup("<b>Timestamp:</b>")
646
 
        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
662
        self.table.attach(label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
647
663
        label.show()
648
664
 
649
 
        self.timestamp = gtk.Label()
650
 
        self.timestamp.set_ellipsize(pango.ELLIPSIZE_END)
 
665
        self.timestamp = Gtk.Label()
 
666
        self.timestamp.set_ellipsize(Pango.EllipsizeMode.END)
651
667
        self.timestamp.set_alignment(0.0, 0.5)
652
668
        self.timestamp.set_selectable(True)
653
 
        self.table.attach(self.timestamp, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
669
        self.table.attach(self.timestamp, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
654
670
        self.timestamp.show()
655
671
 
656
672
        row += 1
657
 
        self.tags_label = gtk.Label()
 
673
        self.tags_label = Gtk.Label()
658
674
        self.tags_label.set_alignment(1.0, 0.5)
659
675
        self.tags_label.set_markup("<b>Tags:</b>")
660
 
        self.table.attach(self.tags_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
 
676
        self.table.attach(self.tags_label, 0, 1, row, row+1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
661
677
        self.tags_label.show()
662
678
 
663
 
        self.tags_list = gtk.Label()
664
 
        self.tags_list.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
 
679
        self.tags_list = Gtk.Label()
 
680
        self.tags_list.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
665
681
        self.tags_list.set_alignment(0.0, 0.5)
666
 
        self.table.attach(self.tags_list, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
 
682
        self.table.attach(self.tags_list, 1, 2, row, row+1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
667
683
        self.tags_list.show()
668
684
 
669
685
        self.connect('notify::revision', self._add_tags)
670
686
 
671
 
        return self.table
 
687
        return self.avatarsbox
672
688
    
673
689
    def _create_parents(self):
674
 
        hbox = gtk.HBox(True, 3)
 
690
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
675
691
        
676
692
        self.parents_table = self._create_parents_or_children_table(
677
693
            "<b>Parents:</b>")
678
694
        self.parents_widgets = []
679
 
        hbox.pack_start(self.parents_table)
 
695
        hbox.pack_start(self.parents_table, True, True, 0)
680
696
 
681
697
        hbox.show()
682
698
        return hbox
683
699
 
684
700
    def _create_children(self):
685
 
        hbox = gtk.HBox(True, 3)
 
701
        hbox = Gtk.HBox(homogeneous=True, spacing=3)
686
702
        self.children_table = self._create_parents_or_children_table(
687
703
            "<b>Children:</b>")
688
704
        self.children_widgets = []
689
 
        hbox.pack_start(self.children_table)
 
705
        hbox.pack_start(self.children_table, True, True, 0)
690
706
        hbox.show()
691
707
        return hbox
692
708
        
693
709
    def _create_parents_or_children_table(self, text):
694
 
        table = gtk.Table(rows=1, columns=2)
 
710
        table = Gtk.Table(rows=1, columns=2)
695
711
        table.set_row_spacings(3)
696
712
        table.set_col_spacings(6)
697
713
        table.show()
698
714
 
699
 
        label = gtk.Label()
 
715
        label = Gtk.Label()
700
716
        label.set_markup(text)
701
 
        align = gtk.Alignment(0.0, 0.5)
 
717
        align = Gtk.Alignment.new(0.0, 0.5, 0, 0)
702
718
        align.add(label)
703
 
        table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
 
719
        table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
704
720
        label.show()
705
721
        align.show()
706
722
 
707
723
        return table
708
724
 
709
725
    def _create_message_view(self):
710
 
        msg_buffer = gtk.TextBuffer()
 
726
        msg_buffer = Gtk.TextBuffer()
711
727
        self.connect('notify::revision',
712
728
                lambda w, p: msg_buffer.set_text(self._revision.message))
713
 
        window = gtk.ScrolledWindow()
714
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
715
 
        window.set_shadow_type(gtk.SHADOW_IN)
716
 
        tv = gtk.TextView(msg_buffer)
 
729
        window = Gtk.ScrolledWindow()
 
730
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
731
        window.set_shadow_type(Gtk.ShadowType.IN)
 
732
        tv = Gtk.TextView(buffer=msg_buffer)
717
733
        tv.set_editable(False)
718
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
 
734
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
719
735
 
720
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
736
        tv.modify_font(Pango.FontDescription("Monospace"))
721
737
        tv.show()
722
738
        window.add(tv)
723
739
        window.show()
726
742
    def _create_bugs(self):
727
743
        self.bugs_page = BugsTab()
728
744
        self.connect_after('notify::revision', self._update_bugs) 
729
 
        self.append_page(self.bugs_page, tab_label=gtk.Label('Bugs'))
 
745
        self.append_page(self.bugs_page, Gtk.Label(label='Bugs'))
730
746
 
731
747
    def _create_file_info_view(self):
732
 
        self.file_info_box = gtk.VBox(False, 6)
 
748
        self.file_info_box = Gtk.VBox(homogeneous=False, spacing=6)
733
749
        self.file_info_box.set_border_width(6)
734
 
        self.file_info_buffer = gtk.TextBuffer()
735
 
        window = gtk.ScrolledWindow()
736
 
        window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
737
 
        window.set_shadow_type(gtk.SHADOW_IN)
738
 
        tv = gtk.TextView(self.file_info_buffer)
 
750
        self.file_info_buffer = Gtk.TextBuffer()
 
751
        window = Gtk.ScrolledWindow()
 
752
        window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
 
753
        window.set_shadow_type(Gtk.ShadowType.IN)
 
754
        tv = Gtk.TextView(buffer=self.file_info_buffer)
739
755
        tv.set_editable(False)
740
 
        tv.set_wrap_mode(gtk.WRAP_WORD)
741
 
        tv.modify_font(pango.FontDescription("Monospace"))
 
756
        tv.set_wrap_mode(Gtk.WrapMode.WORD)
 
757
        tv.modify_font(Pango.FontDescription("Monospace"))
742
758
        tv.show()
743
759
        window.add(tv)
744
760
        window.show()
745
 
        self.file_info_box.pack_start(window)
 
761
        self.file_info_box.pack_start(window, True, True, 0)
746
762
        self.file_info_box.hide() # Only shown when there are per-file messages
747
 
        self.append_page(self.file_info_box, tab_label=gtk.Label('Per-file'))
 
763
        self.append_page(self.file_info_box, Gtk.Label(label='Per-file'))
748
764