/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: John Arbash Meinel
  • Date: 2007-04-19 21:30:38 UTC
  • mto: This revision was merged to the branch mainline in revision 195.
  • Revision ID: john@arbash-meinel.com-20070419213038-80g223n0050jmphn
Update code to properly handle loading failures.
And do more searching to find the glade and .ui files.
In 'olive-gtk' the '_' function was not defined, so it would die when
trying to report startup failures.
In 'olive/guifiles.py' it now searches around for olive.glade
rather than only looking in 2 places. Once it finds olive.glade,
it assumes that cmenu.ui will be nearby.

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 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, scroll=False), 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
74
72
 
75
73
        self.vbox.pack_start(paned, True, True)
76
74
        self.vbox.show_all()
 
75
 
 
76
    def display(self):
 
77
        self.window.show_all()
 
78
 
 
79
    def close(self, widget=None):
 
80
        self.window.destroy()