9467
|
1 |
diff -u icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in icon-naming-utils-0.8.1/icon-name-mapping.pl.in
|
|
2 |
--- icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in Tue Sep 19 09:59:27 2006
|
|
3 |
+++ icon-naming-utils-0.8.1/icon-name-mapping.pl.in Tue Sep 19 10:04:25 2006
|
|
4 |
@@ -16,6 +16,7 @@
|
|
5 |
my $condir;
|
|
6 |
my $LN_S = ($^O eq 'MSWin32' ? 'cp' : 'ln -s');
|
|
7 |
my $mappingdir = "@DATADIR@";
|
|
8 |
+my $extrafile;
|
|
9 |
|
|
10 |
if (defined ($ENV{"ICON_NAME_MAPPING_DIR"})) {
|
|
11 |
$mappingdir = $ENV{ICON_NAME_MAPPING_DIR};
|
|
12 |
@@ -27,9 +28,9 @@
|
|
13 |
|
|
14 |
Getopt::Long::Configure (@default_getopt_config);
|
|
15 |
GetOptions ("help|h" => \&usage,
|
|
16 |
- "context|c=s" => \$condir);
|
|
17 |
+ "context|c=s" => \$condir,
|
|
18 |
+ "extrafile|e=s" => \$extrafile);
|
|
19 |
|
|
20 |
-
|
|
21 |
############################################################################
|
|
22 |
|
|
23 |
sub tls_load_mapping {
|
|
24 |
@@ -75,6 +76,7 @@
|
|
25 |
print "Usage: $PROGRAM [OPTIONS] ...
|
|
26 |
|
|
27 |
-c, --context=<dirname> Set up mapping for Context <dirname>
|
|
28 |
+ -e, --extrafile=<file> Specify an extra mapping file <file>
|
|
29 |
|
|
30 |
This utility must be run from the <theme>/<size> directory, with a
|
|
31 |
context passsed in as the argument.
|
|
32 |
@@ -89,4 +91,9 @@
|
|
33 |
} else {
|
|
34 |
my $iconmap = tls_load_mapping ("$mappingdir/legacy-icon-mapping.xml");
|
|
35 |
tls_map_icons ($iconmap, $condir);
|
|
36 |
+ if (defined $extrafile)
|
|
37 |
+ {
|
|
38 |
+ my $tmpiconmap = tls_load_mapping ("$extrafile");
|
|
39 |
+ tls_map_icons ($tmpiconmap, $condir);
|
|
40 |
+ }
|
|
41 |
}
|