SVN: vfmg/trunk/vfmg

sparky sparky at pld-linux.org
Sat Dec 2 22:01:53 CET 2006


Author: sparky
Date: Sat Dec  2 22:01:52 2006
New Revision: 8038

Modified:
   vfmg/trunk/vfmg
Log:
- try to remove as much about icons as it is possible


Modified: vfmg/trunk/vfmg
==============================================================================
--- vfmg/trunk/vfmg	(original)
+++ vfmg/trunk/vfmg	Sat Dec  2 22:01:52 2006
@@ -821,30 +821,6 @@
 	}
 } # }}}
 
-my @scale;
-sub scale_icon {
-	my $icon_in = $_[0];
-	return $icon_in unless $opt{icons_scale};
-	return $icon_in unless -r $icon_in;
-	
-	(my $icon_out = $icon_in ) =~ s/^.*\///;
-	$icon_out =~ s/\..*$//;
-	$icon_out = "$opt{icons_dir}/$icon_out.$opt{icons_oext}";
-	
-	unless (-f $icon_out) {
-		$_ = $opt{convert};
-		s/\%in/$icon_in/g;
-		s/\%out/$icon_out/g;
-		
-		if ( $opt{icons_fork} ) {
-			push @scale, $_;
-		} else {
-			system($_);
-		}
-	}
-	return $icon_out;
-}
-
 sub cmpdname($$) {
 	use locale;
 	return 
@@ -861,16 +837,6 @@
 }
 binmode STDOUT, ":encoding($opt{encoding})";
 
-if ($opt{icons_scale}) {
-	if (not -d $opt{icons_dir} or ($opt{full_regen} and $o_output ne "DR17")) {
-		warn "Need to (re)generate all icons.\n";
-		require File::Path;
-		import File::Path qw(mkpath rmtree);
-		rmtree($opt{icons_dir}.".old",0,0) if -e $opt{icons_dir}.".old";
-		rename($opt{icons_dir},$opt{icons_dir}.".old") if -e $opt{icons_dir};
-		mkpath($opt{icons_dir},0,0700);
-	}
-}
 if (exists $opt{destdir}) {
 	warn "Multi file output.\n";
 	require File::Path;
@@ -882,18 +848,4 @@
 
 VFMG::Output::do_menu();
 
-if ( @scale ) {
-	warn "Scaling $#scale icons\n";
-	my $fork = fork;
-	unless ( defined $fork ) {
-		warn "Fork failed, scaling in foreground\n";
-		$fork = 0;
-	}
-	if ( $fork == 0) {
-		foreach my $cmd (@scale) {
-			system($cmd);
-		}
-	}
-}
-
 # vi: ts=4 sw=4 noet fdm=marker


More information about the pld-cvs-commit mailing list