[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[860] fvwm/components/functions

[<dom...@us...>]

Revision: 860
          http://sourceforge.net/p/fvwm-crystal/code/860
Author:   dominique_libre
Date:     2016-04-23 15:48:29 +0000 (Sat, 23 Apr 2016)
Log Message:
-----------
CustomButtonBarMenu: fix too long command FvwmScript error

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/CustomButtonBar-Menu

Modified: ChangeLog
===================================================================
--- ChangeLog	2016-04-23 14:43:07 UTC (rev 859)
+++ ChangeLog	2016-04-23 15:48:29 UTC (rev 860)
@@ -2,6 +2,9 @@
 
 samedi 23 avril
   addons/start_jack: updated to work well with the menu
+  functions/CustomButtonBarMenu: fix too long command FvwmScript error when editing the
+  preference file by using $EDITOR instead of FvwmScript, use FvwmForm to launch the help
+  by default.
 
 vendredi 22 avril
 + addons/start_jack, +addons/stop_jack, addons/README,

Modified: fvwm/components/functions/CustomButtonBar-Menu
===================================================================
--- fvwm/components/functions/CustomButtonBar-Menu	2016-04-23 14:43:07 UTC (rev 859)
+++ fvwm/components/functions/CustomButtonBar-Menu	2016-04-23 15:48:29 UTC (rev 860)
@@ -6,7 +6,7 @@
 # Author:	Dominique Michel <dom...@us...>	
 #
 # Created:	<04/19/2016>
-# Changed:	<04/22/2016>
+# Changed:	<04/19/2016>
 #
 # Description:	provide the preferences menu for the custom button bar in
 # FVWM-Crystal.
@@ -19,6 +19,7 @@
 #	- add support to change the icons order
 #	- add support for different buttons locations
 #	- add support for buttons like the ACPI applets, pager, music
+#	- MAKE THE BUTTON TO SHOW UP OUTSIDE THE BUTTON
 
 #Generate the temporary files
 PipeRead "if [ ! -e $[FVWM_USERDIR]/tmp/CustomBarApplications ] ; \
@@ -38,18 +39,56 @@
 
 DestroyFunc GenerateCustomButtonMenu
 AddToFunc GenerateCustomButtonMenu
-+ I PipeRead "$[FVWM_SYSTEMDIR]/scripts/CustomButtonBar/CustomButtonBarMenu
++ I PipeRead "$[FVWM_USERDIR]/scripts/CustomButtonBar/CustomButtonBarMenu
 + I Include tmp/CustomBarApplications
 
 DestroyFunc GenerateCustomButtonBar
 AddToFunc GenerateCustomButtonBar
-+ I PipeRead "$[FVWM_SYSTEMDIR]/scripts/CustomButtonBar/CustomButtonBar
++ I PipeRead "$[FVWM_USERDIR]/scripts/CustomButtonBar/CustomButtonBar
 + I Include tmp/CustomButtonBar
+All (CustomButtonBar-Dialog) Close
+DestroyModuleConfig CustomButtonBar-Dialog: *
+*CustomButtonBar-Dialog: Title "$[gt.Custom Button Bar]"
+*CustomButtonBar-Dialog: Text "$[gt.You are editing the file]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[FVWM_USERDIR]/Preferences/CustomButtonBar"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.Each line has the following format:]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.icon name command]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.where icon is the icon used for the button,]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.name is the button name]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.and command will be launched by the button.]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.icon and name must have no space,]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Text "$[gt.command can have spaces.]"
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Line center
+*CustomButtonBar-Dialog: Button quit " $[gt.OK] " ^[
+*CustomButtonBar-Dialog: Command Nop
+*CustomButtonBar-Dialog: Line center
 
+DestroyFunc EditCustomPref
+AddToFunc EditCustomPref
++ I A $[EDITOR] $[FVWM_USERDIR]/preferences/CustomButtonBar
++ I Module FvwmForm CustomButtonBar-Dialog
+
 # Use DynamicPopUpAction; the menu can be redifined into the recipe
 DestroyMenu /FVWM-CustomButtonMenu
 AddToMenu /FVWM-CustomButtonMenu
-+ '%32x32/fvwm-crystal/fvwm-crystal.png%$[gt.Preferences editor]' LaunchFileWithHelp CustomButtonBar
++ '%32x32/fvwm-crystal/fvwm-crystal.png%$[gt.Preferences editor]' EditCustomPref
 + '%32x32/fvwm-crystal/fvwm-crystal.png%$[gt.Generate this Menu]' GenerateCustomButtonMenu
 + '%32x32/fvwm-crystal/fvwm-crystal.png%$[gt.Generate the custom buttons bar]' GenerateCustomButtonBar
 + '%32x32/fvwm-crystal/audio-x-generic.png%$[gt.Music]' AddCustomButton 48x48/fvwm-crystal/audio-x-generic.png%$[gt.Music]%Popup /Music

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.