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

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

Revision: 761
          http://sourceforge.net/p/fvwm-crystal/code/761
Author:   dominique_libre
Date:     2015-10-25 18:39:21 +0000 (Sun, 25 Oct 2015)
Log Message:
-----------
Use State 30 to control which windows are put on top

Modified Paths:
--------------
    ChangeLog
    fvwm/components/apps/DesktopIcons
    fvwm/components/functions/Panel-Display
    fvwm/components/styles/FVWM

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-10-25 17:42:02 UTC (rev 760)
+++ ChangeLog	2015-10-25 18:39:21 UTC (rev 761)
@@ -7,6 +7,9 @@
   scripts/FileEditors/FileEditWithHelp, functions/Preferences-Menu: Fix file saving: fix
   loading and removal of temporary environmental variable.
   apps/DesktopIcons: Add preference setting to put or not the desktop icons on top with the panel.
+  It now use State 30 to which windows are put on top. State 31 remain to put them to bottom.
+  styles/FVWM: add State 30 style to the FVWM parts.
+  Panel-Display: Use State 30 to control which windows are put on top.
 
 Vendredi 23 octobre 2015
   bindings/Desktop-MMB-TogglePanels: new binding to toggle on top the panels; changed the

Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons	2015-10-25 17:42:02 UTC (rev 760)
+++ fvwm/components/apps/DesktopIcons	2015-10-25 18:39:21 UTC (rev 761)
@@ -27,6 +27,7 @@
 LoadPreferences FileBrowser1
 LoadPreferences FileBrowser2
 LoadPreferences DeskIconsSign.$[infostore.Recipe]
+LoadPreferences DeskIconsOnTop
 
 # For the recipes
 SetEnv DefaultDesktopManager Crystal
@@ -149,7 +150,7 @@
 + I AddToMenu $0 '$[gt.Show directories]' LaunchFileWithHelp ShowDirectories
 + I AddToMenu $0 '$[gt.Actions]' PopUp /Preferences/FileBrowser
 + I AddToMenu $0 '$[gt.Emplacement]' Popup /Preferences/DeskIconsPlace
-+ I AddToMenu $0 '$[gt.Show on top with panel]' Popup /Preferences/DeskIconsTop
++ I AddToMenu $0 '$[gt.Show on top with panels]' Popup /Preferences/DeskIconsTop
 
 DestroyMenu /Preferences/XDG
 AddToMenu /Preferences/XDG
@@ -279,12 +280,12 @@
 
 DestroyFunc DeskIconsOnTop
 AddToFunc DeskIconsOnTop
-+ I SavePreferences DeskIconsOnTop "All (DesktopIcons) WindowStyle State 31"
-+ I All (DesktopIcons) WindowStyle State 31
++ I SavePreferences DeskIconsOnTop "Style DesktopIcons State 30"
++ I All (DesktopIcons) WindowStyle State 30
 
 DestroyFunc DeskIconsOnBottom
 AddToFunc DeskIconsOnBottom
-+ I SavePreferences DeskIconsOnTop "All (DesktopIcons) WindowStyle !State 31"
-+ I All (DesktopIcons) WindowStyle !State 31
++ I SavePreferences DeskIconsOnTop "Style DesktopIcons !State 30"
++ I All (DesktopIcons) WindowStyle !State 30
 
 # vim:ft=fvwm

Modified: fvwm/components/functions/Panel-Display
===================================================================
--- fvwm/components/functions/Panel-Display	2015-10-25 17:42:02 UTC (rev 760)
+++ fvwm/components/functions/Panel-Display	2015-10-25 18:39:21 UTC (rev 761)
@@ -17,7 +17,7 @@
 # State 31 true, State 1 true => on bottom, false => on top 
 DestroyFunc Panel-Toggle-OnTop
 AddToFunc Panel-Toggle-OnTop
-+ I All (State 31, State 1) WindowStyle StaysOnTop, !State 1
++ I All (State 30, State 1) WindowStyle StaysOnTop, !State 1
 + I TestRc (NoMatch) All (State 31) WindowStyle StaysOnBottom, State 1
 PipeRead "if [ \"$(echo $[infostore.Fvwm_Crystal_Recipe]| sed -e 's:.*Amiga:Amiga:')\" = \"Amiga\" ]; then echo '+ I Schedule 100 Restore-TopBar-RaiseLower'; fi"
 
@@ -47,31 +47,4 @@
 
 #EdgeCommand Top Toggle-TopBar-OnTop
 
-
-# Show on top bottom panels {{{2
-#DestroyFunc Toggle-BottomBar-OnTop
-#AddToFunc Toggle-BottomBar-OnTop
-#+ I Next (FvwmButtons-Bottom, !State 1) PutBottomBar-OnTop
-#+ I TestRc (NoMatch) PutBottomBar-OnBottom
-
-#DestroyFunc PutBottomBar-OnTop
-#AddToFunc PutBottomBar-OnTop
-#+ I All (FvwmButtons-BottomSwitchPanel) PutOnTop
-#+ I All (FvwmButtons-Bottom) PutOnTop
-#+ I All (FvwmButtons-BottomNotifAera) PutOnTop
-#+ I All (trayer) PutOnTop
-#+ I All (FvwmButtons-BottomSwitchPanel2) PutOnTop
-#+ I All (ApplicationPanel) PutOnTop
-#+ I All (FvwmPager PutOnTop
-
-DestroyFunc PutBottomBar-OnBottom
-AddToFunc PutBottomBar-OnBottom
-#+ I All (FvwmButtons-BottomSwitchPanel) PutOnBottom
-#+ I All (FvwmButtons-Bottom) PutOnBottom
-#+ I All (FvwmButtons-BottomNotifAera) PutOnBottom
-#+ I All (trayer) PutOnBottom
-#+ I All (FvwmButtons-BottomSwitchPanel2) PutOnBottom
-#+ I All (ApplicationPanel) PutOnBottom
-#+ I All (FvwmPager) PutOnBottom
-
-#EdgeCommand Bottom Toggle-BottomBar-OnTop
+# vim:ft=fvwm

Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM	2015-10-25 17:42:02 UTC (rev 760)
+++ fvwm/components/styles/FVWM	2015-10-25 18:39:21 UTC (rev 761)
@@ -15,7 +15,7 @@
       FixedSize, StaysOnBottom, !Handles, BorderWidth 1, HandleWidth 1, \
       NoTitle, NoIcon, Colorset $[infostore.cs_panel_border], \
       BorderColorset $[infostore.cs_panel_border], HilightColorset $[infostore.cs_panel_border], \
-      HilightBorderColorset $[infostore.cs_panel_border], ParentalRelativity, State 31, State 1
+      HilightBorderColorset $[infostore.cs_panel_border], ParentalRelativity, State 31, State 30, State 1
 
 Style FvwmButtons UseStyle FvwmParts
 Style FvwmPager UseStyle FvwmParts
@@ -44,7 +44,7 @@
 
 # GKrellM settings
 Style gkrellm		NoTitle, StaysOnBottom, Sticky, NoIcon, NeverFocus, \
-			FixedSize, WindowListSkip, FixedPosition, !Borders, State 31, State 1
+			FixedSize, WindowListSkip, FixedPosition, !Borders, State 31, State 30, State 1
 Style gkrellm2		UseStyle gkrellm
 Style gDeskCal		UseStyle gkrellm
 

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