/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: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

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 gtk
25
 
import gobject
 
18
from gi.repository import Gtk
 
19
from gi.repository import GObject
26
20
from bzrlib import ui
27
21
from bzrlib.revision import NULL_REVISION
28
22
 
29
 
class RevisionMenu(gtk.Menu):
 
23
class RevisionMenu(Gtk.Menu):
30
24
 
31
25
    __gsignals__ = {
32
26
            'tag-added': (
33
 
                gobject.SIGNAL_RUN_FIRST,
34
 
                gobject.TYPE_NONE,
35
 
                (gobject.TYPE_STRING, gobject.TYPE_STRING)
 
27
                GObject.SignalFlags.RUN_FIRST,
 
28
                None,
 
29
                (GObject.TYPE_STRING, GObject.TYPE_STRING)
36
30
            )
37
31
    }
38
32
 
53
47
 
54
48
    def create_items(self):
55
49
        if len(self.revids) == 1:
56
 
            item = gtk.MenuItem("View _Changes")
 
50
            item = Gtk.MenuItem.new_with_mnemonic("View _Changes")
57
51
            item.connect('activate', self.show_diff)
58
52
            self.append(item)
59
53
 
60
 
            item = gtk.MenuItem("_Push")
 
54
            item = Gtk.MenuItem.new_with_mnemonic("_Push")
61
55
            item.connect('activate', self.show_push)
62
56
            self.append(item)
63
57
 
64
 
            item = gtk.MenuItem("_Tag Revision")
 
58
            item = Gtk.MenuItem.new_with_mnemonic("_Tag Revision")
65
59
            item.connect('activate', self.show_tag)
66
60
            self.append(item)
67
61
 
68
 
            item = gtk.MenuItem("_Merge Directive")
 
62
            item = Gtk.MenuItem.new_with_mnemonic("_Merge Directive")
69
63
            item.connect('activate', self.store_merge_directive)
70
64
            # FIXME: self.append(item)
71
65
 
72
 
            item = gtk.MenuItem("_Send Merge Directive")
 
66
            item = Gtk.MenuItem.new_with_mnemonic("_Send Merge Directive")
73
67
            item.connect('activate', self.send_merge_directive)
74
68
            self.append(item)
75
69
 
76
70
            if self.wt:
77
 
                item = gtk.MenuItem("_Revert to this revision")
 
71
                item = Gtk.MenuItem.new_with_mnemonic(
 
72
                    "_Revert to this revision")
78
73
                item.connect('activate', self.revert)
79
74
                self.append(item)
80
75
 
89
84
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
90
85
        from cStringIO import StringIO
91
86
        window = SendMergeDirectiveDialog(self.branch, self.revids[0])
92
 
        if window.run() == gtk.RESPONSE_OK:
 
87
        if window.run() == Gtk.ResponseType.OK:
93
88
            outf = StringIO()
94
89
            outf.writelines(window.get_merge_directive().to_lines())
95
90
            mail_client = self.branch.get_config().get_mail_client()
115
110
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
116
111
        response = dialog.run()
117
112
 
118
 
        if response != gtk.RESPONSE_NONE:
 
113
        if response != Gtk.ResponseType.NONE:
119
114
            dialog.destroy()
120
115
 
121
116
    def show_tag(self, item):
123
118
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
124
119
        response = dialog.run()
125
120
 
126
 
        if response != gtk.RESPONSE_NONE:
 
121
        if response != Gtk.ResponseType.NONE:
127
122
            dialog.hide()
128
123
 
129
 
            if response == gtk.RESPONSE_OK:
 
124
            if response == Gtk.ResponseType.OK:
130
125
                self.emit('tag-added', dialog.tagname, dialog._revid)
131
126
 
132
127
            dialog.destroy()