vfmg (DEVEL): vfmg - updated DR17 (supports directory sorting too)

[sparky]

Author: sparky                       Date: Sun Nov  6 02:20:30 2005 GMT
Module: vfmg                          Tag: DEVEL
---- Log message:
- updated DR17 (supports directory sorting too)

---- Files affected:
vfmg:
   vfmg (1.73.2.34 -> 1.73.2.35) 

---- Diffs:

================================================================
Index: vfmg/vfmg
diff -u vfmg/vfmg:1.73.2.34 vfmg/vfmg:1.73.2.35
--- vfmg/vfmg:1.73.2.34	Sat Nov  5 21:49:17 2005
+++ vfmg/vfmg	Sun Nov  6 03:20:24 2005
@@ -827,7 +827,7 @@
 
 sub DR17 { # {{{
 	my ($no, $dir, $tab, $dr)=@_;
-	my $sort = 1;
+	my $dirs = "";
 	my $apps = "";
 	my @edje = qw(edje_cc -id . -fd . icon.edc);
 	foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
@@ -854,7 +854,7 @@
 			print "..DONE\n";
 			$apps .= $$d[FILENAME] . ".eap\n";
 		} else {
-			my $subdir = sprintf "%s/%.2d_%s", $dir, $sort, $$d[FILENAME];
+			my $subdir = sprintf "%s/%s", $dir, $$d[FILENAME];
 			my $file = $subdir . "/.directory.eap";
 			mkpath($subdir,0,0700);
 			print "..";
@@ -866,10 +866,11 @@
 			
 			print "..DONE\n";
 			DR17($menu[$no]{$entry},$subdir,$tab.step,$dr);
-			$sort++;
+			$dirs .= $$d[FILENAME]."\n";
 		}
 	}
 	open F_OUT, ">> $dir/.order" or warn "$dir/.order: $!\n";
+	print F_OUT $dirs;
 	print F_OUT $apps;
 	close F_OUT;	
 } # }}}
@@ -1280,18 +1281,26 @@
 	close F_OUT; # }}}
 	open F_OUT, "> icon.edc"; # {{{
 	print F_OUT << "EOF";
-	images { image: "icon.$opt{icons_ext}" COMP; }
-	collections { group {
-	    name: "icon";
-	    max: 48 48;
-	    parts { part {
-	        name: "image";
-		mouse_events: 0;
-		description {
-		  state: "default" 0.0;
-		  aspect: 1.0 1.0;
-		  image.normal: "icon.$opt{icons_ext}";
-	} } } } }
+	images {
+		image: "icon.$opt{icons_ext}" COMP;
+	}
+	collections {
+		group {
+			name: "icon";
+			max: 48 48;
+			 parts {
+				part {
+					name: "image";
+					mouse_events: 0;
+					description {
+						state: "default" 0.0;
+						aspect: 1.0 1.0;
+						image.normal: "icon.$opt{icons_ext}";
+					}
+				}
+			}
+		}
+	}
 EOF
 	close F_OUT; # }}}
 	DR17($opt{strip},$opt{destdir},"",\%DR);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/vfmg/vfmg?r1=1.73.2.34&r2=1.73.2.35&f=u