Author: sparky
Date: Fri Jan 19 20:41:02 2007
New Revision: 8174
Modified:
vfmg/trunk/VFMG/blackbox_out.pm
vfmg/trunk/VFMG/openbox_out.pm
vfmg/trunk/VFMG/xfce4_out.pm
vfmg/trunk/vfmg
vfmg/trunk/vfmgrc
Log:
- "nomenu" option replaced by "addmenu"
Modified: vfmg/trunk/VFMG/blackbox_out.pm
==============================================================================
--- vfmg/trunk/VFMG/blackbox_out.pm (original)
+++ vfmg/trunk/VFMG/blackbox_out.pm Fri Jan 19 20:41:02 2007
@@ -8,7 +8,7 @@
my $apps = "";
foreach my $entry (sort main::cmpdname keys %{$main::menu[$no]}) {
my $d = $main::desktop[$entry];
- if($main::menu[$no]{$entry} < 0) {
+ if( $main::menu[$no]{$entry} < 0 ) {
$apps .= "$level"."[exec] ($$d{Name}) {$$d{Exec}}\n";
} else {
print "$level"."[submenu] ($$d{Name})\n";
@@ -20,11 +20,9 @@
}
sub do_menu() {
- my $wm = $main::o_output eq "fluxbox" ? "Fluxbox" : "Blackbox";
-
- print "[begin] ($wm)\n" unless $main::opt{nomenu};
+ print "[begin] (". ucfirst $main::o_output .")\n" if
$main::opt{addmenu};
blackbox($main::opt{strip}, "");
- print "[end]\n" unless $main::opt{nomenu};
+ print "[end]\n" if $main::opt{addmenu};
}
1;
Modified: vfmg/trunk/VFMG/openbox_out.pm
==============================================================================
--- vfmg/trunk/VFMG/openbox_out.pm (original)
+++ vfmg/trunk/VFMG/openbox_out.pm Fri Jan 19 20:41:02 2007
@@ -25,7 +25,7 @@
}
sub do_menu() {
- if ($main::opt{nomenu}) {
+ unless ($main::opt{addmenu}) {
openbox($main::opt{strip}, "");
} else {
print "<openbox_menu>\n";
Modified: vfmg/trunk/VFMG/xfce4_out.pm
==============================================================================
--- vfmg/trunk/VFMG/xfce4_out.pm (original)
+++ vfmg/trunk/VFMG/xfce4_out.pm Fri Jan 19 20:41:02 2007
@@ -37,7 +37,8 @@
sub do_menu() {
VFMG::Icons::init();
print "<xfdesktop-menu>\n";
- print qq(<title name="Desktop Menu" visible="yes"/>\n) unless
$main::opt{nomenu};
+ print qq(<title name="Desktop Menu" visible="yes"/>\n)
+ if $main::opt{addmenu};
xfce4($main::opt{strip},"\t");
print "</xfdesktop-menu>\n";
VFMG::Icons::finish();
Modified: vfmg/trunk/vfmg
==============================================================================
--- vfmg/trunk/vfmg (original)
+++ vfmg/trunk/vfmg Fri Jan 19 20:41:02 2007
@@ -33,7 +33,7 @@
clear => 0,
promote => 0,
strip => 0,
- nomenu => 0,
+ addmenu => 1,
only_in => "",
xterm => "xterm -name xterm-%1 -e %2",
convert => "convert -geometry 16x16 \%in \%out",
@@ -88,7 +88,7 @@
'clear|c!' => \$opt{clear},
'promote|p!' => \$opt{promote},
'strip|s!' => \$opt{strip},
- 'nomenu|m!' => \$opt{nomenu},
+ 'addmenu|m!' => \$opt{addmenu},
'only-in|o=s' => \$opt{only_in},
'xterm|r=s' => \$opt{xterm},
@@ -132,7 +132,7 @@
-c, --clear - remove empty menus
-p, --promote - promote submenus with single entry
-s, --strip - strip 1st level menu
- -m, --nomenu - don't add additional menu info
+ -m, --addmenu - add additional menu info (default: yes)
(valid for blackbox, fluxbox, openbox, xfce4)
-o, --only-in - coma separated list of accepted OnlyShowIn= WMs
Modified: vfmg/trunk/vfmgrc
==============================================================================
--- vfmg/trunk/vfmgrc (original)
+++ vfmg/trunk/vfmgrc Fri Jan 19 20:41:02 2007
@@ -16,7 +16,7 @@
#clear = 0/1
#promote = 0/1
#strip = 0/1
-#nomenu = 0/1
+#addmenu = 0/1
# terminal used for terminal applications, see terminal list at final
#xterm = string
# application or in-line script used for scaling/preparing icons
@@ -304,7 +304,7 @@
exec = 1
exec_full = 1
utf = 1
-nomenu = 1
+addmenu = 0
strip = 0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
