/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 revisionmenu.py

  • Committer: Curtis Hovey
  • Date: 2011-09-05 03:44:26 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110905034426-p98pxnay9rmzkr99
Fix the initializer for many classes.
Replace Gtk.Dialog.vbox with .get_content_area().

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionmenu.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
"""Simple popup menu for revisions."""
17
17
 
18
 
try:
19
 
    import pygtk
20
 
    pygtk.require("2.0")
21
 
except:
22
 
    pass
23
 
 
24
 
import bzrlib
25
 
import gtk
26
 
 
27
 
class RevisionPopupMenu(gtk.Menu):
28
 
    def __init__(self, repository, revids, branch=None):
29
 
        super(RevisionPopupMenu, self).__init__()
 
18
from gi.repository import Gtk
 
19
from gi.repository import GObject
 
20
from bzrlib import ui
 
21
from bzrlib.revision import NULL_REVISION
 
22
 
 
23
class RevisionMenu(Gtk.Menu):
 
24
 
 
25
    __gsignals__ = {
 
26
            'tag-added': (
 
27
                GObject.SignalFlags.RUN_FIRST,
 
28
                None,
 
29
                (GObject.TYPE_STRING, GObject.TYPE_STRING)
 
30
            )
 
31
    }
 
32
 
 
33
    def __init__(self, repository, revids, branch=None, wt=None, parent=None):
 
34
        super(RevisionMenu, self).__init__()
 
35
        self._parent = parent
30
36
        self.branch = branch
31
37
        self.repository = repository
 
38
        self.wt = wt
 
39
        self.set_revision_ids(revids)
 
40
 
 
41
    def set_revision_ids(self, revids):
 
42
        assert isinstance(revids, list)
 
43
        for c in self.get_children():
 
44
            self.remove(c)
32
45
        self.revids = revids
33
46
        self.create_items()
34
47
 
35
48
    def create_items(self):
36
49
        if len(self.revids) == 1:
37
 
            item = gtk.MenuItem("View _Diff")
 
50
            item = Gtk.MenuItem.new_with_mnemonic("View _Changes")
38
51
            item.connect('activate', self.show_diff)
39
52
            self.append(item)
40
 
            self.show_all()
41
53
 
42
 
            item = gtk.MenuItem("_Push")
 
54
            item = Gtk.MenuItem.new_with_mnemonic("_Push")
43
55
            item.connect('activate', self.show_push)
44
56
            self.append(item)
45
 
            self.show_all()
46
57
 
47
 
            item = gtk.MenuItem("_Tag Revision")
 
58
            item = Gtk.MenuItem.new_with_mnemonic("_Tag Revision")
48
59
            item.connect('activate', self.show_tag)
49
60
            self.append(item)
50
 
            self.show_all()
51
61
 
52
 
            item = gtk.MenuItem("_Merge Directive")
 
62
            item = Gtk.MenuItem.new_with_mnemonic("_Merge Directive")
53
63
            item.connect('activate', self.store_merge_directive)
 
64
            # FIXME: self.append(item)
 
65
 
 
66
            item = Gtk.MenuItem.new_with_mnemonic("_Send Merge Directive")
 
67
            item.connect('activate', self.send_merge_directive)
54
68
            self.append(item)
55
 
            self.show_all()
 
69
 
 
70
            if self.wt:
 
71
                item = Gtk.MenuItem.new_with_mnemonic(
 
72
                    "_Revert to this revision")
 
73
                item.connect('activate', self.revert)
 
74
                self.append(item)
 
75
 
 
76
        self.show_all()
56
77
 
57
78
    def store_merge_directive(self, item):
58
79
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
59
80
        window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
60
81
        window.show()
61
82
 
 
83
    def send_merge_directive(self, item):
 
84
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
 
85
        from cStringIO import StringIO
 
86
        window = SendMergeDirectiveDialog(self.branch, self.revids[0])
 
87
        if window.run() == Gtk.ResponseType.OK:
 
88
            outf = StringIO()
 
89
            outf.writelines(window.get_merge_directive().to_lines())
 
90
            mail_client = self.branch.get_config().get_mail_client()
 
91
            mail_client.compose_merge_request(window.get_mail_to(), "[MERGE]",
 
92
                                              outf.getvalue())
 
93
        window.destroy()
 
94
 
62
95
    def show_diff(self, item):
63
96
        from bzrlib.plugins.gtk.diff import DiffWindow
64
 
        window = DiffWindow()
65
 
        parentid = self.repository.revision_parents(self.revids[0])[0]
66
 
        (parent_tree, rev_tree) = self.repository.revision_trees(
67
 
            [parentid, self.revids[0]])
 
97
        window = DiffWindow(parent=self._parent)
 
98
        parentids = self.repository.get_revision(self.revids[0]).parent_ids
 
99
        if len(parentids) == 0:
 
100
            parentid = NULL_REVISION
 
101
        else:
 
102
            parentid = parentids[0]
 
103
        rev_tree    = self.repository.revision_tree(self.revids[0])
 
104
        parent_tree = self.repository.revision_tree(parentid)
68
105
        window.set_diff(self.revids[0], rev_tree, parent_tree)
69
106
        window.show()
70
107
 
71
108
    def show_push(self, item):
72
109
        from bzrlib.plugins.gtk.push import PushDialog
73
110
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
74
 
        dialog.run()
 
111
        response = dialog.run()
 
112
 
 
113
        if response != Gtk.ResponseType.NONE:
 
114
            dialog.destroy()
75
115
 
76
116
    def show_tag(self, item):
77
117
        from bzrlib.plugins.gtk.tags import AddTagDialog
78
118
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
79
119
        response = dialog.run()
80
 
        if response != gtk.RESPONSE_NONE:
 
120
 
 
121
        if response != Gtk.ResponseType.NONE:
81
122
            dialog.hide()
82
 
        
83
 
            if response == gtk.RESPONSE_OK:
84
 
                self.branch.lock_write()
85
 
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
86
 
                self.branch.unlock()
87
 
            
 
123
 
 
124
            if response == Gtk.ResponseType.OK:
 
125
                self.emit('tag-added', dialog.tagname, dialog._revid)
 
126
 
88
127
            dialog.destroy()
 
128
 
 
129
    def revert(self, item):
 
130
        pb = ui.ui_factory.nested_progress_bar()
 
131
        revision_tree = self.branch.repository.revision_tree(self.revids[0])
 
132
        try:
 
133
            self.wt.revert(old_tree = revision_tree, pb = pb)
 
134
        finally:
 
135
            pb.finished()