/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: 2008-07-17 11:51:03 UTC
  • Revision ID: jelmer@samba.org-20080717115103-djh5sb0pvpse2zkb
Add note about glade.

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