/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-08-12 20:25:28 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812202528-4xf4a2t23urx50d2
Updated gst to gtk3.

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