/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: 2007-03-20 19:36:35 UTC
  • Revision ID: jelmer@samba.org-20070320193635-9fa36baqqfb30de8
Add very simple gmissing command.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
from bzrlib.config import GlobalConfig
26
26
from bzrlib.missing import find_unmerged
27
27
 
28
 
from revisionview import RevisionView
 
28
from logview import LogView
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
 
            rv = RevisionView()
48
 
            rv.set_revision(rev)
49
 
            vbox.pack_start(rv, True, True)
 
47
            vbox.pack_start(LogView(rev), True, True)
50
48
        extra_revs.add_with_viewport(vbox)
51
49
        extra_revs.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
52
50
        return extra_revs
53
51
 
54
52
    def _create(self):
55
53
        self.set_default_size(600, 600)
56
 
        paned = gtk.VPaned()
57
54
 
58
55
        frame = gtk.Frame("You have the following extra revisions:")
59
56
 
61
58
                self.local_branch.repository.get_revisions(
62
59
                    map(lambda (x,y):y, self.local_extra)))
63
60
        frame.add(extra_revs)
64
 
        paned.pack1(frame, resize=True, shrink=False)
 
61
        self.vbox.pack_start(frame, True, True)
65
62
 
66
63
        missing_revs = self._create_revisions_frame(
67
64
                self.remote_branch.repository.get_revisions(
69
66
 
70
67
        frame = gtk.Frame("You are missing following revisions:")
71
68
        frame.add(missing_revs)
72
 
 
73
 
        paned.pack2(frame, resize=False, shrink=True)
74
 
 
75
 
        self.vbox.pack_start(paned, True, True)
 
69
        self.vbox.pack_start(frame, True, True)
76
70
        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()