/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: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

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