/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: 2008-06-29 18:31:29 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183129-syqvz3xm5gqagzsx
https://launchpad.net/bugs/244025
Fix use of smart_add.

Show diffs side-by-side

added added

removed removed

Lines of Context:
missing.py
25
25
from bzrlib.config import GlobalConfig
26
26
from bzrlib.missing import find_unmerged
27
27
 
28
 
from logview import LogView
 
28
from revisionview import RevisionView
29
29
 
30
30
class MissingWindow(gtk.Dialog):
31
31
    """Displays revisions present in one branch but missing in 
44
44
        extra_revs = gtk.ScrolledWindow()
45
45
        vbox = gtk.VBox()
46
46
        for rev in revisions:
47
 
            vbox.pack_start(LogView(rev), True, True)
 
47
            rv = RevisionView()
 
48
            rv.set_revision(rev)
 
49
            vbox.pack_start(rv, True, True)
48
50
        extra_revs.add_with_viewport(vbox)
49
51
        extra_revs.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
50
52
        return extra_revs
51
53
 
52
54
    def _create(self):
53
55
        self.set_default_size(600, 600)
 
56
        paned = gtk.VPaned()
54
57
 
55
58
        frame = gtk.Frame("You have the following extra revisions:")
56
59
 
58
61
                self.local_branch.repository.get_revisions(
59
62
                    map(lambda (x,y):y, self.local_extra)))
60
63
        frame.add(extra_revs)
61
 
        self.vbox.pack_start(frame, True, True)
 
64
        paned.pack1(frame, resize=True, shrink=False)
62
65
 
63
66
        missing_revs = self._create_revisions_frame(
64
67
                self.remote_branch.repository.get_revisions(
66
69
 
67
70
        frame = gtk.Frame("You are missing following revisions:")
68
71
        frame.add(missing_revs)
69
 
        self.vbox.pack_start(frame, True, True)
 
72
 
 
73
        paned.pack2(frame, resize=False, shrink=True)
 
74
 
 
75
        self.vbox.pack_start(paned, True, True)
70
76
        self.vbox.show_all()
71
 
 
72
 
    def display(self):
73
 
        self.window.show_all()
74
 
 
75
 
    def close(self, widget=None):
76
 
        self.window.destroy()