Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[755]
|
From: <dom...@us...> - 2015-10-21 16:18:16
|
Revision: 755
http://sourceforge.net/p/fvwm-crystal/code/755
Author: dominique_libre
Date: 2015-10-21 16:18:13 +0000 (Wed, 21 Oct 2015)
Log Message:
-----------
Preferences-Menu: Fix bashism, recipes/Amiga: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
fvwm/recipes/Amiga
tmp/recipes/Amiga
Modified: ChangeLog
===================================================================
--- ChangeLog 2015-10-20 18:40:36 UTC (rev 754)
+++ ChangeLog 2015-10-21 16:18:13 UTC (rev 755)
@@ -3,6 +3,10 @@
Version 3.4.0
-------------
+Mercredi 21 octobre 2015
+ functions/Preferences-Menu: Fix bashism.
+ recipes/Amiga: cleanup
+
Lundi 19 octobre 2015
bin/fvwm-crystal.infoline: Fix free memory variable.
recipes/Amiga|LapLeft|LApLeft with ACPI|LapRight|LapRight with ACPI|Nebulae: Fix the Pager
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2015-10-20 18:40:36 UTC (rev 754)
+++ fvwm/components/functions/Preferences-Menu 2015-10-21 16:18:13 UTC (rev 755)
@@ -41,7 +41,7 @@
+ I Exec exec killall stalonetray $[infostore.SILENT]
+ I Exec exec killall trayer $[infostore.SILENT]
+ I Exec exec killall UpdateInfoline $[infostore.SILENT]
-+ I PipeRead "if [[ '$*' != '' ]]; \
++ I PipeRead "if [ '$*' != '' ]; \
then echo Read \\'$*\\'; \
else echo Read \\'$[infostore.Fvwm_Crystal_Recipe]\\'; fi"
@@ -658,6 +658,7 @@
DestroyFunc GenerateApplicationMenu
AddToFunc GenerateApplicationMenu
+ I A fvwm-crystal.generate-menu $[FVWM_SYSTEMDIR] $[FVWM_USERDIR]
+#+ I Test (EnvMatch XDGMenu yes) A $[FVWM_SYSTEMDIR]/scripts/XDG-Menu
All (Menu-Restart-Dialog) Close
DestroyModuleConfig Menu-Restart-Dialog: *
Modified: fvwm/recipes/Amiga
===================================================================
--- fvwm/recipes/Amiga 2015-10-20 18:40:36 UTC (rev 754)
+++ fvwm/recipes/Amiga 2015-10-21 16:18:13 UTC (rev 755)
@@ -36,7 +36,8 @@
InfoStoreAdd Recipe "Amiga"
# temporary fix for fvwm<2.6.6
-SetEnv NotificationAreaManager $[infostore.NotificationAreaManager]
+# TODO: test it with 2.6.5, normaly not needed any more
+Test (Version <= 2.6.5) SetEnv NotificationAreaManager $[infostore.NotificationAreaManager]
# user's id
PipeRead 'echo InfoStoreAdd Your_Id `id -un | sed "s/\\\<./\\\u&/"`'
@@ -45,7 +46,7 @@
# Includes and FVWM modules {{{1
Include components/functions/Window-Autohide
-#Include components/functions/MakePanel
+Include components/functions/MakePanel
Include components/functions/FocusOnGotoPage
Include components/bindings/Desktop-MMB-ToggleTopBar
@@ -492,21 +493,21 @@
# Notification aera {{{2
# Settings of stalonetray
Test (!EnvMatch trayer_width 0) \
- Test (EnvMatch NotificationAreaManager stalonetray) PipeRead 'echo FvwmStalonePanel \
+PipeRead 'if [ "$[infostore.NotificationAreaManager]" = "stalonetray" ]; then echo FvwmStalonePanel \
$[infostore.bottom_panel_height] $(($[trayer_width]/24)) 1 \
+$(($((5*$[infostore.bottom_panel_height]))+2)) "-1" NE $[trayer_width] $[infostore.bottom_panel_height] \
- +$(($((5*$[infostore.bottom_panel_height]))+2)) "-1"'
+ +$(($((5*$[infostore.bottom_panel_height]))+2)) "-1"; fi'
# Settings of trayer
Test (!EnvMatch trayer_width 0) \
- Test (EnvMatch NotificationAreaManager trayer) PipeRead 'echo FvwmTrayerPanel \
+ PipeRead 'if [ "$[infostore.NotificationAreaManager]" = "trayer" ]; then echo FvwmTrayerPanel \
pixel pixel $(($[infostore.bottom_panel_height]+2)) bottom left $(($(($[infostore.bottom_panel_height]*5))+2)) \
- "-1" \\"--width $(($(($(($[trayer_width]*$[infostore.bottom_panel_height]))/24))+1))\\"'
+ "-1" \\"--width $(($(($(($[trayer_width]*$[infostore.bottom_panel_height]))/24))+1))\\"; fi'
# The button
Test (!EnvMatch trayer_width 0) \
-PipeRead 'if [ "$[infostore.NotificationAreaManager]" = "stalonetray" ]; then echo "*FvwmButtons-Bottom: ($(($[trayer_width]/24))x1, \
- Size $[infostore.NotifWidth] $[infostore.bottom_panel_height], Swallow (Close, Respawn, FvwmModule) FvwmStalonePanel Nop)"; \
- else echo "*FvwmButtons-Bottom: ($(($[trayer_width]/24))x1, Size $[infostore.NotifWidth] $[infostore.bottom_panel_height], \
- Swallow (UseOld, FvwmModule) trayer Nop)"; fi'
+PipeRead 'if [ "$[infostore.NotificationAreaManager]" = "stalonetray" ]; then echo *FvwmButtons-Bottom: \\($(($[trayer_width]/24))x1, \
+ Size $[infostore.NotifWidth] $[infostore.bottom_panel_height], Swallow \\(Close, Respawn, FvwmModule\\) FvwmStalonePanel Nop\\); \
+ else echo *FvwmButtons-Bottom: \\($(($[trayer_width]/24))x1, Size $[infostore.NotifWidth] $[infostore.bottom_panel_height], \
+ Swallow \\(UseOld, FvwmModule\\) trayer Nop\\); fi'
Module FvwmButtons FvwmButtons-Bottom
@@ -562,29 +563,6 @@
Module FvwmButtons ApplicationPanel
-# Toggle the whole topbar and pager between the top and bottom layers {{{1
-# bindings in components/bindings/Desktop-MMB-ToggleTopBar (Alt-MMB)
-# MMB Toggle-TopBar-OnTop 1{{{
-DestroyFunc Toggle-TopBar-OnTop
-AddToFunc Toggle-TopBar-OnTop
-+ I All (FvwmButtons-PanelTop, !State 1) PutTopBar-OnTop
-+ I TestRc (NoMatch) PutTopBar-OnBottom
-+ I Restore-TopBar-RaiseLower
-
-DestroyFunc PutTopBar-OnTop
-AddToFunc PutTopBar-OnTop
-+ I All (FvwmButtons-PanelTop) PutOnTop
-+ I All (FvwmButtons-Pager) PutOnTop
-+ I All (FvwmPager) PutOnTop
-+ I All (FvwmButtons-PanelTopMenu) PutOnTop
-
-DestroyFunc PutTopBar-OnBottom
-AddToFunc PutTopBar-OnBottom
-+ I All (FvwmButtons-PanelTop) PutOnBottom
-+ I All (FvwmButtons-Pager) PutOnBottom
-+ I All (FvwmPager) PutOnBottom
-+ I All (FvwmButtons-PanelTopMenu) PutOnBottom
-
# Used from the topbars, toggle the topbars between each other
DestroyFunc Toggle-TopBar-RaiseLower
AddToFunc Toggle-TopBar-RaiseLower
@@ -606,48 +584,10 @@
+ I All (FvwmButtons-PanelTop, !State 3) TopBar-Lower
+ I TestRc (NoMatch) TopBar-Raise
-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
-
-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
-
-EdgeCommand Bottom Toggle-BottomBar-OnTop
-
-# 2{{{
-#DestroyFunc Toggle-Pager
-#AddToFunc Toggle-Pager
-#+ I All (FvwmButtons-Pager) ToggleWindowOnTop
-#+ I All (FvwmPager) ToggleWindowOnTop
-
-#EdgeCommand Top Toggle-Pager
-
-
# Override FVWM style (it's applied later) {{{1
Style FvwmButtons-Bottom BorderWidth 0
#Style FvwmButtons-Music NoIcon
Style FvwmButtons-BottomNotifAera NoIcon
-Style FvwmStalonePanel NoIcon
Style ApplicationPanel NoIcon
Style FvwmButtons-BottomSwitchPanel NoIcon
Style FvwmButtons-BottomSwitchPanel2 NoIcon
Modified: tmp/recipes/Amiga
===================================================================
--- tmp/recipes/Amiga 2015-10-20 18:40:36 UTC (rev 754)
+++ tmp/recipes/Amiga 2015-10-21 16:18:13 UTC (rev 755)
@@ -588,7 +588,6 @@
Style FvwmButtons-Bottom BorderWidth 0
#Style FvwmButtons-Music NoIcon
Style FvwmButtons-BottomNotifAera NoIcon
-Style FvwmStalonePanel NoIcon
Style ApplicationPanel NoIcon
Style FvwmButtons-BottomSwitchPanel NoIcon
Style FvwmButtons-BottomSwitchPanel2 NoIcon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
