/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 __init__.py

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
52
52
 
53
53
check_bzrlib_version(version_info[:2])
54
54
 
 
55
from bzrlib.trace import warning
 
56
if __name__ != 'bzrlib.plugins.gtk':
 
57
    warning("Not running as bzrlib.plugins.gtk, things may break.")
 
58
 
55
59
from bzrlib import errors
56
60
from bzrlib.commands import Command, register_command, display_command
57
61
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
74
78
 
75
79
def set_ui_factory():
76
80
    pygtk = import_pygtk()
77
 
    from olive.ui import GtkUIFactory
 
81
    from ui import GtkUIFactory
78
82
    import bzrlib.ui
79
83
    bzrlib.ui.ui_factory = GtkUIFactory()
80
84
 
92
96
            if str(e) == "could not open display":
93
97
                raise NoDisplayError
94
98
 
95
 
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
 
99
        from bzrlib.plugins.gtk.branch import BranchDialog
96
100
 
97
101
        set_ui_factory()
98
102
        dialog = BranchDialog(os.path.abspath('.'))
113
117
            if str(e) == "could not open display":
114
118
                raise NoDisplayError
115
119
 
116
 
        from bzrlib.plugins.gtk.olive.checkout import CheckoutDialog
 
120
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
117
121
 
118
122
        set_ui_factory()
119
123
        dialog = CheckoutDialog(os.path.abspath('.'))
137
141
            if str(e) == "could not open display":
138
142
                raise NoDisplayError
139
143
 
140
 
        from bzrlib.plugins.gtk.olive.push import PushDialog
 
144
        from push import PushDialog
141
145
 
142
146
        set_ui_factory()
143
147
        dialog = PushDialog(branch)
172
176
            tree1 = wt
173
177
            tree2 = tree1.basis_tree()
174
178
 
175
 
        from viz.diffwin import DiffWindow
 
179
        from diff import DiffWindow
176
180
        import gtk
177
181
        window = DiffWindow()
178
 
        window.connect("destroy", lambda w: gtk.main_quit())
 
182
        window.connect("destroy", gtk.main_quit)
179
183
        window.set_diff("Working Tree", tree1, tree2)
180
184
        if filename is not None:
181
185
            tree_filename = wt.relpath(filename)
222
226
            else:
223
227
                (revno, revid) = revision[0].in_history(branch)
224
228
 
225
 
            from viz.bzrkapp import BzrkApp
 
229
            from viz.branchwin import BranchWindow
 
230
            import gtk
226
231
                
227
 
            app = BzrkApp()
228
 
            app.show(branch, revid, limit)
 
232
            pp = BranchWindow()
 
233
            pp.set_branch(branch, revid, limit)
 
234
            pp.connect("destroy", lambda w: gtk.main_quit())
 
235
            pp.show()
 
236
            gtk.main()
229
237
        finally:
230
238
            branch.repository.unlock()
231
239
            branch.unlock()
232
 
        app.main()
233
240
 
234
241
 
235
242
register_command(cmd_visualise)
309
316
 
310
317
    Graphical user interface for committing revisions"""
311
318
    
 
319
    aliases = [ "gci" ]
312
320
    takes_args = []
313
321
    takes_options = []
314
322
 
323
331
                raise NoDisplayError
324
332
 
325
333
        set_ui_factory()
326
 
        from olive.commit import CommitDialog
 
334
        from commit import CommitDialog
327
335
        from bzrlib.commit import Commit
328
336
        from bzrlib.errors import (BzrCommandError,
329
337
                                   NotBranchError,
352
360
 
353
361
register_command(cmd_gcommit)
354
362
 
 
363
class cmd_gstatus(Command):
 
364
    """GTK+ status dialog
 
365
 
 
366
    Graphical user interface for showing status 
 
367
    information."""
 
368
    
 
369
    aliases = [ "gst" ]
 
370
    takes_args = ['PATH?']
 
371
    takes_options = []
 
372
 
 
373
    def run(self, path='.'):
 
374
        import os
 
375
        pygtk = import_pygtk()
 
376
 
 
377
        try:
 
378
            import gtk
 
379
        except RuntimeError, e:
 
380
            if str(e) == "could not open display":
 
381
                raise NoDisplayError
 
382
 
 
383
        set_ui_factory()
 
384
        from status import StatusDialog
 
385
        (wt, wt_path) = WorkingTree.open_containing(path)
 
386
        status = StatusDialog(wt, wt_path)
 
387
        status.connect("destroy", gtk.main_quit)
 
388
        status.run()
 
389
 
 
390
register_command(cmd_gstatus)
 
391
 
 
392
 
 
393
import gettext
 
394
gettext.install('olive-gtk')
 
395
 
355
396
class NoDisplayError(BzrCommandError):
356
397
    """gtk could not find a proper display"""
357
398
 
364
405
    result = TestSuite()
365
406
    result.addTest(tests.test_suite())
366
407
    return result
367