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

Fix regressions in plugins tab.

Show diffs side-by-side

added added

removed removed

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