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

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

Revision: 134
          http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=134&view=rev
Author:   dominique_libre
Date:     2012-12-11 19:00:59 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix for multiple prefernces (add Schedule to the AppendPreferences calls)

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2012-10-07 15:39:37 UTC (rev 133)
+++ ChangeLog	2012-12-11 19:00:59 UTC (rev 134)
@@ -1,5 +1,9 @@
 ChangeLog for FVWM-Crystal
 
+Mercredi 11 Decembre 2012 Dominique Michel
+  components/functions/Preferences, components/functions/Preferences-Menu:
+  * Fix multiple preferences: Added Shedule to AppendPreferences functions
+
 Dimanche 7 Octibre 2012 Dominique Michel
   Added a few needed icons
   components/functions/Preferences-Menu:

Modified: fvwm/components/functions/Preferences
===================================================================
--- fvwm/components/functions/Preferences	2012-10-07 15:39:37 UTC (rev 133)
+++ fvwm/components/functions/Preferences	2012-12-11 19:00:59 UTC (rev 134)
@@ -20,7 +20,12 @@
 + I Exec echo $1 > $[FVWM_USERDIR]/preferences/$0
 
 # Modification of SavePreferences: add more lines to the preferences file
+# Must be used in conjonction with Schedule or the synchronization will be lost
 #
+# Exemple:
+# SavePreferences PreferencesFile "Echo \"FVWM command\""
+# Schedule 333 AppendPreferences PreferencesFile OtherCommand
+#
 DestroyFunc AppendPreferences
 AddToFunc AppendPreferences
 + I Exec touch $[FVWM_USERDIR]/preferences/$0

Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu	2012-10-07 15:39:37 UTC (rev 133)
+++ fvwm/components/functions/Preferences-Menu	2012-12-11 19:00:59 UTC (rev 134)
@@ -8,7 +8,7 @@
 + '%22x22/fvwm-crystal/user-desktop.png%$[gt.Used recipe]'		Popup /Preferences/Recipes
 + '%22x22/fvwm-crystal/font.png%$[gt.Characters fonts]'		Popup /Preferences/Fonts
 + '%22x22/fvwm-crystal/font.png%$[gt.Fonts sizes]'		Popup /Preferences/FontSizes
-Test (x xcompmgr) Test (x transset-df) + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Transparency]'		Popup /Preferences/Transparency
+Test (x xcompmgr) Test (x transset) + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Transparency]'		Popup /Preferences/Transparency
 + '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.Default terminal]'	Popup /Preferences/DefaultTerminal
 + '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.FvwmConsole terminal]'	Popup /Preferences/FvwmConsoleTerminal
 + '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.QuakeConsole terminal]'	Popup /Preferences/QuakeConsoleTerminal
@@ -291,8 +291,8 @@
 #
 DestroyMenu /Preferences/NotificationAreaManager
 AddToMenu /Preferences/NotificationAreaManager
-Test (x trayer)		+ '%22x22/fvwm-crystal/trayer-app.png%Trayer' SelectNotificationAreaManager trayer
-Test (x stalonetray)	+ '%22x22/fvwm-crystal/stalonetray-app.png%StaloneTray' SelectNotificationAreaManager stalonetray
+Test (x trayer)		+ '%22x22/apps/trayer.png%Trayer' SelectNotificationAreaManager trayer
+Test (x stalonetray)	+ '%22x22/apps/stalonetray.png%StaloneTray' SelectNotificationAreaManager stalonetray
 + '%22x22/fvwm-crystal/trayer-app.png%$[gt.No notification area]' NotificationAreaWidth 0
 + '%22x22/fvwm-crystal/trayer-app.png%$[gt.1 icon width]' NotificationAreaWidth 1
 + '%22x22/fvwm-crystal/trayer-app.png%$[gt.2 icons width]' NotificationAreaWidth 2
@@ -431,23 +431,23 @@
 DestroyFunc SetPrivilegedTerminals
 AddToFunc SetPrivilegedTerminals
 + I SavePreferences PrivilegedTerminals "Style XTerm FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style URxvt FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style Eterm FPOverrideGrabFocus"
-+ I LoadPreferences PrivilegedTerminals
++ I Schedule 333 AppendPreferences PrivilegedTerminals "Style URxvt FPOverrideGrabFocus"
++ I Schedule 666 AppendPreferences PrivilegedTerminals "Style Eterm FPOverrideGrabFocus"
++ I Schedule 1000 LoadPreferences PrivilegedTerminals
 
 DestroyFunc UnsetPrivilegedTerminals
 AddToFunc UnsetPrivilegedTerminals
 + I SavePreferences PrivilegedTerminals "Style XTerm !FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style URxvt !FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style Eterm !FPOverrideGrabFocus"
-+ I LoadPreferences PrivilegedTerminals
++ I Schedule 333 AppendPreferences PrivilegedTerminals "Style URxvt !FPOverrideGrabFocus"
++ I Schedule 666 AppendPreferences PrivilegedTerminals "Style Eterm !FPOverrideGrabFocus"
++ I Schedule 1000 LoadPreferences PrivilegedTerminals
 
 #
 # Application menu
 #
 DestroyFunc GenerateApplicationMenu
 AddToFunc GenerateApplicationMenu
-+ I A "fvwm-crystal.generate-menu $[FVWM_SYSTEMDIR] $[FVWM_USERDIR]"
++ I A fvwm-crystal.generate-menu $[FVWM_SYSTEMDIR] $[FVWM_USERDIR]
 
 All (Menu-Restart-Dialog) Close
 DestroyModuleConfig Menu-Restart-Dialog: *

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