SVN: vfmg/trunk/VFMG: fbpanel_out.pm fvwm2_out.pm

[sparky]

Author: sparky
Date: Sat Dec  2 23:52:35 2006
New Revision: 8047

Modified:
   vfmg/trunk/VFMG/fbpanel_out.pm
   vfmg/trunk/VFMG/fvwm2_out.pm
Log:
- use VFMG::Icons


Modified: vfmg/trunk/VFMG/fbpanel_out.pm
==============================================================================
--- vfmg/trunk/VFMG/fbpanel_out.pm	(original)
+++ vfmg/trunk/VFMG/fbpanel_out.pm	Sat Dec  2 23:52:35 2006
@@ -2,14 +2,14 @@
 
 use strict;
 use warnings;
+use VFMG::Icons;
 
 sub fbpanel {
 	my ($no, $level)=@_;
 	my $apps = "";
 	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});
 		if($main::menu[$no]{$entry}<0) {
 			$apps .=
 				"${level}item {\n".
@@ -30,7 +30,9 @@
 
 
 sub do_menu() {
+	VFMG::Icons::init();
 	fbpanel($main::opt{strip},"");
+	VFMG::Icons::do_fork();
 }
 
 1;

Modified: vfmg/trunk/VFMG/fvwm2_out.pm
==============================================================================
--- vfmg/trunk/VFMG/fvwm2_out.pm	(original)
+++ vfmg/trunk/VFMG/fvwm2_out.pm	Sat Dec  2 23:52:35 2006
@@ -2,6 +2,7 @@
 
 use strict;
 use warnings;
+use VFMG::Icons;
 
 sub fvwm2 {
 	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});
 		$icon = "\%$icon\%" if length $icon;
 		if ($main::menu[$no]{$entry} < 0) {
 			$apps .= qq(AddToMenu $level	"$icon$name"	Exec $$d{Exec} &\n);
@@ -27,7 +27,9 @@
 }
 
 sub do_menu() {
+	VFMG::Icons::init();
 	fvwm2($main::opt{strip}, "fvwm2");
+	VFMG::Icons::do_fork();
 }
 
 1;