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

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

Revision: 467
          http://sourceforge.net/p/fvwm-crystal/code/467
Author:   dominique_libre
Date:     2013-05-25 09:47:54 +0000 (Sat, 25 May 2013)
Log Message:
-----------
functions/Preferences-Menu: avoid logout and restart with FVWM-Crystal Desktop Icons when possible.

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-05-25 08:30:32 UTC (rev 466)
+++ ChangeLog	2013-05-25 09:47:54 UTC (rev 467)
@@ -8,7 +8,9 @@
 + scripts/DesktopCheckMounts: renamed DesktopIcons helper script.
 + script/DesktopAcrions: new DesktopIcons helper script: it generate the
   actions prefernces menu.
-
+  functions/Preferences-Menu: avoid logout and restart with FVWM-Crystal Desktop
+  Icons when possible.
+ 
 Vendredi 23 Mai 2013 Dominique Michel
   functions/FvwmExpose: silent xwd
   apps/Thunar: add preliminary preference support for the action 1 and 2

Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu	2013-05-25 08:30:32 UTC (rev 466)
+++ fvwm/components/functions/Preferences-Menu	2013-05-25 09:47:54 UTC (rev 467)
@@ -224,12 +224,34 @@
 #
 DestroyMenu /Preferences/DesktopManager
 AddToMenu /Preferences/DesktopManager
-+ '%22x22/fvwm-crystal/Off.png%$[gt.None]' ActivateDesktopManager-None
-+ '%22x22/fvwm-crystal/fvwm-crystal.png%FVWM-Crystal' ActivateDesktopManager-Crystal
++ '%22x22/fvwm-crystal/Off.png%$[gt.None]' TestDesktopManager-None
++ '%22x22/fvwm-crystal/fvwm-crystal.png%FVWM-Crystal' TestDesktopManager-Crystal
 + "" Nop
 Test (x rox) + '%22x22/apps/rox.png%ROX-Filer' ActivateDesktopManager-ROX
 Test (x nautilus) + '%22x22/apps/nautilus.png%Nautilus' ActivateDesktopManager-Nautilus
 
+DestroyFunc TestDesktopManager-None
+AddToFunc TestDesktopManager-None
++ I PipeRead 'pidof nautilus $[infostore.SILENT] || pidof rox $[infostore.SILENT] || echo LaunchDesktopManager-None'
++ I PipeRead 'pidof nautilus $[infostore.SILENT] || pidof rox $[infostore.SILENT] && echo ActivateDesktopManager-None'
+
+DestroyFunc TestDesktopManager-Crystal
+AddToFunc TestDesktopManager-Crystal
++ I PipeRead 'pidof nautilus $[infostore.SILENT] || pidof rox $[infostore.SILENT] || echo LaunchDesktopManager-Crystal'
++ I PipeRead 'pidof nautilus $[infostore.SILENT] || pidof rox $[infostore.SILENT] && echo ActivateDesktopManager-Crystal'
+
+DestroyFunc LaunchDesktopManager-None
+AddToFunc LaunchDesktopManager-None
++ I SavePreferences DefaultDesktopManager "LoadPreferences LastChoosenWallpaper"
++ I Exec exec killall -9 DesktopCheckMounts $[infostore.SILENT]
++ I KillModule FvwmButtons DesktopIcons
++ I DestroyModuleConfig DesktopIcons: *
+
+DestroyFunc LaunchDesktopManager-Crystal
+AddToFunc LaunchDesktopManager-Crystal
++ I SavePreferences DefaultDesktopManager "Include components/apps/DesktopIcons"
++ I Include components/apps/DesktopIcons
+
 DestroyFunc ActivateDesktopManager-None
 AddToFunc ActivateDesktopManager-None
 + I SavePreferences DefaultDesktopManager "LoadPreferences LastChoosenWallpaper"

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