/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 olive-gtk

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive-gtk
18
18
 
19
19
import os
20
20
import sys
 
21
import re
21
22
 
22
23
try:
23
24
    version_info = sys.version_info
37
38
                os.execvp(python, [python] + sys.argv)
38
39
            except OSError:
39
40
                pass
40
 
    print >>sys.stderr, _('bzr: error: cannot find a suitable python interpreter (need %d.%d or later)') % NEED_VERS
 
41
    print >>sys.stderr, ('bzr: error: cannot find a suitable python interpreter'
 
42
                         ' (need %d.%d or later)'
 
43
                        ) % NEED_VERS
41
44
    sys.exit(1)
42
45
 
43
46
try:
44
 
        import pygtk
45
 
        pygtk.require("2.0")
 
47
    import pygtk
 
48
    pygtk.require("2.0")
46
49
except:
47
 
        pass
 
50
    pass
 
51
 
48
52
try:
49
 
        import gtk
50
 
        import gtk.glade
 
53
    import gtk
 
54
    import gtk.glade
51
55
except:
52
 
    print >>sys.stderr, _('You need to install python-glade2 and/or pygtk2 (gtk2) or set your PYTHONPATH correctly.\ntry: export PYTHONPATH=/usr/local/lib/python2.4/site-packages/')
 
56
    print >>sys.stderr, ('You need to install python-glade2 and/or pygtk2 (gtk2)'
 
57
                         ' or set your PYTHONPATH correctly.\n'
 
58
                         'try: export PYTHONPATH=/usr/local/lib/python2.4/site-packages/'
 
59
                        )
53
60
    sys.exit(1)
54
61
 
55
62
# gettext support
69
76
        print >>sys.stderr, "bzr not found"
70
77
        sys.exit(1)
71
78
    else:
72
 
        for i in s.splitlines():
73
 
            if i.startswith("Using bzrlib: "):
74
 
                path = os.path.split(i[14:])[0]
75
 
                sys.path.append(path)
76
 
                break
 
79
        bzrlib_match = re.compile(r"bzrlib: (.*)[/\\]bzrlib").search(s)
 
80
        if bzrlib_match:
 
81
            sys.path.append(bzrlib_match.group(1))
77
82
        else:
78
83
            print >>sys.stderr, "Can't find bzrlib location"
79
84
            sys.exit(1)
80
85
 
81
 
 
82
 
from olive import OliveGtk
83
86
from bzrlib.plugin import load_plugins
84
87
load_plugins()
85
88
 
86
89
import bzrlib.ui
87
 
import ui
 
90
import bzrlib.plugins.gtk.ui as ui
88
91
bzrlib.ui.ui_factory = ui.GtkUIFactory()
89
92
 
 
93
from bzrlib.plugins.gtk.olive import OliveGtk
90
94
app = OliveGtk()
91
95
gtk.main()