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

  • Committer: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revbrowser.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
try:
18
 
    import pygtk
19
 
    pygtk.require("2.0")
20
 
except:
21
 
    pass
22
 
 
23
 
import gobject
24
 
import gtk
 
17
from gi.repository import Gtk
25
18
 
26
19
from bzrlib.plugins.gtk.branchview.treeview import TreeView
27
20
from bzrlib.plugins.gtk.i18n import _i18n
28
21
 
29
22
 
30
 
class RevisionBrowser(gtk.Dialog):
 
23
class RevisionBrowser(Gtk.Dialog):
31
24
    """ Revision Browser main window. """
32
25
    def __init__(self, branch, parent=None):
33
 
        gtk.Dialog.__init__(self, title="Revision Browser - Olive",
34
 
                                  parent=parent,
35
 
                                  flags=gtk.DIALOG_MODAL,
36
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
26
        super(RevisionBrowser, self).__init__(
 
27
            title="Revision Browser - Olive", parent=parent,
 
28
            flags=Gtk.DialogFlags.MODAL,
 
29
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
37
30
 
38
31
        # Get arguments
39
32
        self.branch = branch
40
33
 
41
34
        # Create the widgets
42
 
        self._button_select = gtk.Button(_i18n("_Select"), use_underline=True)
 
35
        self._button_select = Gtk.Button(_i18n("_Select"), use_underline=True)
43
36
        start_revs = [branch.last_revision(),]
44
37
        self.treeview = TreeView(branch, start_revs, None)
45
38
 
50
43
 
51
44
        # Set properties
52
45
        self.set_default_size(600, 400)
53
 
        self.vbox.set_spacing(3)
 
46
        self.get_content_area().set_spacing(3)
54
47
        self.treeview.set_property('graph-column-visible', False)
55
48
        self.treeview.set_property('date-column-visible', True)
56
49
        self.treeview.set_property('mainline-only', True)
57
50
 
58
51
        # Construct the dialog
59
 
        self.action_area.pack_end(self._button_select)
 
52
        self.action_area.pack_end(self._button_select, False, False, 0)
60
53
 
61
 
        self.vbox.pack_start(self.treeview, True, True)
 
54
        self.get_content_area().pack_start(self.treeview, True, True, 0)
62
55
 
63
56
        # Show the dialog
64
57
        self.show_all()
74
67
        self.selected_revno = self.treeview.get_property('revision-number')
75
68
        self.selected_revid = \
76
69
                    self.treeview.get_property('revision').revision_id
77
 
        self.response(gtk.RESPONSE_OK)
 
70
        self.response(Gtk.ResponseType.OK)