/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 annotate/gannotate.py

  • Committer: Curtis Hovey
  • Date: 2011-08-29 14:12:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110829141230-6nv7h0oxjrojb1y1
Updated hacking doc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
annotate/gannotate.py
27
27
from bzrlib.revision import NULL_REVISION, CURRENT_REVISION
28
28
 
29
29
from bzrlib.plugins.gtk.annotate.colormap import AnnotateColorSaturation
30
 
from bzrlib.plugins.gtk.i18n import _i18n
31
30
from bzrlib.plugins.gtk.revisionview import RevisionView
32
31
from bzrlib.plugins.gtk.window import Window
33
32
 
50
49
        self.plain = plain
51
50
        self._branch = branch
52
51
 
53
 
        super(GAnnotateWindow, self).__init__(parent=parent)
 
52
        Window.__init__(self, parent)
54
53
 
55
54
        self.set_icon(
56
55
            self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON))
134
133
        self.annoview.set_cursor(tree_path, None, False)
135
134
        self.annoview.scroll_to_cell(tree_path, use_align=True)
136
135
 
 
136
 
137
137
    def _annotate(self, tree, file_id):
138
138
        current_revision = FakeRevision(CURRENT_REVISION)
139
139
        current_revision.committer = self.branch.get_config().username()
221
221
        hbox.show()
222
222
        vbox.pack_start(hbox, False, True, 0)
223
223
 
224
 
        self.pane = pane = Gtk.Paned.new(Gtk.Orientation.VERTICAL)
 
224
        self.pane = pane = Gtk.VPaned()
225
225
        pane.add1(swbox)
226
226
        pane.add2(self.revisionview)
227
227
        pane.show()
279
279
        cell.set_property("xalign", 1.0)
280
280
        cell.set_property("ypad", 0)
281
281
        cell.set_property("family", "Monospace")
282
 
        cell.set_property(
283
 
            "cell-background-rgba",
284
 
            tv.get_style_context().get_background_color(Gtk.StateType.NORMAL))
 
282
        cell.set_property("cell-background-gdk",
 
283
                          tv.get_style().bg[Gtk.StateType.NORMAL])
285
284
        col = Gtk.TreeViewColumn()
286
285
        col.set_resizable(False)
287
286
        col.pack_start(cell, True)
288
287
        col.add_attribute(cell, "text", LINE_NUM_COL)
289
288
        tv.append_column(col)
290
289
 
291
 
        style_context = self.get_style_context()
292
 
 
293
290
        cell = Gtk.CellRendererText()
294
291
        cell.set_property("ypad", 0)
295
292
        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
296
 
        cell.set_property(
297
 
            "cell-background-rgba",
298
 
            style_context.get_background_color(Gtk.StateType.NORMAL))
 
293
        cell.set_property("cell-background-gdk",
 
294
                          self.get_style().bg[Gtk.StateType.NORMAL])
299
295
        col = Gtk.TreeViewColumn("Committer")
300
296
        col.set_resizable(True)
301
297
        col.pack_start(cell, True)
305
301
        cell = Gtk.CellRendererText()
306
302
        cell.set_property("xalign", 1.0)
307
303
        cell.set_property("ypad", 0)
308
 
        cell.set_property(
309
 
            "cell-background-rgba",
310
 
            style_context.get_background_color(Gtk.StateType.NORMAL))
 
304
        cell.set_property("cell-background-gdk",
 
305
                          self.get_style().bg[Gtk.StateType.NORMAL])
311
306
        col = Gtk.TreeViewColumn("Revno")
312
307
        col.set_resizable(False)
313
308
        col.pack_start(cell, True)
462
457
            self.__cache[revision_id] = revision
463
458
        return self.__cache[revision_id]
464
459
 
465
 
 
466
460
class SearchBox(Gtk.HBox):
467
461
    """A button box for searching in text or lines of annotations"""
468
462
    def __init__(self):
469
 
        super(SearchBox, self).__init__(homogeneous=False, spacing=6)
 
463
        Gtk.HBox.__init__(self, homogeneous=False, spacing=6)
470
464
 
471
465
        # Close button
472
466
        button = Gtk.Button()
489
483
        self.pack_start(entry, False, False, 0)
490
484
 
491
485
        # Next/previous buttons
492
 
        button = Gtk.Button(_i18n('_Next'), use_underline=True)
 
486
        button = Gtk.Button('_Next')
493
487
        image = Gtk.Image()
494
488
        image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
495
489
        button.set_image(image)
497
491
                       'forward')
498
492
        self.pack_start(button, False, False, 0)
499
493
 
500
 
        button = Gtk.Button(_i18n('_Previous'), use_underline=True)
 
494
        button = Gtk.Button('_Previous')
501
495
        image = Gtk.Image()
502
496
        image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
503
497
        button.set_image(image)