OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: remove CQP option from preferences
[handbrake-jp/handbrake-jp-git.git]
/
gtk
/
src
/
create_resources.py
diff --git
a/gtk/src/create_resources.py
b/gtk/src/create_resources.py
index
1e346fb
..
69d9e7d
100644
(file)
--- a/
gtk/src/create_resources.py
+++ b/
gtk/src/create_resources.py
@@
-36,8
+36,8
@@
def start_element_handler(tag, attr):
val = dict()
stack.append(val)
elif tag == "icon":
val = dict()
stack.append(val)
elif tag == "icon":
- f
nam
e = attr["file"]
- fname = find_file(f
nam
e)
+ f
bas
e = attr["file"]
+ fname = find_file(f
bas
e)
key = attr["name"]
if fname != None and key != None:
val = dict()
key = attr["name"]
if fname != None and key != None:
val = dict()
@@
-49,15
+49,21
@@
def start_element_handler(tag, attr):
val["height"] = pb.get_height()
val["rowstride"] = pb.get_rowstride()
val["data"] = plistlib.Data(pb.get_pixels())
val["height"] = pb.get_height()
val["rowstride"] = pb.get_rowstride()
val["data"] = plistlib.Data(pb.get_pixels())
+ elif fname == None:
+ print >> sys.stderr, ( "Error: No such icon file %s" % fbase )
+ sys.exit(1)
elif tag == "plist":
elif tag == "plist":
- f
nam
e = attr["file"]
- fname = find_file(f
nam
e)
+ f
bas
e = attr["file"]
+ fname = find_file(f
bas
e)
key = attr["name"]
if fname != None and key != None:
val = plistlib.readPlist(fname)
key = attr["name"]
if fname != None and key != None:
val = plistlib.readPlist(fname)
+ elif fname == None:
+ print >> sys.stderr, ( "Error: No such plist file %s" % fbase )
+ sys.exit(1)
elif tag == "string":
elif tag == "string":
- f
nam
e = attr["file"]
- fname = find_file(f
nam
e)
+ f
bas
e = attr["file"]
+ fname = find_file(f
bas
e)
key = attr["name"]
if fname != None and key != None:
try:
key = attr["name"]
if fname != None and key != None:
try:
@@
-65,6
+71,10
@@
def start_element_handler(tag, attr):
val = ff.read()
except Exception, err:
print >> sys.stderr, ( "Error: %s" % str(err) )
val = ff.read()
except Exception, err:
print >> sys.stderr, ( "Error: %s" % str(err) )
+ sys.exit(1)
+ elif fname == None:
+ print >> sys.stderr, ( "Error: No such string file %s" % fbase )
+ sys.exit(1)
if val != None:
if type(current) == types.DictType:
if val != None:
if type(current) == types.DictType:
@@
-101,7
+111,7
@@
def find_file(name):
global inc_list
for inc_dir in inc_list:
global inc_list
for inc_dir in inc_list:
- inc = "%s/%s" %
inc_dir, name
+ inc = "%s/%s" %
(inc_dir, name)
if os.path.isfile(inc):
return inc
if os.path.isfile(inc):
return inc
@@
-138,12
+148,6
@@
def main():
print >> sys.stderr, ( "Error: %s" % str(err) )
sys.exit(1)
print >> sys.stderr, ( "Error: %s" % str(err) )
sys.exit(1)
- try:
- infile = open(args[0])
- except Exception, err:
- print >> sys.stderr, ( "Error: %s" % str(err) )
- sys.exit(1)
-
if len(args) > 1:
try:
outfile = open(args[1], "w")
if len(args) > 1:
try:
outfile = open(args[1], "w")