/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-07-31 15:52:43 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110731155243-ln8istmxbryhb4pz
Mechanical changes made by pygi.convert.sh.

Show diffs side-by-side

added added

removed removed

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