Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[37] fvwm/components/functions
|
From: <dom...@us...> - 2010-12-22 20:02:06
|
Revision: 37
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=37&view=rev
Author: dominique_libre
Date: 2010-12-22 20:02:00 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Added multiline preferences with replacement of similar lines, removed the Music preferences from the main preference menu, will be moved later into the Music button menu.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 19:47:32 UTC (rev 36)
+++ ChangeLog 2010-12-22 20:02:00 UTC (rev 37)
@@ -10,7 +10,10 @@
* Fixed the style order loading causing non wanted effect after restart.
Hope it work well now. This one was hard to figure out.
* Moved "include Fullscreen" into the recipes.
-
+ * Added multiline preference function
+ * Removed Music preferences form the main preference.
+ Will be incorporated into the Music button.
+
Mardi 22 décembre 2010 Dominique Michel
The commit list bounced here too !
* New Maximize functions and associated bindings
Modified: fvwm/components/functions/Preferences
===================================================================
--- fvwm/components/functions/Preferences 2010-12-22 19:47:32 UTC (rev 36)
+++ fvwm/components/functions/Preferences 2010-12-22 20:02:00 UTC (rev 37)
@@ -29,6 +29,18 @@
# + I Exec touch $[FVWM_USERDIR]/preferences/$0
# + I Exec echo $1 >> $[FVWM_USERDIR]/preferences/$0
+# add or update one line into the preferences file
+#
+# UpdateAppendPreferences <preferences-file> "<command>" "<begining of the line>"
+# where <begining of the line> must be unique into the file.
+DestroyFunc UpdateAppendPreferences
+AddToFunc UpdateAppendPreferences
++ I Exec exec touch $[FVWM_USERDIR]/preferences/"$0"
++ I PipeRead 'mv $[FVWM_USERDIR]/preferences/"$0" $[FVWM_USERDIR]/preferences/"$0".tmp; \
+ sed "/^$2.*/d" $[FVWM_USERDIR]/preferences/"$0".tmp > $[FVWM_USERDIR]/preferences/"$0"; \
+ rm $[FVWM_USERDIR]/preferences/"$0".tmp; \
+ echo "$1" >> $[FVWM_USERDIR]/preferences/"$0"'
+
# This function looks for saved preferences file and reads it. All directories
# (user-wide, system-wide, package-wide) are searched, first file found is
# loaded.
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2010-12-22 19:47:32 UTC (rev 36)
+++ fvwm/components/functions/Preferences-Menu 2010-12-22 20:02:00 UTC (rev 37)
@@ -1,13 +1,13 @@
# Menu with preferences
#
+# The Music player and Audio mixer prefs menu appears into the Music button menu.
DestroyMenu /Preferences
AddToMenu /Preferences
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Used recipe]' Popup /Preferences/Recipes
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Characters fonts]' Popup /Preferences/Fonts
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Font Sizes]' Popup /Preferences/FontSizes
-+ '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
-+ '%22x22/fvwm-crystal/multimedia-volume-control.png%$[gt.Audio mixer]' Popup /Preferences/Mixer
+ '%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
+ '%22x22/fvwm-crystal/system-file-manager.png%$[gt.Desktop manager]' Popup /Preferences/DesktopManager
+ '%22x22/fvwm-crystal/trayer-app.png%$[gt.Notification area manager]' Popup /preferences/NotificationAreaManager
@@ -16,41 +16,43 @@
+ '$[gt.Privileged terminals]' Popup /Preferences/PrivilegedTerminals
#
-# Default terminal
+# Used recipe
#
-DestroyMenu /Preferences/DefaultTerminal
-AddToMenu /Preferences/DefaultTerminal
-Test (x gnome-terminal) + '%22x22/apps/gnome-terminal.png%GNOME Terminal' SelectDefaultTerminal gnome-terminal
-Test (x multi-gnome-terminal) + '%22x22/apps/multi-gnome-terminal.png%Multi GNOME Terminal' SelectDefaultTerminal multi-gnome-terminal
-Test (x xfce4-terminal) + '%22x22/apps/xfce4-terminal.png%XFCE4 Terminal' SelectDefaultTerminal xfce4-terminal
-Test (x terminator) + '%22x22/apps/terminator.png%Terminator' SelectDefaultTerminal terminator
-Test (x mrxvt) + '%22x22/apps/mrxvt.png%MRxvt' SelectDefaultTerminal mrxvt
-Test (x urxvt) + '%22x22/apps/urxvt.png%URxvt' SelectDefaultTerminal urxvt
-Test (x aterm) + '%22x22/apps/aterm.png%Aterm' SelectDefaultTerminal aterm
-Test (x xterm) + '%22x22/apps/xterm.png%XTerm' SelectDefaultTerminal xterm
+DestroyMenu /Preferences/Recipes
+AddToMenu /Preferences/Recipes
++ MissingSubmenuFunction Recipes-generator
++ '%22x22/categories/directory.png%$[gt.System]' Popup $[FVWM_SYSTEMDIR]/recipes
+Test (f $[FVWM_USERDIR]/recipes) + '%22x22/categories/directory.png%$[gt.User]' Popup $[FVWM_USERDIR]/recipes
-DestroyFunc SelectDefaultTerminal
-AddToFunc SelectDefaultTerminal
-+ I FindCommand DefaultTerminal $0 terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal
-+ I SavePreferences DefaultTerminal "FindCommand DefaultTerminal $0 terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal"
+DestroyFunc Recipes-generator
+AddToFunc Recipes-generator
++ I DestroyMenu recreate $0
++ I AddToMenu $0
++ I PipeRead 'for i in $0/*; do \
+ name=$(basename "${i}"); \
+ echo \"AddToMenu $0 \'${name}\' Recipe-Set \'${i}\'\"; done'
-#
-# QuakeConsole terminal
-#
-DestroyMenu /Preferences/QuakeConsoleTerminal
-AddToMenu /Preferences/QuakeConsoleTerminal
-Test (x mrxvt) + '%22x22/apps/mrxvt.png%MRxvt' SelectQuakeConsoleTerminal mrxvt
-Test (x urxvt) + '%22x22/apps/urxvt.png%URxvt' SelectQuakeConsoleTerminal urxvt
-Test (x aterm) + '%22x22/apps/aterm.png%Aterm' SelectQuakeConsoleTerminal aterm
-Test (x xterm) + '%22x22/apps/xterm.png%XTerm' SelectQuakeConsoleTerminal xterm
+DestroyFunc Recipe-Set
+AddToFunc Recipe-Set
++ I SetEnv Fvwm_Crystal_Recipe "$*"
++ I SavePreferences LastChoosenRecipe "SetEnv Fvwm_Crystal_Recipe \"$*\""
++ I AppendPreferences LastChoosenRecipe "Read $[Fvwm_Crystal_Recipe]"
++ I Module FvwmForm Recipe-Restart-Dialog
-DestroyFunc SelectQuakeConsoleTerminal
-AddToFunc SelectQuakeConsoleTerminal
-+ I FindCommand QuakeConsoleTerminal $0 mrxvt urxvt aterm xterm
-+ I SavePreferences QuakeConsoleTerminal "FindCommand QuakeConsoleTerminal $0 mrxvt urxvt aterm xterm"
+All (Recipe-Restart-Dialog) Close
+DestroyModuleConfig Recipe-Restart-Dialog: *
+*Recipe-Restart-Dialog: Title "$[gt.Restart FVWM-Crystal]"
+*Recipe-Restart-Dialog: Text "$[gt.New recipe will be used after next startup]"
+*Recipe-Restart-Dialog: Line center
+*Recipe-Restart-Dialog: Line center
+*Recipe-Restart-Dialog: Button quit " $[gt.Restart] " ^M
+*Recipe-Restart-Dialog: Command Restart
+*Recipe-Restart-Dialog: Button quit " $[gt.Not now] " ^[
+*Recipe-Restart-Dialog: Command Nop
+*Recipe-Restart-Dialog: Line center
#
-# Fonts preferences
+# Characters fonts and sizes
#
# Files that use them:
# decorations/* (theme files: use title_font and title_font_size)
@@ -70,8 +72,6 @@
+ I AddToMenu $0
+ I PipeRead '$[FVWM_USERDIR]/scripts/makefontlist; \
while read myline ; do echo \"AddToMenu $0 \'${myline}\' $0Font-Set \'${myline}\'\"; done < $[FVWM_USERDIR]/FontList;'
-# + I PipeRead 'fc-list | sed -e \'s/\\(:style=[[:alpha:]]*\\) .*/\\1/\' -e \'s/\\(:style=[[:alpha:]]*\\),.*/\\1/\' -e \'s/\\(,.*\\):\\(style=.*\\)/\\2/\' -e \'s/style=//\' | sort > $[FVWM_USERDIR]/FontList; \
-# while read myline ; do echo \"AddToMenu $0 \'${myline}\' $0Font-Set \'${myline}\'\"; done < $[FVWM_USERDIR]/FontList;'
DestroyFunc PanelFont-Set
AddToFunc PanelFont-Set
@@ -82,11 +82,6 @@
AddToFunc TitleFont-Set
+ I SavePreferences TitleFont "SetEnv title_font \\\""$*"\\\""
+ I Style * Font "xft:$[0]:pixelsize=$[title_font_size]:Bold:encoding=iso10646-1"
-# + I Style * Font "xft:$0:pixelsize=12:Bold:encoding=iso10646-1"
-# + I Style * Font "xft:$[0]:pixelsize=12:Bold"
-# + I Echo Style * Font "xft:$0:pixelsize=12:Bold:encoding=iso10646-1"
-# + I Test (EnvIsSet FVWM_FLAG_UTF-8) Style * Font "xft:$[0]:pixelsize=12:Bold:encoding=iso10646-1"
-# + I Test (EnvIsSet FVWM_FLAG_UTF-8) Echo Style * Font "xft:$0:pixelsize=12:Bold:encoding=iso10646-1"
DestroyFunc MenuFont-Set
AddToFunc MenuFont-Set
@@ -101,14 +96,15 @@
DestroyMenu /Preferences/FontSizes/PanelSize
AddToMenu /Preferences/FontSizes/PanelSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.8]' PanelFontSize 8
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.10]' PanelFontSize 10
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.12]' PanelFontSize 12
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.14]' PanelFontSize 14
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.16]' PanelFontSize 16
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.18]' PanelFontSize 18
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.20]' PanelFontSize 20
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.22]' PanelFontSize 22
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.24]' PanelFontSize 24
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.26]' PanelFontSize 26
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.28]' PanelFontSize 28
DestroyFunc PanelFontSize
AddToFunc PanelFontSize
@@ -118,14 +114,15 @@
DestroyMenu /Preferences/FontSizes/TitleSize
AddToMenu /Preferences/FontSizes/TitleSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.8]' TitleFontSize 8
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.10]' TitleFontSize 10
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.12]' TitleFontSize 12
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.14]' TitleFontSize 14
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.16]' TitleFontSize 16
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.18]' TitleFontSize 18
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.20]' TitleFontSize 20
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.22]' TitleFontSize 22
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.24]' TitleFontSize 24
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.26]' TitleFontSize 26
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.28]' TitleFontSize 28
DestroyFunc TitleFontSize
AddToFunc TitleFontSize
@@ -136,14 +133,15 @@
DestroyMenu /Preferences/FontSizes/MenuSize
AddToMenu /Preferences/FontSizes/MenuSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.8]' MenuFontSize 8
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.10]' MenuFontSize 10
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.12]' MenuFontSize 12
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.14]' MenuFontSize 14
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.16]' MenuFontSize 16
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.18]' MenuFontSize 18
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.20]' MenuFontSize 20
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.22]' MenuFontSize 22
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.24]' MenuFontSize 24
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.26]' MenuFontSize 26
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.28]' MenuFontSize 28
DestroyFunc MenuFontSize
AddToFunc MenuFontSize
@@ -152,6 +150,111 @@
+ I MenuStyle * Font "xft:$[menu_font]:pixelsize=$[0]:encoding=iso10646-1"
#
+# Default terminal
+#
+DestroyMenu /Preferences/DefaultTerminal
+AddToMenu /Preferences/DefaultTerminal
+Test (x gnome-terminal) + '%22x22/apps/gnome-terminal.png%GNOME Terminal' SelectDefaultTerminal gnome-terminal
+Test (x multi-gnome-terminal) + '%22x22/apps/multi-gnome-terminal.png%Multi GNOME Terminal' SelectDefaultTerminal multi-gnome-terminal
+Test (x xfce4-terminal) + '%22x22/apps/xfce4-terminal.png%XFCE4 Terminal' SelectDefaultTerminal xfce4-terminal
+Test (x terminator) + '%22x22/apps/terminator.png%Terminator' SelectDefaultTerminal terminator
+Test (x mrxvt) + '%22x22/apps/mrxvt.png%MRxvt' SelectDefaultTerminal mrxvt
+Test (x urxvt) + '%22x22/apps/urxvt.png%URxvt' SelectDefaultTerminal urxvt
+Test (x aterm) + '%22x22/apps/aterm.png%Aterm' SelectDefaultTerminal aterm
+Test (x xterm) + '%22x22/apps/xterm.png%XTerm' SelectDefaultTerminal xterm
+
+DestroyFunc SelectDefaultTerminal
+AddToFunc SelectDefaultTerminal
++ I FindCommand DefaultTerminal $0 terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal
++ I SavePreferences DefaultTerminal "FindCommand DefaultTerminal $0 terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal"
+
+#
+# MiniConsole terminal
+#
+DestroyMenu /Preferences/FvwmConsoleTerminal
+AddToMenu /Preferences/FvwmConsoleTerminal
+Test (x mrxvt) + '%22x22/apps/mrxvt.png%MRxvt' SelectFvwmConsoleTerminal mrxvt
+Test (x urxvt) + '%22x22/apps/urxvt.png%URxvt' SelectFvwmConsoleTerminal urxvt
+Test (x aterm) + '%22x22/apps/aterm.png%Aterm' SelectFvwmConsoleTerminal aterm
+Test (x xterm) + '%22x22/apps/xterm.png%XTerm' SelectFvwmConsoleTerminal xterm
+
+DestroyFunc SelectFvwmConsoleTerminal
+AddToFunc SelectFvwmConsoleTerminal
++ I FindCommand FvwmConsoleTerminal $0 mrxvt urxvt aterm xterm
++ I SavePreferences FvwmConsoleTerminal "FindCommand FvwmConsoleTerminal $0 mrxvt urxvt aterm xterm"
+
+#
+# QuakeConsole terminal
+#
+DestroyMenu /Preferences/QuakeConsoleTerminal
+AddToMenu /Preferences/QuakeConsoleTerminal
+Test (x mrxvt) + '%22x22/apps/mrxvt.png%MRxvt' SelectQuakeConsoleTerminal mrxvt
+Test (x urxvt) + '%22x22/apps/urxvt.png%URxvt' SelectQuakeConsoleTerminal urxvt
+Test (x aterm) + '%22x22/apps/aterm.png%Aterm' SelectQuakeConsoleTerminal aterm
+Test (x xterm) + '%22x22/apps/xterm.png%XTerm' SelectQuakeConsoleTerminal xterm
+
+DestroyFunc SelectQuakeConsoleTerminal
+AddToFunc SelectQuakeConsoleTerminal
++ I FindCommand QuakeConsoleTerminal $0 mrxvt urxvt aterm xterm
++ I SavePreferences QuakeConsoleTerminal "FindCommand QuakeConsoleTerminal $0 mrxvt urxvt aterm xterm"
+
+#
+# Desktop manager
+#
+DestroyMenu /Preferences/DesktopManager
+AddToMenu /Preferences/DesktopManager
++ '$[gt.None]' ActivateDesktopManager-None
++ "" Nop
+Test (x rox) + '%22x22/apps/rox.png%ROX-Filer' ActivateDesktopManager-ROX
+Test (x nautilus) + '%22x22/apps/nautilus.png%Nautilus' ActivateDesktopManager-Nautilus
+
+DestroyFunc ActivateDesktopManager-None
+AddToFunc ActivateDesktopManager-None
++ I SavePreferences DefaultDesktopManager "LoadPreferences LastChoosenWallpaper"
+Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-Dialog
+Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-SM-Dialog
+
+DestroyFunc ActivateDesktopManager-ROX
+AddToFunc ActivateDesktopManager-ROX
++ I SavePreferences DefaultDesktopManager "Include components/apps/ROX-Filer"
+Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-Dialog
+Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-SM-Dialog
+
+DestroyFunc ActivateDesktopManager-Nautilus
+AddToFunc ActivateDesktopManager-Nautilus
++ I SavePreferences DefaultDesktopManager "Include components/apps/Nautilus"
+Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-Dialog
+Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-SM-Dialog
+
+All (DesktopManager-Dialog) Close
+DestroyModuleConfig DesktopManager-Dialog: *
+*DesktopManager-Dialog: Title "$[gt.Changed desktop manager]"
+*DesktopManager-Dialog: Text "$[gt.Selected desktop manager will be used]"
+*DesktopManager-Dialog: Line center
+*DesktopManager-Dialog: Text "$[gt.at the next start of your X session]"
+*DesktopManager-Dialog: Line center
+*DesktopManager-Dialog: Line center
+*DesktopManager-Dialog: Button quit " $[gt.Logout] " ^M
+*DesktopManager-Dialog: Command Quit
+*DesktopManager-Dialog: Button quit " $[gt.Not now] " ^[
+*DesktopManager-Dialog: Command Nop
+*DesktopManager-Dialog: Line center
+
+All (DesktopManager-SM-Dialog) Close
+DestroyModuleConfig DesktopManager-SM-Dialog: *
+*DesktopManager-SM-Dialog: Title "$[gt.Changed desktop manager]"
+*DesktopManager-SM-Dialog: Text "$[gt.Selected desktop manager will be used]"
+*DesktopManager-SM-Dialog: Line center
+*DesktopManager-SM-Dialog: Text "$[gt.at the next start of your X session]"
+*DesktopManager-SM-Dialog: Line center
+*DesktopManager-SM-Dialog: Line center
+*DesktopManager-SM-Dialog: Button quit " $[gt.Logout] " ^M
+*DesktopManager-SM-Dialog: Command QuitSession
+*DesktopManager-SM-Dialog: Button quit " $[gt.Not now] " ^[
+*DesktopManager-SM-Dialog: Command Nop
+*DesktopManager-SM-Dialog: Line center
+
+#
# Notification Area Application
#
DestroyMenu /Preferences/NotificationAreaManager
@@ -177,56 +280,27 @@
AddToFunc SelectNotificationAreaManager
+ I FindCommand NotificationAreaManager $0 trayer stalonetray
+ I SavePreferences NotificationAreaManager "FindCommand NotificationAreaManager $0 trayer stalonetray"
-Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm NotificationAreaManager-Dialog
-Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm NotificationAreaManager-SM-Dialog
++ I Module FvwmForm NotificationAreaManager-Dialog
All (NotificationAreaManager-Dialog) Close
DestroyModuleConfig NotificationAreaManager-Dialog: *
-*NotificationAreaManager-Dialog: Title "$[gt.Changed notification area manager]"
-*NotificationAreaManager-Dialog: Text "$[gt.Selected notification area manager will be used]"
+*NotificationAreaManager-Dialog: Title "$[gt.Restart FVWM-Crystal]"
+*NotificationAreaManager-Dialog: Text "$[gt.New notification area setting will be used after next startup]"
*NotificationAreaManager-Dialog: Line center
-*NotificationAreaManager-Dialog: Text "$[gt.at the next start of your X session]"
*NotificationAreaManager-Dialog: Line center
-*NotificationAreaManager-Dialog: Line center
-*NotificationAreaManager-Dialog: Button quit " $[gt.Logout] " ^M
-*NotificationAreaManager-Dialog: Command Quit
+*NotificationAreaManager-Dialog: Button quit " $[gt.Restart] " ^M
+*NotificationAreaManager-Dialog: Command Restart
*NotificationAreaManager-Dialog: Button quit " $[gt.Not now] " ^[
*NotificationAreaManager-Dialog: Command Nop
*NotificationAreaManager-Dialog: Line center
-All (NotificationAreaManager-SM-Dialog) Close
-DestroyModuleConfig NotificationAreaManager-SM-Dialog: *
-*NotificationAreaManager-SM-Dialog: Title "$[gt.Changed notification area manager]"
-*NotificationAreaManager-SM-Dialog: Text "$[gt.Selected notification area manager will be used]"
-*NotificationAreaManager-SM-Dialog: Line center
-*NotificationAreaManager-SM-Dialog: Text "$[gt.at the next start of your X session]"
-*NotificationAreaManager-SM-Dialog: Line center
-*NotificationAreaManager-SM-Dialog: Line center
-*NotificationAreaManager-SM-Dialog: Button quit " $[gt.Logout] " ^M
-*NotificationAreaManager-SM-Dialog: Command QuitSession
-*NotificationAreaManager-SM-Dialog: Button quit " $[gt.Not now] " ^[
-*NotificationAreaManager-SM-Dialog: Command Nop
-*NotificationAreaManager-SM-Dialog: Line center
-
DestroyFunc NotificationAreaWidth
AddToFunc NotificationAreaWidth
+ I FindCommand NotificationArea-Width $0 2 3 4 5 6 7 8 9
+ I Piperead `echo SetEnv trayer_width $(($0*24))`
+ I SavePreferences NotificationArea-Width "SetEnv trayer_width $[trayer_width]"
-+ I Module FvwmForm NotificationArea-Restart-Dialog
++ I Module FvwmForm NotificationArea-Dialog
-All (NotificationArea-Restart-Dialog) Close
-DestroyModuleConfig NotificationArea-Restart-Dialog: *
-*NotificationArea-Restart-Dialog: Title "$[gt.Restart FVWM-Crystal]"
-*NotificationArea-Restart-Dialog: Text "$[gt.New notification area width will be used after next startup]"
-*NotificationArea-Restart-Dialog: Line center
-*NotificationArea-Restart-Dialog: Line center
-*NotificationArea-Restart-Dialog: Button quit " $[gt.Restart] " ^M
-*NotificationArea-Restart-Dialog: Command Restart
-*NotificationArea-Restart-Dialog: Button quit " $[gt.Not now] " ^[
-*NotificationArea-Restart-Dialog: Command Nop
-*NotificationArea-Restart-Dialog: Line center
-
#
# Music player
#
@@ -246,7 +320,7 @@
DestroyFunc SelectMusicPlayer
AddToFunc SelectMusicPlayer
+ I FindCommand MusicPlayer $0 alsaplayer mpd quodlibet audacious xmms xmm2 cmus mocp cdcd mplayer
-+ I Include components/functions/Music-$[MusicPlayer]
++ I Include components/functions/Music
+ I SavePreferences DefaultMusicPlayer "SetEnv MusicPlayer $[MusicPlayer]"
#
@@ -268,98 +342,39 @@
DestroyFunc SelectMixer
AddToFunc SelectMixer
+ I FindCommand DefaultMixer $0 amixer aumix mpd quodlibet audacious xmms xmms2 cmus cdcd
-+ I PipeRead `echo SetEnv Mixer $[DefaultMixer]`
+ I SavePreferences DefaultMixer "SetEnv Mixer $[DefaultMixer]"
-#+ I Include components/functions/Mixer-$[DefaultMixer]
-#+ I SavePreferences DefaultMixer "Include components/functions/Mixer-$[DefaultMixer]"
++ I PipeRead `echo SetEnv Mixer $[DefaultMixer]`
++ I Include components/functions/Mixer
++ I AppendPreferences DefaultMixer "Include components/functions/Mixer"
#
-# Desktop manager
-#
-DestroyMenu /Preferences/DesktopManager
-AddToMenu /Preferences/DesktopManager
-+ '$[gt.None]' ActivateDesktopManager-None
-+ "" Nop
-Test (x rox) + '%22x22/apps/rox.png%ROX-Filer' ActivateDesktopManager-ROX
-Test (x nautilus) + '%22x22/apps/nautilus.png%Nautilus' ActivateDesktopManager-Nautilus
-
-DestroyFunc ActivateDesktopManager-None
-AddToFunc ActivateDesktopManager-None
-+ I SavePreferences DefaultDesktopManager "LoadPreferences LastChoosenWallpaper"
-Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-Dialog
-Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-SM-Dialog
-
-DestroyFunc ActivateDesktopManager-ROX
-AddToFunc ActivateDesktopManager-ROX
-+ I SavePreferences DefaultDesktopManager "Include components/apps/ROX-Filer"
-Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-Dialog
-Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-SM-Dialog
-
-DestroyFunc ActivateDesktopManager-Nautilus
-AddToFunc ActivateDesktopManager-Nautilus
-+ I SavePreferences DefaultDesktopManager "Include components/apps/Nautilus"
-Test (!EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-Dialog
-Test (EnvIsSet SESSION_MANAGER) + I Module FvwmForm DesktopManager-SM-Dialog
-
-All (DesktopManager-Dialog) Close
-DestroyModuleConfig DesktopManager-Dialog: *
-*DesktopManager-Dialog: Title "$[gt.Changed desktop manager]"
-*DesktopManager-Dialog: Text "$[gt.Selected desktop manager will be used]"
-*DesktopManager-Dialog: Line center
-*DesktopManager-Dialog: Text "$[gt.at the next start of your X session]"
-*DesktopManager-Dialog: Line center
-*DesktopManager-Dialog: Line center
-*DesktopManager-Dialog: Button quit " $[gt.Logout] " ^M
-*DesktopManager-Dialog: Command Quit
-*DesktopManager-Dialog: Button quit " $[gt.Not now] " ^[
-*DesktopManager-Dialog: Command Nop
-*DesktopManager-Dialog: Line center
-
-All (DesktopManager-SM-Dialog) Close
-DestroyModuleConfig DesktopManager-SM-Dialog: *
-*DesktopManager-SM-Dialog: Title "$[gt.Changed desktop manager]"
-*DesktopManager-SM-Dialog: Text "$[gt.Selected desktop manager will be used]"
-*DesktopManager-SM-Dialog: Line center
-*DesktopManager-SM-Dialog: Text "$[gt.at the next start of your X session]"
-*DesktopManager-SM-Dialog: Line center
-*DesktopManager-SM-Dialog: Line center
-*DesktopManager-SM-Dialog: Button quit " $[gt.Logout] " ^M
-*DesktopManager-SM-Dialog: Command QuitSession
-*DesktopManager-SM-Dialog: Button quit " $[gt.Not now] " ^[
-*DesktopManager-SM-Dialog: Command Nop
-*DesktopManager-SM-Dialog: Line center
-
-#
# Window focus policy
#
DestroyMenu /Preferences/FocusPolicy
AddToMenu /Preferences/FocusPolicy
-+ 'FVWM-Crystal' ActivateFocusPolicy-FVWM-Crystal
++ 'Amiga' ActivateFocusPolicy-Amiga
++ 'FVWM-Crystal' ActivateFocusPolicy-FVWM-Crystal
+ 'FVWM-Crystal with raise' ActivateFocusPolicy-FVWM-Crystal-Raise
-+ 'MS Windows' ActivateFocusPolicy-MSWindows
++ 'MS Windows' ActivateFocusPolicy-MSWindows
+DestroyFunc ActivateFocusPolicy-Amiga
+AddToFunc ActivateFocusPolicy-Amiga
++ I Include components/styles/FocusPolicy-Amiga
++ I SavePreferences DefaultFocusPolicy "Include components/styles/FocusPolicy-Amiga"
+
DestroyFunc ActivateFocusPolicy-FVWM-Crystal
AddToFunc ActivateFocusPolicy-FVWM-Crystal
+ I Include components/styles/FocusPolicy-FVWM-Crystal
-+ I Include components/styles/FVWM
-+ I Include components/styles/QuakeConsole
-+ I Append components/styles/Applications
+ I SavePreferences DefaultFocusPolicy "Include components/styles/FocusPolicy-FVWM-Crystal"
DestroyFunc ActivateFocusPolicy-FVWM-Crystal-Raise
AddToFunc ActivateFocusPolicy-FVWM-Crystal-Raise
+ I Include components/styles/FocusPolicy-FVWM-Crystal-Raise
-+ I Include components/styles/FVWM
-+ I Include components/styles/QuakeConsole
-+ I Append components/styles/Applications
+ I SavePreferences DefaultFocusPolicy "Include components/styles/FocusPolicy-FVWM-Crystal-Raise"
DestroyFunc ActivateFocusPolicy-MSWindows
AddToFunc ActivateFocusPolicy-MSWindows
+ I Include components/styles/FocusPolicy-MSWindows
-+ I Include components/styles/FVWM
-+ I Include components/styles/QuakeConsole
-+ I Append components/styles/Applications
+ I SavePreferences DefaultFocusPolicy "Include components/styles/FocusPolicy-MSWindows"
#
@@ -384,39 +399,4 @@
+ I AppendPreferences PrivilegedTerminals "Style Eterm !FPOverrideGrabFocus"
+ I LoadPreferences PrivilegedTerminals
-
-#
-# Recipes
-#
-DestroyMenu /Preferences/Recipes
-AddToMenu /Preferences/Recipes
-+ MissingSubmenuFunction Recipes-generator
-+ '%22x22/categories/directory.png%$[gt.System]' Popup $[FVWM_SYSTEMDIR]/recipes
-Test (f $[FVWM_USERDIR]/recipes) + '%22x22/categories/directory.png%$[gt.User]' Popup $[FVWM_USERDIR]/recipes
-
-DestroyFunc Recipes-generator
-AddToFunc Recipes-generator
-+ I DestroyMenu recreate $0
-+ I AddToMenu $0
-+ I PipeRead 'for i in $0/*; do \
- name=$(basename "${i}"); \
- echo \"AddToMenu $0 \'${name}\' Recipe-Set \'${i}\'\"; done'
-
-DestroyFunc Recipe-Set
-AddToFunc Recipe-Set
-+ I SavePreferences LastChoosenRecipe "Read \"$*\""
-+ I Module FvwmForm Recipe-Restart-Dialog
-
-All (Recipe-Restart-Dialog) Close
-DestroyModuleConfig Recipe-Restart-Dialog: *
-*Recipe-Restart-Dialog: Title "$[gt.Restart FVWM-Crystal]"
-*Recipe-Restart-Dialog: Text "$[gt.New recipe will be used after next startup]"
-*Recipe-Restart-Dialog: Line center
-*Recipe-Restart-Dialog: Line center
-*Recipe-Restart-Dialog: Button quit " $[gt.Restart] " ^M
-*Recipe-Restart-Dialog: Command Restart
-*Recipe-Restart-Dialog: Button quit " $[gt.Not now] " ^[
-*Recipe-Restart-Dialog: Command Nop
-*Recipe-Restart-Dialog: Line center
-
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
