/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: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commands.py
32
32
from bzrlib.option import Option
33
33
 
34
34
from bzrlib.plugins.gtk import (
35
 
    import_pygtk,
36
35
    set_ui_factory,
37
36
    )
38
37
from bzrlib.plugins.gtk.i18n import _i18n
46
45
 
47
46
 
48
47
def open_display():
49
 
    pygtk = import_pygtk()
50
48
    try:
51
 
        import gtk
 
49
        from gi.repository import Gtk
52
50
    except RuntimeError, e:
53
51
        if str(e) == "could not open display":
54
52
            raise NoDisplayError
55
53
    set_ui_factory()
56
 
    return gtk
 
54
    return Gtk
57
55
 
58
56
 
59
57
 
150
148
                tree2 = tree1.basis_tree()
151
149
 
152
150
            from diff import DiffWindow
153
 
            import gtk
 
151
            from gi.repository import Gtk
154
152
            window = DiffWindow()
155
 
            window.connect("destroy", gtk.main_quit)
 
153
            window.connect("destroy", Gtk.main_quit)
156
154
            window.set_diff("Working Tree", tree1, tree2)
157
155
            if filename is not None:
158
156
                tree_filename = wt.relpath(filename)
166
164
                                          filename)
167
165
            window.show()
168
166
 
169
 
            gtk.main()
 
167
            Gtk.main()
170
168
        finally:
171
169
            wt.unlock()
172
170
 
209
207
                revids.append(br.last_revision())
210
208
            else:
211
209
                revids.append(revision[0].as_revision_id(br))
212
 
        import gtk
 
210
        from gi.repository import Gtk
213
211
        pp = start_viz_window(br, revids, limit)
214
 
        pp.connect("destroy", lambda w: gtk.main_quit())
 
212
        pp.connect("destroy", lambda w: Gtk.main_quit())
215
213
        pp.show()
216
 
        gtk.main()
 
214
        Gtk.main()
217
215
 
218
216
 
219
217
class cmd_gannotate(GTKCommand):
236
234
    aliases = ["gblame", "gpraise"]
237
235
    
238
236
    def run(self, filename, all=False, plain=False, line='1', revision=None):
239
 
        gtk = open_display()
 
237
        Gtk = open_display()
240
238
 
241
239
        try:
242
240
            line = int(line)
267
265
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
268
266
 
269
267
        window = GAnnotateWindow(all, plain, branch=br)
270
 
        window.connect("destroy", lambda w: gtk.main_quit())
 
268
        window.connect("destroy", lambda w: Gtk.main_quit())
271
269
        config = GAnnotateConfig(window)
272
270
        window.show()
273
271
        br.lock_read()
276
274
        try:
277
275
            window.annotate(tree, br, file_id)
278
276
            window.jump_to_line(line)
279
 
            gtk.main()
 
277
            Gtk.main()
280
278
        finally:
281
279
            br.unlock()
282
280
            if wt is not None:
331
329
    takes_options = ['revision']
332
330
 
333
331
    def run(self, path='.', revision=None):
334
 
        gtk = open_display()
 
332
        Gtk = open_display()
335
333
        from bzrlib.plugins.gtk.status import StatusWindow
336
334
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
337
335
 
346
344
            revision_id = None
347
345
 
348
346
        status = StatusWindow(wt, wt_path, revision_id)
349
 
        status.connect("destroy", gtk.main_quit)
 
347
        status.connect("destroy", Gtk.main_quit)
350
348
        status.show()
351
 
        gtk.main()
 
349
        Gtk.main()
352
350
 
353
351
 
354
352
class cmd_gsend(GTKCommand):
357
355
    """
358
356
    def run(self):
359
357
        (br, path) = branch.Branch.open_containing(".")
360
 
        gtk = open_display()
 
358
        Gtk = open_display()
361
359
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
362
360
        from StringIO import StringIO
363
361
        dialog = SendMergeDirectiveDialog(br)
364
 
        if dialog.run() == gtk.RESPONSE_OK:
 
362
        if dialog.run() == Gtk.ResponseType.OK:
365
363
            outf = StringIO()
366
364
            outf.writelines(dialog.get_merge_directive().to_lines())
367
365
            mail_client = br.get_config().get_mail_client()
424
422
    """
425
423
    takes_args = ["other_branch?"]
426
424
    def run(self, other_branch=None):
427
 
        pygtk = import_pygtk()
428
425
        try:
429
 
            import gtk
 
426
            from gi.repository import Gtk
430
427
        except RuntimeError, e:
431
428
            if str(e) == "could not open display":
432
429
                raise NoDisplayError
476
473
    def run(self):
477
474
        br = branch.Branch.open_containing('.')[0]
478
475
        
479
 
        gtk = open_display()
 
476
        Gtk = open_display()
480
477
        from tags import TagsWindow
481
478
        window = TagsWindow(br)
482
479
        window.show()
483
 
        gtk.main()
 
480
        Gtk.main()