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

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

Revision: 655
          http://sourceforge.net/p/fvwm-crystal/code/655
Author:   dominique_libre
Date:     2014-10-28 17:26:16 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
functions/Preferences: copy ShowDirectories pref file to the user directory. functions/Preferences-Menu: see ChangeLog

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2014-10-28 17:18:07 UTC (rev 654)
+++ ChangeLog	2014-10-28 17:26:16 UTC (rev 655)
@@ -13,6 +13,10 @@
   functions/Fullscreen: Updated comments.
   functions/Mixer, functions/Tooltip, functions/LoadCommonStuffs: made the tool tip function
   to work, load it and use it for the volume key bindings.
+  functions/Preferences: copy ShowDirectories pref file to the user directory.
+  functions/Preferences-Menu: put the FileEditor launcher into a function and call it from the menu,
+  use the defaul fvwm-menu-desktop menu file location in $FVWM_USERDIR/.menu,
+  add a wallpaper thumbnail size menu, launch ShowDirectories from the file editor function.
 
 vendredi 17 octobre 2014
   script PrefVars: Add the full screen by default preference into the editor.

Modified: fvwm/components/functions/Preferences
===================================================================
--- fvwm/components/functions/Preferences	2014-10-28 17:18:07 UTC (rev 654)
+++ fvwm/components/functions/Preferences	2014-10-28 17:26:16 UTC (rev 655)
@@ -78,10 +78,15 @@
 # If it's found, nothing is done, if it's not found, the first file found
 # in the config-wide or system-wide directories is copied to the user-wide
 # directory.
+#
+# Example: See below.
+#
 DestroyFunc CopyPreferences
 AddToFunc CopyPreferences
 + I Test (f $[FVWM_USERDIR]/preferences/$0) Break
 + I Test (f $[FVWM_CONFIGDIR]/preferences/$0) Exec exec cp $[FVWM_CONFIGDIR]/preferences/$0 $[FVWM_USERDIR]/preferences/
 + I TestRC (NoMatch) Test (f $[FVWM_SYSTEMDIR]/preferences/$0) Exec exec cp $[FVWM_SYSTEMDIR]/preferences/$0 $[FVWM_USERDIR]/preferences/
 
+CopyPreferences ShowDirectories
+
 # vim:ft=fvwm

Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu	2014-10-28 17:18:07 UTC (rev 654)
+++ fvwm/components/functions/Preferences-Menu	2014-10-28 17:26:16 UTC (rev 655)
@@ -25,7 +25,7 @@
 + "" Nop
 + '%22x22/fvwm-crystal/applications.png%$[gt.Generate application menu]'	GenerateApplicationMenu
 + '%22x22/fvwm-crystal/silent.png%$[gt.Silent operations]'	Popup /Preferences/SilentOps
-+ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Preferences editor]' Script scripts/PrefVars/PrefVars
++ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Preferences editor]' LaunchPrefEditors
 + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Key binding modifiers editor]' Script scripts/KeyModifiersEditor/KeyModifiersEditor
 
 #
@@ -396,7 +396,7 @@
 DestroyFunc SetXDGMenu
 AddToFunc SetXDGMenu
 + I SavePreferences XDGMenu "SetEnv XDGMenu yes"
-+ I Include tmp/XDGMenu
++ I Include .menu
 + I Key A A $[Mod1] Menu FvwmMenu
 + I Key A A $[Mod1]2 Menu FvwmMenu
 
@@ -707,20 +707,39 @@
 + I Include components/functions/Exec-Accelerator
 
 #
+# Launch Preference Editors
+#
+# To avoid duplicated text
+Include scripts/FileEditors/ShowDirectories-Help
+
+# the file to edit must be in $[FVWM_USERDIR]/preferences
+# see apps/DesktopIcons and scripts/FileEditors/*
+DestroyFunc LaunchFileWithHelp
+AddToFunc LaunchFileWithHelp
++ I SetEnv FileEditWithHelp $0
++ I Script scripts/FileEditors/FileEditWithHelp
++ I UnsetEnv FileEditWithHelp
+
+DestroyFunc LaunchPrefEditors
+AddToFunc LaunchPrefEditors
++ I Script scripts/PrefVars/PrefVars
++ I LaunchFileWithHelp ShowDirectories
+
+#
 # Wallpaper thumbnails size
 #
 # See Wallpaper
-#DestroyMenu /WPThumbSize
-#AddToMenu /WPThumbSize
-#+ "42" WPThumbSize 42
-#+ "96" WPThumbSize 96
-#+ "120" WPThumbSize 120
-#+ "180" WPThumbSize 180
+DestroyMenu /WPThumbSize
+AddToMenu /WPThumbSize
++ "42" WPThumbSize 42
++ "96" WPThumbSize 96
++ "120" WPThumbSize 120
++ "180" WPThumbSize 180
 
 DestroyFunc WPThumbSize
 AddToFunc WPThumbSize
 + I InfoStoreAdd WallpaperThumbSize $0
 + I SavePreferences WallpaperThumbSize "InfoStoreAdd WallpaperThumbSize $0"
-+ I Include components/functions/Wallpaper
++ I Schedule 300 Include components/functions/Wallpaper
 
 # vim:ft=fvwm

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