Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[74] fvwm/components/functions
|
From: <dom...@us...> - 2011-01-29 21:16:40
|
Revision: 74
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=74&view=rev
Author: dominique_libre
Date: 2011-01-29 21:16:33 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Preferences-Menu: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 21:13:15 UTC (rev 73)
+++ ChangeLog 2011-01-29 21:16:33 UTC (rev 74)
@@ -20,6 +20,7 @@
* updated the media players for use with components/Music
* StaloneTray: cleanup
* Trayer: support for $trayer_height into the recipes
+ * Preferences-Menu: cleanup
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2011-01-29 21:13:15 UTC (rev 73)
+++ fvwm/components/functions/Preferences-Menu 2011-01-29 21:16:33 UTC (rev 74)
@@ -1,11 +1,12 @@
# Menu with preferences
#
+# Included in components/desktop/FVWM-Crystal_Functions
# 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/user-desktop.png%$[gt.Fonts sizes]' Popup /Preferences/FontSizes
+ '%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
@@ -36,7 +37,7 @@
AddToFunc Recipe-Set
+ I SetEnv Fvwm_Crystal_Recipe "$*"
+ I SavePreferences LastChoosenRecipe "SetEnv Fvwm_Crystal_Recipe \"$*\""
-+ I AppendPreferences LastChoosenRecipe "Read $[Fvwm_Crystal_Recipe]"
++ I AppendPreferences LastChoosenRecipe "Read \"$*\""
+ I Module FvwmForm Recipe-Restart-Dialog
All (Recipe-Restart-Dialog) Close
@@ -59,12 +60,17 @@
# recipes/* (panel_font panel_font_size)
# components/styles/Menu (menu_font menu_font_size)
+DestroyFunc /Preferences/Fonts-generator
+AddToFunc /Preferences/Fonts-generator
++ I DestroyMenu recreate /Preferences/Fonts
++ I AddToMenu /Preferences/Fonts '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels] : $[panel_font]' Popup Panel
++ I AddToMenu /Preferences/Fonts '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars] : $[title_font]' Popup Title
++ I AddToMenu /Preferences/Fonts '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus] : $[menu_font]' Popup Menu
+
DestroyMenu /Preferences/Fonts
AddToMenu /Preferences/Fonts
++ DynamicPopupAction Function /Preferences/Fonts-generator
+ MissingSubmenuFunction Fonts-generator
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels]' Popup Panel
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars]' Popup Title
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus]' Popup Menu
DestroyFunc Fonts-generator
AddToFunc Fonts-generator
@@ -76,23 +82,31 @@
DestroyFunc PanelFont-Set
AddToFunc PanelFont-Set
+ I SavePreferences PanelFont "SetEnv panel_font \\\""$*"\\\""
++ I SetEnv panel_font "$[0]"
+ I Style * Font "xft:$[0]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
DestroyFunc TitleFont-Set
AddToFunc TitleFont-Set
+ I SavePreferences TitleFont "SetEnv title_font \\\""$*"\\\""
++ I SetEnv title_font "$[0]"
+ I Style * Font "xft:$[0]:pixelsize=$[title_font_size]:Bold:encoding=iso10646-1"
DestroyFunc MenuFont-Set
AddToFunc MenuFont-Set
+ I SavePreferences MenuFont "SetEnv menu_font \\\""$*"\\\""
++ I SetEnv menu_font "$[0]"
+ I MenuStyle * Font "xft:$[0]:pixelsize=$[menu_font_size]:encoding=iso10646-1"
+DestroyFunc /Preferences/FontSizes-generator
+AddToFunc /Preferences/FontSizes-generator
++ I DestroyMenu recreate /Preferences/FontSizes
++ I AddToMenu /Preferences/FontSizes '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels font size] : $[panel_font_size]' Popup /Preferences/FontSizes/PanelSize
++ I AddToMenu /Preferences/FontSizes '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars font size] : $[title_font_size]' Popup /Preferences/FontSizes/TitleSize
++ I AddToMenu /Preferences/FontSizes '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus font size] : $[menu_font_size]' Popup /Preferences/FontSizes/MenuSize
+
DestroyMenu /Preferences/FontSizes
AddToMenu /Preferences/FontSizes
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels font size]' Popup /Preferences/FontSizes/PanelSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars font size]' Popup /Preferences/FontSizes/TitleSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus font size]' Popup /Preferences/FontSizes/MenuSize
++ DynamicPopupAction Function /Preferences/FontSizes-generator
DestroyMenu /Preferences/FontSizes/PanelSize
AddToMenu /Preferences/FontSizes/PanelSize
@@ -320,7 +334,7 @@
DestroyFunc SelectMusicPlayer
AddToFunc SelectMusicPlayer
+ I FindCommand MusicPlayer $0 alsaplayer mpd quodlibet audacious xmms xmm2 cmus mocp cdcd mplayer
-+ I Include components/functions/Music
++ I Include components/functions/Music-$[MusicPlayer]
+ I SavePreferences DefaultMusicPlayer "SetEnv MusicPlayer $[MusicPlayer]"
#
@@ -345,7 +359,7 @@
+ I SavePreferences DefaultMixer "SetEnv Mixer $[DefaultMixer]"
+ I PipeRead `echo SetEnv Mixer $[DefaultMixer]`
+ I Include components/functions/Mixer
-+ I AppendPreferences DefaultMixer "Include components/functions/Mixer"
+#+ I AppendPreferences DefaultMixer "Include components/functions/Mixer"
#
# Window focus policy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
