/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-04-10 18:44:39 UTC
  • mto: This revision was merged to the branch mainline in revision 730.
  • Revision ID: jelmer@samba.org-20110410184439-g7hqaacexqtviq13
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.

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