Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/scripts


Modified Files:
        e_gen_menu 


Log Message:
Change menu file references to be relative to ~/.e16/menus/. Cleanups.

===================================================================
RCS file: /cvs/e/e16/e/scripts/e_gen_menu,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_gen_menu  13 Jan 2007 19:14:26 -0000      1.50
+++ e_gen_menu  28 May 2007 17:20:43 -0000      1.51
@@ -57,7 +57,6 @@
 $EdirRoot = "/usr/share/enlightenment" unless $EdirRoot;
 $EdirBin  = "/usr/bin" unless $EdirBin;
 
-$EdirIcons = "$EdirUser/icons";
 $EdirMenus = "$EdirUser/menus";
 
 $dbg      = "$ENV{'E_MENUGEN_DBG'}";
@@ -66,7 +65,6 @@
 $ENV{'PATH'} = "$EdirBin:$ENV{'PATH'}";
 
 # Programs
-$DoConvert = `which convert`;
 $DoIconv = `which iconv`;
 
 @CatsRemove = (
@@ -83,11 +81,11 @@
 
 @MainMenu = (
        "t:User Menus",
-       "m:User Application List:menus/user_apps.menu",
-       "m:GNOME:menus/menus_GNOME/index.menu",
-       "m:KDE:menus/menus_KDE/index.menu",
-       "m:Other:menus/menus_Other/index.menu",
-       "m:Enlightenment Epplets:menus/epplets.menu",
+       "m:User Application List:user_apps.menu",
+       "m:GNOME:menus_GNOME/index.menu",
+       "m:KDE:menus_KDE/index.menu",
+       "m:Other:menus_Other/index.menu",
+       "m:Enlightenment Epplets:epplets.menu",
        "c:Restart Enlightenment:exit restart",
        "c:Log Out:exit logout"
 );
@@ -380,6 +378,7 @@
        local $c, $k, $dir;
 
        $dir = "$EdirMenus/menus_$type";
+       $mdir = "menus_$type";
        print "Generating Menu: $type in $dir\n" if $dbg ge 1;
        MkDir($dir);
 
@@ -398,7 +397,7 @@
        foreach $m (sort(keys(%menus))) {
                open(FSubM, ">$dir/$m.menu") or die "*** Couldn't create 
$dir/$m.menu\n";
                print "- Submenu: $m\n" if $dbg ge 2;
-               print FTopM "\"$m\" \"\" menu \"$dir/$m.menu\"\n";
+               print FTopM "\"$m\" \"\" menu \"$mdir/$m.menu\"\n";
                print FSubM "\"$m\"\n";
                foreach $k (sort(@{$menus{$m}})) {
                        print " - Item: $k\n" if $dbg ge 2;
@@ -459,7 +458,6 @@
 
 # Make menu dir and scaled icon dir
 MkDir("$EdirMenus");
-MkDir("$EdirIcons");
 
 # Make the menus
 MakeMenu("file.menu", [EMAIL PROTECTED]);



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to