/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: v.ladeuil+lp at free
  • Date: 2006-11-30 13:25:35 UTC
  • mto: (66.2.6 trunk)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: v.ladeuil+lp@free.fr-20061130132535-pypv8n8p2lgd0nsl
Fix #73737. Check empty message at commit time.

* dialog.py:
(about): Destroy the dialog unconditionally.
(_message_dialog): Add a 'question' type dialog. Destroy the
dialog unconditionally. Always returns the response, even if
nobody cares.
(question_dialog): New dialog.

* commit.py:
(CommitDialog.display): Give the focus to the commit message text
widget.
(CommitDialog.commit): Requires confirmation to commit with an
empty message.

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
22
21
 
23
22
try:
24
23
    version_info = sys.version_info
38
37
                os.execvp(python, [python] + sys.argv)
39
38
            except OSError:
40
39
                pass
41
 
    print >>sys.stderr, ('bzr: error: cannot find a suitable python interpreter'
42
 
                         ' (need %d.%d or later)'
43
 
                        ) % NEED_VERS
 
40
    print >>sys.stderr, _('bzr: error: cannot find a suitable python interpreter (need %d.%d or later)') % NEED_VERS
44
41
    sys.exit(1)
45
42
 
46
43
try:
47
 
    import pygtk
48
 
    pygtk.require("2.0")
 
44
        import pygtk
 
45
        pygtk.require("2.0")
49
46
except:
50
 
    pass
51
 
 
 
47
        pass
52
48
try:
53
 
    import gtk
54
 
    import gtk.glade
 
49
        import gtk
 
50
        import gtk.glade
55
51
except:
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
 
                        )
 
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/')
60
53
    sys.exit(1)
61
54
 
62
55
# gettext support
76
69
        print >>sys.stderr, "bzr not found"
77
70
        sys.exit(1)
78
71
    else:
79
 
        bzrlib_match = re.compile(r"bzrlib: (.*)[/\\]bzrlib").search(s)
80
 
        if bzrlib_match:
81
 
            sys.path.append(bzrlib_match.group(1))
 
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
82
77
        else:
83
78
            print >>sys.stderr, "Can't find bzrlib location"
84
79
            sys.exit(1)
85
80
 
 
81
 
 
82
from olive import OliveGtk
86
83
from bzrlib.plugin import load_plugins
87
84
load_plugins()
88
85
 
89
86
import bzrlib.ui
90
 
import bzrlib.plugins.gtk.ui as ui
91
 
bzrlib.ui.ui_factory = ui.GtkUIFactory()
 
87
import olive.ui
 
88
bzrlib.ui.ui_factory = olive.ui.GtkUIFactory()
92
89
 
93
 
from bzrlib.plugins.gtk.olive import OliveGtk
94
90
app = OliveGtk()
95
91
gtk.main()