/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 commands.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:
commands.py
48
48
def open_display():
49
49
    pygtk = import_pygtk()
50
50
    try:
51
 
        import gtk
 
51
        from gi.repository import Gtk
52
52
    except RuntimeError, e:
53
53
        if str(e) == "could not open display":
54
54
            raise NoDisplayError
150
150
                tree2 = tree1.basis_tree()
151
151
 
152
152
            from diff import DiffWindow
153
 
            import gtk
 
153
            from gi.repository import Gtk
154
154
            window = DiffWindow()
155
 
            window.connect("destroy", gtk.main_quit)
 
155
            window.connect("destroy", Gtk.main_quit)
156
156
            window.set_diff("Working Tree", tree1, tree2)
157
157
            if filename is not None:
158
158
                tree_filename = wt.relpath(filename)
166
166
                                          filename)
167
167
            window.show()
168
168
 
169
 
            gtk.main()
 
169
            Gtk.main()
170
170
        finally:
171
171
            wt.unlock()
172
172
 
209
209
                revids.append(br.last_revision())
210
210
            else:
211
211
                revids.append(revision[0].as_revision_id(br))
212
 
        import gtk
 
212
        from gi.repository import Gtk
213
213
        pp = start_viz_window(br, revids, limit)
214
 
        pp.connect("destroy", lambda w: gtk.main_quit())
 
214
        pp.connect("destroy", lambda w: Gtk.main_quit())
215
215
        pp.show()
216
 
        gtk.main()
 
216
        Gtk.main()
217
217
 
218
218
 
219
219
class cmd_gannotate(GTKCommand):
267
267
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
268
268
 
269
269
        window = GAnnotateWindow(all, plain, branch=br)
270
 
        window.connect("destroy", lambda w: gtk.main_quit())
 
270
        window.connect("destroy", lambda w: Gtk.main_quit())
271
271
        config = GAnnotateConfig(window)
272
272
        window.show()
273
273
        br.lock_read()
276
276
        try:
277
277
            window.annotate(tree, br, file_id)
278
278
            window.jump_to_line(line)
279
 
            gtk.main()
 
279
            Gtk.main()
280
280
        finally:
281
281
            br.unlock()
282
282
            if wt is not None:
346
346
            revision_id = None
347
347
 
348
348
        status = StatusWindow(wt, wt_path, revision_id)
349
 
        status.connect("destroy", gtk.main_quit)
 
349
        status.connect("destroy", Gtk.main_quit)
350
350
        status.show()
351
 
        gtk.main()
 
351
        Gtk.main()
352
352
 
353
353
 
354
354
class cmd_gsend(GTKCommand):
361
361
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
362
362
        from StringIO import StringIO
363
363
        dialog = SendMergeDirectiveDialog(br)
364
 
        if dialog.run() == gtk.RESPONSE_OK:
 
364
        if dialog.run() == Gtk.ResponseType.OK:
365
365
            outf = StringIO()
366
366
            outf.writelines(dialog.get_merge_directive().to_lines())
367
367
            mail_client = br.get_config().get_mail_client()
426
426
    def run(self, other_branch=None):
427
427
        pygtk = import_pygtk()
428
428
        try:
429
 
            import gtk
 
429
            from gi.repository import Gtk
430
430
        except RuntimeError, e:
431
431
            if str(e) == "could not open display":
432
432
                raise NoDisplayError
480
480
        from tags import TagsWindow
481
481
        window = TagsWindow(br)
482
482
        window.show()
483
 
        gtk.main()
 
483
        Gtk.main()