SVN: vfmg/trunk/VFMG: icewm_out.pm metisse_out.pm qvwm_out.pm

[sparky]

Author: sparky
Date: Sat Dec  2 23:58:27 2006
New Revision: 8048

Modified:
   vfmg/trunk/VFMG/icewm_out.pm
   vfmg/trunk/VFMG/metisse_out.pm
   vfmg/trunk/VFMG/qvwm_out.pm
Log:
- use VFMG::Icons


Modified: vfmg/trunk/VFMG/icewm_out.pm
==============================================================================
--- vfmg/trunk/VFMG/icewm_out.pm	(original)
+++ vfmg/trunk/VFMG/icewm_out.pm	Sat Dec  2 23:58:27 2006
@@ -2,6 +2,7 @@
 
 use strict;
 use warnings;
+use VFMG::Icons;
 
 sub icewm {
 	my ($no, $level) = @_;
@@ -10,8 +11,7 @@
 		my $d = $main::desktop[$entry];
 		my $name = $$d{Name};
 		$name =~ s/\"/\\\"/g;
-		my $icon = "";
-		$icon = main::scale_icon($$d{Icon}) if $main::opt{icons};
+		my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
 		if ($main::menu[$no]{$entry} < 0) {
 			$apps .= qq(${level}prog "$name" "$icon" $$d{Exec}\n);
 		} else {
@@ -25,7 +25,9 @@
 }
 
 sub do_menu() {
+	VFMG::Icons::init();
 	icewm($main::opt{strip}, "");
+	VFMG::Icons::do_fork();
 }
 
 1;

Modified: vfmg/trunk/VFMG/metisse_out.pm
==============================================================================
--- vfmg/trunk/VFMG/metisse_out.pm	(original)
+++ vfmg/trunk/VFMG/metisse_out.pm	Sat Dec  2 23:58:27 2006
@@ -2,6 +2,7 @@
 
 use strict;
 use warnings;
+use VFMG::Icons;
 
 sub metisse {
 	my ($no, $file, $basename) = @_;
@@ -12,8 +13,7 @@
 	$this_menu .= qq(DestroyMenu $file\nAddToMenu $file "$basename" Title\n);
 	foreach my $entry (sort main::cmpdname keys %{$main::menu[$no]}) {
 		my $d = $main::desktop[$entry];
-		my $icon = "";
-		$icon = main::scale_icon($$d{Icon}) if $main::opt{icons};
+		my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
 		$icon = "\%$icon\%" if length $icon;
 		
 		if ($main::menu[$no]{$entry} < 0) {
@@ -29,7 +29,9 @@
 }
 
 sub do_menu() {
+	VFMG::Icons::init();
 	metisse($main::opt{strip},"", "metisse");
+	VFMG::Icons::do_fork();
 }
 
 1;

Modified: vfmg/trunk/VFMG/qvwm_out.pm
==============================================================================
--- vfmg/trunk/VFMG/qvwm_out.pm	(original)
+++ vfmg/trunk/VFMG/qvwm_out.pm	Sat Dec  2 23:58:27 2006
@@ -2,6 +2,7 @@
 
 use strict;
 use warnings;
+use VFMG::Icons;
 
 sub qvwm {
 	my ($no, $level) = @_;
@@ -9,8 +10,7 @@
 	foreach my $entry (sort main::cmpdname keys %{$main::menu[$no]}) {
 		my $d = $main::desktop[$entry];
 		( my $name = $$d{Name} ) =~ s/\"/\\\"/g;
-		my $icon = "";
-		$icon = main::scale_icon($$d{Icon}) if $main::opt{icons};
+		my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
 		if ($main::menu[$no]{$entry} < 0) {
 			( my $exec = $$d{Exec} ) =~ s/\"/\\\"/g;
 			$apps .= qq($level"$name" "$icon" "$exec"\n);
@@ -25,8 +25,10 @@
 }
 
 sub do_menu() {
+	VFMG::Icons::init();
 	print "[StartMenu]\n";
 	qvwm($main::opt{strip}, "");
+	VFMG::Icons::do_fork();
 }
 
 1;