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

  • Committer: Alexander Belchenko
  • Date: 2006-10-25 09:21:13 UTC
  • mto: (91.1.8 trunk) (66.2.10 trunk)
  • mto: This revision was merged to the branch mainline in revision 106.
  • Revision ID: bialix@ukr.net-20061025092113-4837c5f6fffb2a35
Fix absolute import in gdiff command.

Only gdiff use absolute import from bzrlib.plugins.gtk... 
And this cause error when bzr-gtk not installed as plugin with 'gtk' name 

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/gladefile.py
17
17
import os
18
18
import sys
19
19
 
20
 
from bzrlib.plugins.gtk import _i18n
21
 
 
22
 
GLADEFILENAMES = ["/usr/share/olive/olive.glade",
23
 
                  "/usr/local/share/olive/olive.glade",
24
 
                  "/opt/share/olive/olive.glade",
25
 
                  "/opt/local/share/olive/olive.glade",
26
 
                  "~/share/olive/olive.glade",
27
 
                 ]
28
20
 
29
21
# Get the glade file name
30
22
if sys.platform == 'win32':
31
 
    GLADEFILENAMES = [os.path.join(os.path.dirname(sys.executable),
32
 
                                   "share/olive/olive.glade")]
33
 
 
34
 
dir_ = os.path.split(os.path.dirname(__file__))[0]
35
 
# Check first if we are running from source
36
 
GLADEFILENAMES.insert(0, os.path.join(dir_, "olive.glade"))
37
 
 
38
 
GLADEFILENAME = None
39
 
 
40
 
for path in GLADEFILENAMES:
41
 
    path = os.path.expanduser(path)
42
 
    if os.path.isfile(path):
43
 
        GLADEFILENAME = path
44
 
        break
45
 
 
46
 
if GLADEFILENAME is None:
47
 
    # Fail
48
 
    print _i18n('Glade file cannot be found.')
49
 
    sys.exit(1)
50
 
 
51
 
UIFILEDIR = os.path.dirname(GLADEFILENAME)
52
 
 
53
 
# Get the cmenu.ui file name
54
 
UIFILENAME = os.path.join(UIFILEDIR, 'cmenu.ui')
55
 
 
56
 
if not os.path.isfile(UIFILENAME):
57
 
    # Fail
58
 
    print _i18n('UI description file cannot be found.')
59
 
    sys.exit(1)
60
 
 
61
 
 
 
23
    GLADEFILENAME = os.path.join(os.path.dirname(sys.executable),
 
24
                                 "share/olive/olive.glade")
 
25
else:
 
26
    GLADEFILENAME = "/usr/share/olive/olive.glade"
 
27
 
 
28
if not os.path.isfile(GLADEFILENAME):
 
29
    # Load from sources directory if not installed
 
30
    dir_ = os.path.split(os.path.dirname(__file__))[0]
 
31
    GLADEFILENAME = os.path.join(dir_, "olive.glade")
 
32
    # Check again
 
33
    if not os.path.isfile(GLADEFILENAME):
 
34
        # Fail
 
35
        print _('Glade file cannot be found.')
 
36
        sys.exit(1)