Author: sparky
Date: Mon Dec 4 04:35:16 2006
New Revision: 8055
Modified:
vfmg/trunk/VFMG/afterstep_out.pm
vfmg/trunk/VFMG/e16_out.pm
vfmg/trunk/VFMG/e17-desktop_out.pm
vfmg/trunk/VFMG/e17-eap_out.pm
vfmg/trunk/VFMG/fbpanel_out.pm
vfmg/trunk/VFMG/fvwm2_out.pm
vfmg/trunk/VFMG/icewm_out.pm
vfmg/trunk/VFMG/metisse_out.pm
vfmg/trunk/VFMG/qvwm_out.pm
vfmg/trunk/VFMG/xfce4_out.pm
vfmg/trunk/VFMG/xpde_out.pm
Log:
- updated for new VFMG::Icons::scale_icon()
Modified: vfmg/trunk/VFMG/afterstep_out.pm
==============================================================================
--- vfmg/trunk/VFMG/afterstep_out.pm (original)
+++ vfmg/trunk/VFMG/afterstep_out.pm Mon Dec 4 04:35:16 2006
@@ -17,7 +17,7 @@
my $name = main::encode($main::opt{encoding},$$d{Name});
if ($main::menu[$no]{$entry} < 0) {
$name=~s/\"/\\\"/g;
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
my $F_OUT;
open $F_OUT, ">> $dir/$$d{file}" or warn
"$dir/$$d{file}: $!\n";
print $F_OUT qq(Exec "$name" exec $$d{Exec}\n);
Modified: vfmg/trunk/VFMG/e16_out.pm
==============================================================================
--- vfmg/trunk/VFMG/e16_out.pm (original)
+++ vfmg/trunk/VFMG/e16_out.pm Mon Dec 4 04:35:16 2006
@@ -31,7 +31,7 @@
my $d = $main::desktop[$entry];
my $name = main::encode($main::opt{encoding},$$d{Name});
$name=~s/\"/\'/g;
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
if ($main::menu[$no]{$entry} < 0) {
$apps .= qq("$name" "$icon" exec "$$d{Exec}"\n);
} else {
Modified: vfmg/trunk/VFMG/e17-desktop_out.pm
==============================================================================
--- vfmg/trunk/VFMG/e17-desktop_out.pm (original)
+++ vfmg/trunk/VFMG/e17-desktop_out.pm Mon Dec 4 04:35:16 2006
@@ -43,7 +43,7 @@
foreach my $entry (sort main::cmpdname keys %{$main::menu[$no]}) {
my $icon_exists = 0;
my $d = $main::desktop[$entry];
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
my $common_desk = "[Desktop Entry]\n" .
"Encoding=UTF-8\n" .
Modified: vfmg/trunk/VFMG/e17-eap_out.pm
==============================================================================
--- vfmg/trunk/VFMG/e17-eap_out.pm (original)
+++ vfmg/trunk/VFMG/e17-eap_out.pm Mon Dec 4 04:35:16 2006
@@ -30,7 +30,7 @@
my $d = $main::desktop[$entry];
my $name = $$d{Name};
print $tab.$name.".." if $main::o_verbose;
- my $icon = $$d{Icon};
+ my $icon = VFMG::Icons::find_icon($d, 1);
if ( defined $DR{existing}->{$$d{file}} ) {
my $e = $DR{existing}->{$$d{file}};
@@ -90,8 +90,8 @@
( my $exe = $DR{text_icon} ) =~ s/%1/"$name"/;
system($exe);
} else {
- $icon = $DR{tmp}."/blank.xpm" unless -r $icon;
- &$VFMG::Icons::scale_icon($icon);
+ $$d{Icon} = $DR{tmp}."/blank.xpm" unless -r
$icon;
+ &$VFMG::Icons::scale_icon($d);
}
die "No icon $DR{icon}\n" unless -r $DR{icon};
print ".." if $main::o_verbose;
Modified: vfmg/trunk/VFMG/fbpanel_out.pm
==============================================================================
--- vfmg/trunk/VFMG/fbpanel_out.pm (original)
+++ vfmg/trunk/VFMG/fbpanel_out.pm Mon Dec 4 04:35:16 2006
@@ -9,7 +9,7 @@
my $apps = "";
foreach my $entry (sort main::cmpdname keys %{$main::menu[$no]}) {
my $d = $main::desktop[$entry];
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
if($main::menu[$no]{$entry}<0) {
$apps .=
"${level}item {\n".
Modified: vfmg/trunk/VFMG/fvwm2_out.pm
==============================================================================
--- vfmg/trunk/VFMG/fvwm2_out.pm (original)
+++ vfmg/trunk/VFMG/fvwm2_out.pm Mon Dec 4 04:35:16 2006
@@ -10,7 +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 = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
$icon = "\%$icon\%" if length $icon;
if ($main::menu[$no]{$entry} < 0) {
$apps .= qq(AddToMenu $level "$icon$name" Exec
$$d{Exec} &\n);
Modified: vfmg/trunk/VFMG/icewm_out.pm
==============================================================================
--- vfmg/trunk/VFMG/icewm_out.pm (original)
+++ vfmg/trunk/VFMG/icewm_out.pm Mon Dec 4 04:35:16 2006
@@ -11,7 +11,7 @@
my $d = $main::desktop[$entry];
my $name = $$d{Name};
$name =~ s/\"/\\\"/g;
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
if ($main::menu[$no]{$entry} < 0) {
$apps .= qq(${level}prog "$name" "$icon" $$d{Exec}\n);
} else {
Modified: vfmg/trunk/VFMG/metisse_out.pm
==============================================================================
--- vfmg/trunk/VFMG/metisse_out.pm (original)
+++ vfmg/trunk/VFMG/metisse_out.pm Mon Dec 4 04:35:16 2006
@@ -13,7 +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 = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
$icon = "\%$icon\%" if length $icon;
if ($main::menu[$no]{$entry} < 0) {
Modified: vfmg/trunk/VFMG/qvwm_out.pm
==============================================================================
--- vfmg/trunk/VFMG/qvwm_out.pm (original)
+++ vfmg/trunk/VFMG/qvwm_out.pm Mon Dec 4 04:35:16 2006
@@ -10,7 +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 = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
if ($main::menu[$no]{$entry} < 0) {
( my $exec = $$d{Exec} ) =~ s/\"/\\\"/g;
$apps .= qq($level"$name" "$icon" "$exec"\n);
Modified: vfmg/trunk/VFMG/xfce4_out.pm
==============================================================================
--- vfmg/trunk/VFMG/xfce4_out.pm (original)
+++ vfmg/trunk/VFMG/xfce4_out.pm Mon Dec 4 04:35:16 2006
@@ -20,7 +20,7 @@
my $d = $main::desktop[$entry];
my $name = ($$d{Name} =~ /["&<>]/) ?
xmlname($$d{Name}) : $$d{Name};
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
if ($main::menu[$no]{$entry} < 0) {
$apps .= qq($level<app name="$name" cmd=");
$apps .= ($$d{Exec} =~ /["&<>]/) ? xmlname($$d{Exec}) :
$$d{Exec};
Modified: vfmg/trunk/VFMG/xpde_out.pm
==============================================================================
--- vfmg/trunk/VFMG/xpde_out.pm (original)
+++ vfmg/trunk/VFMG/xpde_out.pm Mon Dec 4 04:35:16 2006
@@ -16,7 +16,7 @@
my $name = main::encode($main::opt{encoding},$$d{Name});
if ($main::menu[$no]{$entry} < 0) {
$name =~ s/\"/\\\"/g;
- my $icon = &$VFMG::Icons::scale_icon($$d{Icon});
+ my $icon = &$VFMG::Icons::scale_icon($d);
open F_OUT, ">> $dir/$$d{file}.lnk" or warn
"$dir/$$d{file}.lnk: $!\n";
print F_OUT "[Shortcut]\n",
"Caption=$name\n",
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
