Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/scripts Modified Files: e_gen_menu Log Message: Find a few more menu icons. =================================================================== RCS file: /cvs/e/e16/e/scripts/e_gen_menu,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- e_gen_menu 28 May 2007 17:20:43 -0000 1.51 +++ e_gen_menu 3 Nov 2007 10:31:31 -0000 1.52 @@ -34,7 +34,8 @@ $IconDirs = MkDirList($Prefixes, "/share/pixmaps:/share/icons"); $IconDirs2 = MkDirList($Prefixes, "/share/icons"); -$Themes = "gnome:default.kde:hicolor"; +$Themes = "default.kde:gnome:hicolor"; +$IconCats = "apps:filesystems:actions:devices:categories:places"; # Where to look for GNOME1 apps $OldGnomeDirs = MkDirList($Prefixes, "/share/gnome/apps"); @@ -334,13 +335,29 @@ foreach $t (split(':', $Themes)) { next unless (-d "$d/$t"); foreach $s (split(':', "16:24:32:48")) { - next unless (-d "$d/$t/$s$x$s"); - foreach $u (split(':', "apps:filesystems:actions:devices")) { - next unless (-d "$d/$t/$s$x$s/$u"); - $i = "$d/$t/$s$x$s/$u/$f"; - $i = "$i.png" unless ($f =~ /\.png$/); + $S = "$d/$t/$s$x$s"; + next unless (-d "$S"); + if ($f =~ /^stock/) { + $i = "$S/stock/*/$f.png"; + $ii = glob("$i"); print "Testing $i\n" if $dbg >= 2; - return $i if (-f $i); + return $ii if (-f $ii); + } else { + foreach $u (split(':', $IconCats)) { + next unless (-d "$S/$u"); + $i = "$S/$u/$f"; + if ($f =~ /\.png|\.xpm$/) { + print "Testing $i\n" if $dbg >= 2; + return $i if (-f $i); + } else { + $ii = "$i.png"; + print "Testing $ii\n" if $dbg >= 2; + return $ii if (-f $ii); + $ii = "$i.xpm"; + print "Testing $ii\n" if $dbg >= 2; + return $ii if (-f $ii); + } + } } } } ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs