/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 missing.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:
missing.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 gtk
 
17
from gi.repository import Gtk
24
18
 
25
19
from bzrlib.missing import find_unmerged
26
20
 
27
21
from bzrlib.plugins.gtk.revisionview import RevisionView
28
22
 
29
23
 
30
 
class MissingWindow(gtk.Dialog):
 
24
class MissingWindow(Gtk.Dialog):
31
25
    """Displays revisions present in one branch but missing in 
32
26
    another."""
33
27
    def __init__(self, local_branch, remote_branch):
34
28
        """ Initialize the Status window. """
35
 
        super(MissingWindow, self).__init__(flags=gtk.DIALOG_MODAL)
 
29
        super(MissingWindow, self).__init__(flags=Gtk.DialogFlags.MODAL)
36
30
        self.set_title("Missing Revisions")
37
31
        self.local_branch = local_branch
38
32
        self.remote_branch = remote_branch
41
35
        self._create()
42
36
 
43
37
    def _create_revisions_frame(self, revisions):
44
 
        extra_revs = gtk.ScrolledWindow()
45
 
        vbox = gtk.VBox()
 
38
        extra_revs = Gtk.ScrolledWindow()
 
39
        vbox = Gtk.VBox()
46
40
        for rev in revisions:
47
41
            rv = RevisionView()
48
42
            rv.set_revision(rev)
49
 
            vbox.pack_start(rv, True, True)
 
43
            vbox.pack_start(rv, True, True, 0)
50
44
        extra_revs.add_with_viewport(vbox)
51
 
        extra_revs.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
45
        extra_revs.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
52
46
        return extra_revs
53
47
 
54
48
    def _create(self):
55
49
        self.set_default_size(600, 600)
56
 
        paned = gtk.VPaned()
 
50
        paned = Gtk.VPaned()
57
51
 
58
 
        frame = gtk.Frame("You have the following extra revisions:")
 
52
        frame = Gtk.Frame(label="You have the following extra revisions:")
59
53
 
60
54
        extra_revs = self._create_revisions_frame(
61
55
                self.local_branch.repository.get_revisions(
67
61
                self.remote_branch.repository.get_revisions(
68
62
                    map(lambda (x,y):y, self.remote_extra)))
69
63
 
70
 
        frame = gtk.Frame("You are missing following revisions:")
 
64
        frame = Gtk.Frame(label="You are missing following revisions:")
71
65
        frame.add(missing_revs)
72
66
 
73
67
        paned.pack2(frame, resize=False, shrink=True)
74
68
 
75
 
        self.vbox.pack_start(paned, True, True)
76
 
        self.vbox.show_all()
 
69
        self.get_content_area().pack_start(paned, True, True, 0)
 
70
        self.get_content_area().show_all()