Menu
▾
▴
fvwm-crystal-commits
|
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.
|
|
From: <dom...@us...> - 2010-12-22 21:22:47
|
Revision: 39
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=39&view=rev
Author: dominique_libre
Date: 2010-12-22 21:22:40 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Added support for terminator in the man page menu
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Developer-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 20:07:18 UTC (rev 38)
+++ ChangeLog 2010-12-22 21:22:40 UTC (rev 39)
@@ -14,6 +14,7 @@
* Removed Music preferences form the main preference.
Will be incorporated into the Music button.
* Added font preference menu.
+ * Added terminator support into the devman menu
Mardi 22 décembre 2010 Dominique Michel
The commit list bounced here too !
Modified: fvwm/components/functions/Developer-Menu
===================================================================
--- fvwm/components/functions/Developer-Menu 2010-12-22 20:07:18 UTC (rev 38)
+++ fvwm/components/functions/Developer-Menu 2010-12-22 21:22:40 UTC (rev 39)
@@ -2,9 +2,6 @@
# Where is your system documentation:
SetEnv System_Documentation /usr/share/doc
-# Which pager program to use for the system documentation:
-Test (EnvIsSet PAGER) SetEnv Pager_Exec $[PAGER]
-Test (!EnvIsSet PAGER) SetEnv Pager_Exec "less"
DestroyMenu /Developer
AddToMenu /Developer '$[gt.Developer menu]' Title
@@ -24,7 +21,7 @@
+ "" Nop
+ '$[gt.FVWM-Crystal documentation]' Popup /Developer/FVWM-Crystal-Documentation
+ '$[gt.FVWM manpages]' Popup /Developer/FvwmManpages
-+ '$[gt.X.org documentation]' Popup /Developer/X.org-Documentation
++ '$[gt.X.org documentation]' Popup /Developer/X.Org-Documentation
+ MissingSubmenuFunction System_Documentation-generator
+ '$[gt.Main system documentation]' Popup $[System_Documentation]
+ "" Nop
@@ -41,7 +38,8 @@
DestroyFunc FvwmViewManPage
AddToFunc FvwmViewManPage
-+ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal xterm) X $[DefaultTerminal] -e man $0
++ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal xterm, !EnvMatch DefaultTerminal terminator) X $[DefaultTerminal] -e man $0
++ I TestRc (NoMatch) Test (EnvMatch DefaultTerminal terminator) X $[DefaultTerminal] -x man $0
+ I TestRc (NoMatch) X $[DefaultTerminal] -e "man $0"
DestroyMenu /Developer/FvwmManpages
@@ -122,16 +120,51 @@
+ "%22x22/categories/help.png%fvwm-menu-xlock" FvwmViewManPage fvwm-menu-xlock
+ "%22x22/categories/help.png%fvwm-root" FvwmViewManPage fvwm-root
-DestroyMenu /Developer/X.org-Documentation
-AddToMenu /Developer/X.org-Documentation
-+ '$[gt.Under construction]' Nop
+DestroyMenu /Developer/X.Org-Documentation
+AddToMenu /Developer/X.Org-Documentation
++ '$[gt.X.Org documentation]' Popup /Developer/X.Org/X.Org
+#+ '$[gt.X.Org-X11 documentation]' Popup /Developer/X.Org/X11
++ '$[gt.X.Org-Xserver documentation]' Popup /Developer/X.Org/Xserver
+DestroyMenu /Developer/X.Org/X.Org
+AddToMenu /Developer/X.Org/X.Org
++ "%22x22/categories/help.png%X" FvwmViewManPage X
++ "%22x22/categories/help.png%XOrgFoundation" FvwmViewManPage XOrgFoundation
++ "%22x22/categories/help.png%Consortium" FvwmViewManPage Consortium
++ "%22x22/categories/help.png%Standards" FvwmViewManPage Standards
++ "%22x22/categories/help.png%XProjectTeam" FvwmViewManPage XProjectTeam
++ "%22x22/categories/help.png%Xprint" FvwmViewManPage Xprint
++ "%22x22/categories/help.png%Xsecurity" FvwmViewManPage Xsecurity
+
+#DestroyMenu /Developer/X.Org/X11
+#AddToMenu /Developer/X.Org/X11
+#+ "%22x22/categories/help.png%X" FvwmViewManPage X
+
+DestroyMenu /Developer/X.Org/Xserver
+AddToMenu /Developer/X.Org/Xserver
++ "%22x22/categories/help.png%Xorg" FvwmViewManPage Xorg
++ "%22x22/categories/help.png%Xserver" FvwmViewManPage Xserver
++ "%22x22/categories/help.png%Xnest" FvwmViewManPage Xnest
++ "%22x22/categories/help.png%Xvfb" FvwmViewManPage Xvfb
++ "%22x22/categories/help.png%cvt" FvwmViewManPage cvt
++ "%22x22/categories/help.png%gtf" FvwmViewManPage gtf
++ "%22x22/categories/help.png%xorgcfg" FvwmViewManPage xorgcfg
++ "%22x22/categories/help.png%xorgconfig" FvwmViewManPage xorgconfig
++ "%22x22/categories/help.png%xorg.conf" FvwmViewManPage xorg.conf
++ "%22x22/categories/help.png%exa" FvwmViewManPage exa
++ "%22x22/categories/help.png%fbdevhw" FvwmViewManPage fbdevhw
+
DestroyFunc System_Documentation-generator
AddToFunc System_Documentation-generator
-+ I PipeRead 'case "$0" in \
- "$[System_Documentation]"*) myexec="$[Pager_Exec]" direxec="mc";; \
++ I Test (EnvIsSet PAGER) PipeRead 'case "$0" in \
+ "$[System_Documentation]"*) myexec="$[PAGER]" direxec="mc";; \
esac; \
fvwm-menu-directory --func-name System_Documentation-generator --dir "$0" --exec-t="${direxec}" \
+ --exec-file "${myexec}"'
++ I Test (!EnvIsSet PAGER) PipeRead 'case "$0" in \
+ "$[System_Documentation]"*) myexec="less" direxec="mc";; \
+ esac; \
+ fvwm-menu-directory --func-name System_Documentation-generator --dir "$0" --exec-t="${direxec}" \
--exec-file "${myexec}"'
DestroyMenu /Developer/WindowStyle
@@ -151,7 +184,9 @@
+ "!Borders" Pick WindowStyle !Borders
+ "Borders" Pick WindowStyle Borders
+ "" Nop
-+ "ResizeOpaque" Pick WindowStyle ResizeOpaque"
++ "ResizeOpaque" Pick WindowStyle ResizeOpaque
+ "ResizeOutline" Pick WindowStyle ResizeOutline
+#+ "" Nop
+#+ "Layer 1" Pick WindowStyle Layer 2
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-23 20:31:32
|
Revision: 40
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=40&view=rev
Author: dominique_libre
Date: 2010-12-23 20:31:26 +0000 (Thu, 23 Dec 2010)
Log Message:
-----------
Updated EdgeScroll-Toggle function with current fvwn syntax for EdgeResistance
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/EdgeScroll-Toggle
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 21:22:40 UTC (rev 39)
+++ ChangeLog 2010-12-23 20:31:26 UTC (rev 40)
@@ -15,6 +15,7 @@
Will be incorporated into the Music button.
* Added font preference menu.
* Added terminator support into the devman menu
+ " Updated EdgeScroll-Toggle function with current fvwn syntax
Mardi 22 décembre 2010 Dominique Michel
The commit list bounced here too !
Modified: fvwm/components/functions/EdgeScroll-Toggle
===================================================================
--- fvwm/components/functions/EdgeScroll-Toggle 2010-12-22 21:22:40 UTC (rev 39)
+++ fvwm/components/functions/EdgeScroll-Toggle 2010-12-23 20:31:26 UTC (rev 40)
@@ -5,13 +5,17 @@
DestroyFunc EdgeScroll-Toggle_Soft
AddToFunc EdgeScroll-Toggle_Soft
+ I EdgeScroll 100000 100000
-+ I EdgeResistance 0 0
++ I EdgeResistance 0
++ I Style * EdgeMoveDelay 0
++ I Style * EdgeMoveResistance 0
+ I $0 $1 $2 $3 EdgeScroll-Toggle_Hard $0 $1 $2 $3
DestroyFunc EdgeScroll-Toggle_Hard
AddToFunc EdgeScroll-Toggle_Hard
+ I EdgeScroll 0 0
-+ I EdgeResistance 0 0
++ I EdgeResistance 0
++ I Style * EdgeMoveDelay 0
++ I Style * EdgeMoveResistance 0
+ I $0 $1 $2 $3 EdgeScroll-Toggle_Soft $0 $1 $2 $3
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 16:58:53
|
Revision: 43
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=43&view=rev
Author: dominique_libre
Date: 2010-12-31 16:58:46 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Icon_launcher initial commit. Work for me but certainly not portable at that time. Dont know how I will release it (or not).
Modified Paths:
--------------
ChangeLog
Added Paths:
-----------
fvwm/components/functions/Icon-Launcher
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 16:35:35 UTC (rev 42)
+++ ChangeLog 2010-12-31 16:58:46 UTC (rev 43)
@@ -3,6 +3,9 @@
Vendredi 31 décembre 2011 Dominique Michel
* Added font support from font preference in FvwmIdent
* Some cleanup in the Focus policies
+ * Icon-Launcher initial commit. Very experimental. Don't know if it will be
+ released here or in the contrib directory.
+ Work for me but certainly not portable at that time.
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Added: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher (rev 0)
+++ fvwm/components/functions/Icon-Launcher 2010-12-31 16:58:46 UTC (rev 43)
@@ -0,0 +1,82 @@
+# Desktop icons for the mounted partition(s) and for home.
+# Written by Dominique Michel <dom...@so...>, 2010
+# for Fvwm-Crystal.
+#
+# From Fvwm FAQ, 7.13 with huge modifications and added functions.
+# This file will scan /etc/mtab, find the mounted drive(s) or partition(s),
+# and create the icons on the desktop corresponding to your home directory and
+# to the drives. At that time, the only action associated to the icons
+# is to launch Thunar into the corresponding mount point.
+# You can also move the icons, but the moves will not survive a restart.
+#
+# Requirement: /etc/mtab, sed, Thunar, and Fvwm.
+# In order to use it, add "Include components/functions/Icon-Launcher"
+# into some recipe after the "Style * IconBox ..." command.
+
+# Todo: - preference setting for the action
+# - style
+
+PipeRead 'echo "Style * IconBox $(($[vp.width]-36))x$(($[vp.height]-92))+18+46, IconFill top left, IconGrid 50 50"'
+
+DestroyFunc Icon-Launch-CurrentDesk
+AddToFunc Icon-Launch-CurrentDesk
++ C X thunar $0
++ M Move
++ C FlipFocus
++ C Raise
+
+# FvwmButtons icon launcher. It start iconic
+# Syntax: Launcher name icon
+# Examples:
+# Launcher Home home.xpm
+DestroyFunc Launcher
+AddToFunc Launcher
++ I DestroyModuleConfig $0: *
++ I *$0: Font "xft:$[panel_font]"
++ I *$0: (1x1+0+0)
++ I Style $0 UseStyle *
++ I Style $0 Icon $1, StartIconic, !Handles, VariablePosition, BorderWidth 0, \
+ !Borders, ParentalRelativity
++ I All ($0) Layer 0 2
++ I Module FvwmButtons $0
++ I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
+
+DestroyFunc Change-Icon
+AddToFunc Change-Icon
++ I ThisWindow ($0) Schedule 10 Style $0 Icon $1.active.png
+#+ I UpdateStyles
+
+DestroyFunc Restore-Icon
+AddToFunc Restore-Icon
++ I ThisWindow ($0) Style $0 Icon $1
+#+ I UpdateStyles
+
+# which drives are mounted into the system
+DestroyFunc Make-Icons
+AddToFunc Make-Icons
++ I PipeRead "cat /etc/mtab|grep ^/dev|sed -e 's,/dev/.... \\(/[^ ]*\\).*,\\1,'|sort > /tmp/Icon-Drives"
+# Make the icons
+# Home
++ I PipeRead 'LocalUser=`id -un`; echo "Launcher Home 48x48/categories/Home.png"; \
+ echo "All (Home) Layer 0 2"; \
+ echo "Mouse (Home) 1 I $[Mod] Icon-Launch-CurrentDesk /home/`id -un`"'
+
+# The drives
++ I Wait Home
++ I PipeRead 'i=2; m=$((((2*(($[panel_font_size]+56))))-32)); j=$m; while read line; do \
+ if [[ "${line}" == "/" ]]; \
+ then echo "Launcher ${line} 48x48/categories/Boing_4.png"; \
+ else echo "Launcher ${line} 48x48/categories/Work_4.png"; \
+ fi ; \
+ echo "Mouse (${line}) 1 I $[Mod] Icon-Launch-CurrentDesk ${line}"; \
+ echo "Wait ${line}"; \
+ j=$(($i*$m)); i=$(($i+1)); \
+done </tmp/Icon-Drives'
++ I PipeRead "rm /tmp/Icon-Drives"
+
+# The partitions must be first
+Style * NoIcon
+# Make the icons
+Make-Icons
+# We want the other icons
+Style * !NoIcon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 17:04:33
|
Revision: 44
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=44&view=rev
Author: dominique_libre
Date: 2010-12-31 17:04:27 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Icon-Thumbnails : cleanup and added comment when used at the same time than Fullscreen
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Thumbnails
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 16:58:46 UTC (rev 43)
+++ ChangeLog 2010-12-31 17:04:27 UTC (rev 44)
@@ -6,7 +6,8 @@
* Icon-Launcher initial commit. Very experimental. Don't know if it will be
released here or in the contrib directory.
Work for me but certainly not portable at that time.
-
+ * Icon-Thumbnails : cleanup and added comment
+
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
icons are move to focus :), its not AmigaOS behaviour but I like it that
Modified: fvwm/components/functions/Icon-Thumbnails
===================================================================
--- fvwm/components/functions/Icon-Thumbnails 2010-12-31 16:58:46 UTC (rev 43)
+++ fvwm/components/functions/Icon-Thumbnails 2010-12-31 17:04:27 UTC (rev 44)
@@ -1,4 +1,5 @@
# Thumbnails
+# Must be included after Fullscreen otherwise the icons can be moved
SetEnv ThumbWidth 128
SetEnv ThumbHeight 128
@@ -94,6 +95,5 @@
DestroyModuleConfig FvwmEvent-Icon-Thumbnails: *
*FvwmEvent-Icon-Thumbnails: deiconify RemoveThumbnail
Module FvwmEvent FvwmEvent-Icon-Thumbnails
-Module FvwmEvent FvwmEvent-Icon-Thumbnails
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 17:30:00
|
Revision: 45
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=45&view=rev
Author: dominique_libre
Date: 2010-12-31 17:29:54 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Debug-Functions : cleanup and support for font preferences
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Debug-Functions
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 17:04:27 UTC (rev 44)
+++ ChangeLog 2010-12-31 17:29:54 UTC (rev 45)
@@ -7,6 +7,7 @@
released here or in the contrib directory.
Work for me but certainly not portable at that time.
* Icon-Thumbnails : cleanup and added comment
+ * Debug-Functions : cleanup and support for font preferences
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Modified: fvwm/components/functions/Debug-Functions
===================================================================
--- fvwm/components/functions/Debug-Functions 2010-12-31 17:04:27 UTC (rev 44)
+++ fvwm/components/functions/Debug-Functions 2010-12-31 17:29:54 UTC (rev 45)
@@ -16,13 +16,11 @@
*FvwmIconMan-Debug-WindowList: Title "Debug Window List: Title [icon:icon title] | class/resource"
PipeRead "echo *FvwmIconMan-Debug-WindowList: ButtonGeometry $((($[vp.width]-12)/2))x24"
*FvwmIconMan-Debug-WindowList: ManagerGeometry +3+3
-*FvwmIconMan-Debug-WindowList: Font "xft:Verdana:pixelsize=14"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmIconMan-Debug-WindowList: Font "xft:Verdana:pixelsize=14:encoding=iso10646-1"
+*FvwmIconMan-Debug-WindowList: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
*FvwmIconMan-Debug-WindowList: Tips always
*FvwmIconMan-Debug-WindowList: TipsDelays 400 100
*FvwmIconMan-Debug-WindowList: TipsFormat "%c/%r"
-*FvwmIconMan-Debug-WindowList: TipsFont "xft:Verdana:pixelsize=12:Bold"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmIconMan-Debug-WindowList: TipsFont "xft:Verdana:pixelsize=12:Bold:encoding=iso10646-1"
+*FvwmIconMan-Debug-WindowList: TipsFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
*FvwmIconMan-Debug-WindowList: TipsBorderWidth 2
*FvwmIconMan-Debug-WindowList: TipsColorset $[cs_panel_inactive]
*FvwmIconMan-Debug-WindowList: TipsJustification leftup
@@ -46,6 +44,7 @@
Module FvwmIconMan FvwmIconMan-Debug-WindowList
*FvwmIdent: Colorset $[cs_panel_active]
+*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
*FvwmIdent: MinimalLayer 6
DestroyMenu /Debug/WindowList
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 17:48:33
|
Revision: 46
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=46&view=rev
Author: dominique_libre
Date: 2010-12-31 17:48:27 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
EWMH-BaseStruts : support for double top panel like in the rewrited amiga recipe
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/EWMH-BaseStruts
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 17:29:54 UTC (rev 45)
+++ ChangeLog 2010-12-31 17:48:27 UTC (rev 46)
@@ -8,6 +8,7 @@
Work for me but certainly not portable at that time.
* Icon-Thumbnails : cleanup and added comment
* Debug-Functions : cleanup and support for font preferences
+ * EWMH-BaseStruts : support for double top panel like in the rewrited amiga recipe
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Modified: fvwm/components/functions/EWMH-BaseStruts
===================================================================
--- fvwm/components/functions/EWMH-BaseStruts 2010-12-31 17:29:54 UTC (rev 45)
+++ fvwm/components/functions/EWMH-BaseStruts 2010-12-31 17:48:27 UTC (rev 46)
@@ -74,23 +74,34 @@
DestroyFunc Interface_Show
AddToFunc Interface_Show
-+ I All (FvwmPager) Iconify false
-+ I All (FvwmButtons) Iconify false
-+ I All (FvwmIconMan) Iconify false
-+ I All (gkrellm) Iconify false
-+ I All (gDeskCal) Iconify false
-+ I All (trayer) Iconify false
++ I All (FvwmPager) Iconify false
++ I All (FvwmButtons-TopPanel) Iconify false
+Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I All (FvwmButtons-TopPanelMenu) Iconify false
++ I All (FvwmButtons-Pager) Iconify false
++ I All (FvwmButtons-BottomButton) Iconify false
++ I All (FvwmButtons-Musi*) Iconify false
++ I All (ApplicationPanel) Iconify false
++ I All (FvwmIconMan) Iconify false
++ I All (gkrellm) Iconify false
++ I All (gDeskCal) Iconify false
++ I All (trayer) Iconify false
+Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I Restore-TopBar-RaiseLower
+ I EWMH-Set-Panel
+ I $0 $1 $2 $3 Interface_Hide $0 $1 $2 $3
DestroyFunc Interface_Hide
AddToFunc Interface_Hide
-+ I All (FvwmPager) Iconify true
-+ I All (FvwmButtons) Iconify true
-+ I All (FvwmIconMan) Iconify true
-+ I All (gkrellm) Iconify true
-+ I All (gDeskCal) Iconify true
-+ I All (trayer) Iconify true
++ I All (FvwmPager) Iconify true
++ I All (FvwmButtons-TopPanel) Iconify true
+Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I All (FvwmButtons-TopPanelMenu) Iconify true
++ I All (FvwmButtons-Pager) Iconify true
++ I All (FvwmButtons-BottomButton) Iconify true
++ I All (FvwmButtons-Musi*) Iconify true
++ I All (ApplicationPanel) Iconify true
++ I All (FvwmIconMan) Iconify true
++ I All (gkrellm) Iconify true
++ I All (gDeskCal) Iconify true
++ I All (trayer) Iconify true
+ I EWMH-Set-Desktop
+ I $0 $1 $2 $3 Interface_Show $0 $1 $2 $3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2012-12-11 19:01:09
|
Revision: 134
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=134&view=rev
Author: dominique_libre
Date: 2012-12-11 19:00:59 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix for multiple prefernces (add Schedule to the AppendPreferences calls)
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2012-10-07 15:39:37 UTC (rev 133)
+++ ChangeLog 2012-12-11 19:00:59 UTC (rev 134)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+Mercredi 11 Decembre 2012 Dominique Michel
+ components/functions/Preferences, components/functions/Preferences-Menu:
+ * Fix multiple preferences: Added Shedule to AppendPreferences functions
+
Dimanche 7 Octibre 2012 Dominique Michel
Added a few needed icons
components/functions/Preferences-Menu:
Modified: fvwm/components/functions/Preferences
===================================================================
--- fvwm/components/functions/Preferences 2012-10-07 15:39:37 UTC (rev 133)
+++ fvwm/components/functions/Preferences 2012-12-11 19:00:59 UTC (rev 134)
@@ -20,7 +20,12 @@
+ I Exec echo $1 > $[FVWM_USERDIR]/preferences/$0
# Modification of SavePreferences: add more lines to the preferences file
+# Must be used in conjonction with Schedule or the synchronization will be lost
#
+# Exemple:
+# SavePreferences PreferencesFile "Echo \"FVWM command\""
+# Schedule 333 AppendPreferences PreferencesFile OtherCommand
+#
DestroyFunc AppendPreferences
AddToFunc AppendPreferences
+ I Exec touch $[FVWM_USERDIR]/preferences/$0
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2012-10-07 15:39:37 UTC (rev 133)
+++ fvwm/components/functions/Preferences-Menu 2012-12-11 19:00:59 UTC (rev 134)
@@ -8,7 +8,7 @@
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Used recipe]' Popup /Preferences/Recipes
+ '%22x22/fvwm-crystal/font.png%$[gt.Characters fonts]' Popup /Preferences/Fonts
+ '%22x22/fvwm-crystal/font.png%$[gt.Fonts sizes]' Popup /Preferences/FontSizes
-Test (x xcompmgr) Test (x transset-df) + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Transparency]' Popup /Preferences/Transparency
+Test (x xcompmgr) Test (x transset) + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Transparency]' Popup /Preferences/Transparency
+ '%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
@@ -291,8 +291,8 @@
#
DestroyMenu /Preferences/NotificationAreaManager
AddToMenu /Preferences/NotificationAreaManager
-Test (x trayer) + '%22x22/fvwm-crystal/trayer-app.png%Trayer' SelectNotificationAreaManager trayer
-Test (x stalonetray) + '%22x22/fvwm-crystal/stalonetray-app.png%StaloneTray' SelectNotificationAreaManager stalonetray
+Test (x trayer) + '%22x22/apps/trayer.png%Trayer' SelectNotificationAreaManager trayer
+Test (x stalonetray) + '%22x22/apps/stalonetray.png%StaloneTray' SelectNotificationAreaManager stalonetray
+ '%22x22/fvwm-crystal/trayer-app.png%$[gt.No notification area]' NotificationAreaWidth 0
+ '%22x22/fvwm-crystal/trayer-app.png%$[gt.1 icon width]' NotificationAreaWidth 1
+ '%22x22/fvwm-crystal/trayer-app.png%$[gt.2 icons width]' NotificationAreaWidth 2
@@ -431,23 +431,23 @@
DestroyFunc SetPrivilegedTerminals
AddToFunc SetPrivilegedTerminals
+ I SavePreferences PrivilegedTerminals "Style XTerm FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style URxvt FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style Eterm FPOverrideGrabFocus"
-+ I LoadPreferences PrivilegedTerminals
++ I Schedule 333 AppendPreferences PrivilegedTerminals "Style URxvt FPOverrideGrabFocus"
++ I Schedule 666 AppendPreferences PrivilegedTerminals "Style Eterm FPOverrideGrabFocus"
++ I Schedule 1000 LoadPreferences PrivilegedTerminals
DestroyFunc UnsetPrivilegedTerminals
AddToFunc UnsetPrivilegedTerminals
+ I SavePreferences PrivilegedTerminals "Style XTerm !FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style URxvt !FPOverrideGrabFocus"
-+ I AppendPreferences PrivilegedTerminals "Style Eterm !FPOverrideGrabFocus"
-+ I LoadPreferences PrivilegedTerminals
++ I Schedule 333 AppendPreferences PrivilegedTerminals "Style URxvt !FPOverrideGrabFocus"
++ I Schedule 666 AppendPreferences PrivilegedTerminals "Style Eterm !FPOverrideGrabFocus"
++ I Schedule 1000 LoadPreferences PrivilegedTerminals
#
# Application menu
#
DestroyFunc GenerateApplicationMenu
AddToFunc GenerateApplicationMenu
-+ I A "fvwm-crystal.generate-menu $[FVWM_SYSTEMDIR] $[FVWM_USERDIR]"
++ I A fvwm-crystal.generate-menu $[FVWM_SYSTEMDIR] $[FVWM_USERDIR]
All (Menu-Restart-Dialog) Close
DestroyModuleConfig Menu-Restart-Dialog: *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-11 10:05:41
|
Revision: 217
http://sourceforge.net/p/fvwm-crystal/code/217
Author: dominique_libre
Date: 2013-04-11 10:05:37 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
nplayer(2): introduced dvdnav support
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-11 09:04:02 UTC (rev 216)
+++ ChangeLog 2013-04-11 10:05:37 UTC (rev 217)
@@ -2,7 +2,8 @@
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
- functions/Music-mplayer: fix glitch into the speed control
+ functions/Music-mplayer: fix glitch into the speed control; introduced
+ dvdnav support
funvtions/Music-mplayer2: Introduced all the change from
Music-mplayer
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2013-04-11 09:04:02 UTC (rev 216)
+++ fvwm/components/functions/Music-mplayer 2013-04-11 10:05:37 UTC (rev 217)
@@ -55,7 +55,8 @@
DestroyFunc Load-DVD
AddToFunc Load-DVD
-+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
+#+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
++ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
# Generate /Music/LoadMovie menu
PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2013-04-11 09:04:02 UTC (rev 216)
+++ fvwm/components/functions/Music-mplayer2 2013-04-11 10:05:37 UTC (rev 217)
@@ -54,7 +54,8 @@
# mouse 1 Menu /Playlist-button {{{2
DestroyFunc Load-DVD
AddToFunc Load-DVD
-+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
+#+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
++ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
# Generate /Music/LoadMovie menu
PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-13 01:18:40
|
Revision: 230
http://sourceforge.net/p/fvwm-crystal/code/230
Author: dominique_libre
Date: 2013-04-13 01:18:37 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
Moved some function; cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-audacious
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-12 22:09:07 UTC (rev 229)
+++ ChangeLog 2013-04-13 01:18:37 UTC (rev 230)
@@ -10,11 +10,12 @@
functions/Music-mplayer(2): moved some functions to vomponents/Media;
introduced playlists localizations; playlist cleanup; clecup;
+ playlist copy from crystal playlists to user playlists..
- functions/Music: playlist localization
+ functions/Music: playlist localization; moved some playlist functions
+ here.
functios/Music-alsaplayer: playlist localization; add copy playlist
- function
+ function-> moved in Music
functions/Music-audacious: +infostore variables => plalist localization
-
+
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
functions/Music-mplayer: fix glitch into the speed control; introduced
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-12 22:09:07 UTC (rev 229)
+++ fvwm/components/functions/Music 2013-04-13 01:18:37 UTC (rev 230)
@@ -192,8 +192,18 @@
# Remove playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
DestroyFunc Music-RemovePlaylist-generator
-DestroyFunc FuncFvwmMenuRemovePlaylistDirectory (alsaplayer)
+AddToFunc Music-RemovePlaylist-generator
++ I DestroyMenu recreate /Music/RemovePlaylist
++ I AddToMenu /Music/RemovePlaylist
++ I PipeRead 'for i in $[infostore.UserManagedAudioPlaylists]/*.{m3u,pls}; do \
+ name=$(basename "$i"); \
+ sname=${name%%.m3u}; \
+ sname=${sname%%.pls}; \
+ echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
+
DestroyMenu /Music/RemovePlaylist
+AddToMenu /Music/RemovePlaylist
++ DynamicPopupAction Function Music-RemovePlaylist-generator
# Save playlist dialog (audacious, mpdm, xmms2)
All (Music-SavePlaylist-Dialog) Close
@@ -211,9 +221,24 @@
DestroyFunc FuncFvwmMenuMediaDirectory
DestroyMenu /Music/LoadMediaPlaylist
-# Copy playlist (alsaplayer, mplayer)
+# Copy playlist (alsaplayer, audacious, mplayer)
DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
+AddToFunc FuncFvwmMenuCopyPlaylistDirectory
++ I PipeRead 'case "$0" in \
+ "$[infostore.AudioPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedAudioPlaylists]\'";; \
+ esac; \
+ test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
+ test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --dir "$0" --exec-title "-" --command-file "${myexec}" \
+ --func-name "FuncFvwmMenuCopyPlaylistDirectory"'
+
DestroyMenu /Music/CopyPlaylist
+AddToMenu /Music/CopyPlaylist
+#+ '$[gt.Choose playlist to copy]' Nop
++ MissingSubmenuFunction FuncFvwmMenuCopyPlaylistDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
DestroyFunc Playlist-generator-button
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2013-04-12 22:09:07 UTC (rev 229)
+++ fvwm/components/functions/Music-alsaplayer 2013-04-13 01:18:37 UTC (rev 230)
@@ -71,49 +71,12 @@
AddToFunc Music-ClearPlaylist
+ I Exec exec alsaplayer --clear
-DestroyFunc FuncFvwmMenuRemovePlaylistDirectory
-AddToFunc FuncFvwmMenuRemovePlaylistDirectory
-+ I PipeRead 'case "$0" in \
- "$[infostore.UserManagedAudioPlaylists]"*) myexec="rm -f";; \
- esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
- fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
- --icon-file "${mypng:-22x22/categories/Audio.png}" \
- --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
- --func-name "FuncFvwmMenuRemovePlaylistDirectory"'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ '$[gt.Choose playlist to remove]' Nop
-+ MissingSubmenuFunction FuncFvwmMenuRemovePlaylistDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.UserManagedAudioPlaylists]
-
-DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
-AddToFunc FuncFvwmMenuCopyPlaylistDirectory
-+ I PipeRead 'case "$0" in \
- "$[infostore.AudioPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedAudioPlaylists]\'";; \
- esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
- fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
- --icon-file "${mypng:-22x22/categories/Audio.png}" \
- --dir "$0" --exec-title "-" --command-file "${myexec}" \
- --func-name "FuncFvwmMenuCopyPlaylistDirectory"'
-
-DestroyMenu /Music/CopyPlaylist
-AddToMenu /Music/CopyPlaylist
-+ '$[gt.Choose playlist to copy]' Nop
-+ MissingSubmenuFunction FuncFvwmMenuCopyPlaylistDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
-
-
DestroyFunc Playlist-generator-button
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
+ I AddToMenu /Playlist-button '$[gt.Playlists operations]' Nop
+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-+ I AddToMenu /Playlist-button '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
++ I AddToMenu /Playlist-button '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
+ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
@@ -338,10 +301,7 @@
+ I AddToMenu /Music '$[gt.Playback]' Popup /Playback
+ I AddToMenu /Music '$[gt.Player volume]' Popup /Music/Volume
+ I AddToMenu /Music '$[gt.Speed]' Popup /Speed
-## The following line will screw up the menu. One time on two, it work well,
-## the other time /Music/LoadPlaylist and /Music/RemovePlaylist get shifted.
-#+ I AddToMenu /Music '$[gt.Playlists]' Popup /Playlist-button
-+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Music '$[gt.Playlists]' Popup /Playlist-button
+ I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2013-04-12 22:09:07 UTC (rev 229)
+++ fvwm/components/functions/Music-audacious 2013-04-13 01:18:37 UTC (rev 230)
@@ -30,7 +30,7 @@
+ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
+ I AddToMenu /Player "" Nop
+ I AddToMenu /Player '$[gt.Start Audacious]' Exec exec audacious
-+ I AddToMenu /Player '$[gt.Stop Audacious]' Exec exec killall -9 audacious
++ I AddToMenu /Player '$[gt.Stop Audacious]' Exec exec audtool --shutdown
+ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
# mouse 2 Music-GUI : allready here {{{2
@@ -46,20 +46,6 @@
AddToFunc Music-RemoveSong
+ I Exec exec audtool playlist-delete `audtool playlist-position`
-DestroyFunc Music-RemovePlaylist-generator
-AddToFunc Music-RemovePlaylist-generator
-+ I DestroyMenu recreate /Music/RemovePlaylist
-+ I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[infostore.UserManagedAudioPlaylists]/*.{m3u,pls}; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function Music-RemovePlaylist-generator
-
All (Music-SavePlaylist-Dialog) Close
DestroyModuleConfig Music-SavePlaylist-Dialog: *
*Music-SavePlaylist-Dialog: Title "$[gt.Save playlist]"
@@ -71,16 +57,15 @@
*Music-SavePlaylist-Dialog: Button quit " $[gt.Cancel] " ^[
*Music-SavePlaylist-Dialog: Command Nop
*Music-SavePlaylist-Dialog: Button quit " $[gt.Save] " ^M
-*Music-SavePlaylist-Dialog: Command PipeRead 'numero=1; echo "#EXTM3U" > $[NonManagedPlaylists]/$(PlaylistName).m3u; while [ $numero -le `audtool playlist-length` ]; do \
- echo "#EXTINF:-1,"`audtool playlist-song $numero` >> $[NonManagedPlaylists]/$(PlaylistName).m3u; \
- audtool playlist-song-filename $numero >> $[NonManagedPlaylists]/$(PlaylistName).m3u; \
+*Music-SavePlaylist-Dialog: Command PipeRead 'numero=1; echo "#EXTM3U" > "$[infostore.UserManagedAudioPlaylists]/$(PlaylistName).m3u"; while [ $numero -le `audtool playlist-length` ]; do \
+ echo "#EXTINF:-1,"`audtool playlist-song $numero` >> "$[infostore.UserManagedAudioPlaylists]/$(PlaylistName).m3u"; \
+ audtool playlist-song-filename $numero >> "$[infostore.UserManagedAudioPlaylists]/$(PlaylistName).m3u"; \
numero=`expr $numero + 1`; \
done'
*Music-SavePlaylist-Dialog: Line center
DestroyFunc Music-SavePlaylist
AddToFunc Music-SavePlaylist
-+ I Exec exec mkdir -p $[NonManagedPlaylists]
+ I Module FvwmForm Music-SavePlaylist-Dialog
DestroyFunc FuncFvwmMenuAudioDirectory
@@ -112,6 +97,7 @@
+ I DestroyMenu recreate /Playlist-button
+ I AddToMenu /Playlist-button '$[gt.Remove current song]' Music-RemoveSong
+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Playlist-button '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
+ I AddToMenu /Playlist-button '$[gt.Save playlist...]' Music-SavePlaylist
+ I AddToMenu /Playlist-button "" Nop
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
@@ -197,18 +183,21 @@
AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
-+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
++ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
+ I AddToMenu /Music '$[gt.Remove current song]' Music-RemoveSong
-+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Music '$[gt.Playlist copy]' Popup /Music/CopyPlaylist
+ I AddToMenu /Music "" Nop
+ I PipeRead 'audtool get-volume | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&%%\)\' Popup /Mixer:"'
-+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec exec audtool playlist-repeat-toggle
++ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
++ I AddToMenu /Music '$[gt.Toggle repeat]' Exec exec audtool playlist-repeat-toggle
+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI
-+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI
++ I AddToMenu /Music '$[gt.Start Audacious]' Exec exec audacious
++ I AddToMenu /Music '$[gt.Stop Audacious]' Exec exec audtool --shutdown
++ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
DestroyMenu /Music
AddToMenu /Music
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-07-15 00:06:51
|
Revision: 527
http://sourceforge.net/p/fvwm-crystal/code/527
Author: dominique_libre
Date: 2013-07-15 00:06:48 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Fixed recipe reload
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Developer-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-07-14 23:45:04 UTC (rev 526)
+++ ChangeLog 2013-07-15 00:06:48 UTC (rev 527)
@@ -8,7 +8,8 @@
bin/fvwm-crystal.videomodeswitch*: cleanup; fixed resolution order between the 2 scripts.
+ scripts/ScreenResolution: helper script to generate the ScreenResolution menu
functions/Fvwm-Crystal-Menu: added ScreenResolution menu
-
+ functions/Developer-Menu: fixed recipe reload
+
Samedi 13 Juillet 2013 Dominique Michel
asciidoc/create.sh: added aotomatic man and html file move when only 1 file
is created.
Modified: fvwm/components/functions/Developer-Menu
===================================================================
--- fvwm/components/functions/Developer-Menu 2013-07-14 23:45:04 UTC (rev 526)
+++ fvwm/components/functions/Developer-Menu 2013-07-15 00:06:48 UTC (rev 527)
@@ -2,7 +2,7 @@
DestroyMenu /Developer
AddToMenu /Developer '$[gt.Developer menu]' Title
-+ '$[gt.Reload current recipe]' Include preferences/LastChoosenRecipe
++ '$[gt.Reload current recipe]' ReloadRecipe
+ '$[gt.Identify window]' Pick Module FvwmIdent
+ '$[gt.Toggle FvwmConsole]' FvwmMiniConsole
+ '$[gt.Open debug window]' Include components/functions/Debug-Functions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2014-01-29 23:05:48
|
Revision: 590
http://sourceforge.net/p/fvwm-crystal/code/590
Author: dominique_libre
Date: 2014-01-29 23:05:43 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
functions/Preferences-Menu: make SilentOps to apply immediately
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2014-01-29 02:19:30 UTC (rev 589)
+++ ChangeLog 2014-01-29 23:05:43 UTC (rev 590)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Jeudi 30 janvier 2014 Dominique Michel
+ functions/Preferences-Menu: make SilentOps to apply immediately
+
Mercredi 29 janvier 2014 Dominique Michel
INSTALL, README: Oops, added depend on xdg-user-dirs.
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2014-01-29 02:19:30 UTC (rev 589)
+++ fvwm/components/functions/Preferences-Menu 2014-01-29 23:05:43 UTC (rev 590)
@@ -676,12 +676,14 @@
DestroyFunc SetSilentOps
AddToFunc SetSilentOps
++ I InfoStoreAdd SILENT '2>/dev/null'
+ I SavePreferences SilentOps "InfoStoreAdd SILENT \'2>/dev/null\'"
-+ I Schedule 333 Include components/functions/Exec-Accelerator
++ I Include components/functions/Exec-Accelerator
DestroyFunc UnsetSilentOps
AddToFunc UnsetSilentOps
++ I InfoStoreAdd SILENT ' '
+ I SavePreferences SilentOps "InfoStoreAdd SILENT \' \'"
-+ I Schedule 333 Include components/functions/Exec-Accelerator
++ I Include components/functions/Exec-Accelerator
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2014-02-22 17:06:00
|
Revision: 614
http://sourceforge.net/p/fvwm-crystal/code/614
Author: dominique_libre
Date: 2014-02-22 17:05:57 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
functions/Preferences-menu: force Pager at bottom on recipe change
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2014-02-22 16:46:16 UTC (rev 613)
+++ ChangeLog 2014-02-22 17:05:57 UTC (rev 614)
@@ -4,6 +4,7 @@
scripts/FontEditor/FontEditor: use 14 as default font size; fix for the
width of the top buttons by setting a default font, it is overwritten later.
recipes/LapLeft*, LapRight*: removed non needed PepieRead calls.
+ functions/Preferences-Menu: force Pager on bottom at recipe change.
Verion 3.3.2
------------
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2014-02-22 16:46:16 UTC (rev 613)
+++ fvwm/components/functions/Preferences-Menu 2014-02-22 17:05:57 UTC (rev 614)
@@ -33,6 +33,8 @@
#
DestroyFunc ReloadRecipe
AddToFunc ReloadRecipe
++ I All (FvwmButtons-Pager) PutOnBottom
++ I All (FvwmPager) PutOnBottom
+ I All (FvwmButtons) Close
+ I All (FvwmIconMan) Close
+ I All (FvwmPager) Close
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2015-06-04 19:51:06
|
Revision: 689
http://sourceforge.net/p/fvwm-crystal/code/689
Author: dominique_libre
Date: 2015-06-04 19:51:04 +0000 (Thu, 04 Jun 2015)
Log Message:
-----------
Fix quoting in Reload-Recipe
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2015-06-03 17:04:40 UTC (rev 688)
+++ ChangeLog 2015-06-04 19:51:04 UTC (rev 689)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+jeudi 3 juin 2015
+ components/Pteferences-Menu: Fix quoting in Reload-Recipe.
+
mercredi 2 juin 2015
preferences/DesktopDirs; preferences/IconsDirs: add file name as commented 1st line.
recipes/LapLeft*; recipes/LapRight*: fix panel alignement.
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2015-06-03 17:04:40 UTC (rev 688)
+++ fvwm/components/functions/Preferences-Menu 2015-06-04 19:51:04 UTC (rev 689)
@@ -41,6 +41,8 @@
+ I Exec exec killall stalonetray $[infostore.SILENT]
+ I Exec exec killall trayer $[infostore.SILENT]
+ I Exec exec killall UpdateInfoline $[infostore.SILENT]
+# Reload pref, otherwise Read recipe quoting fail.
++ I LoadPreferences LastChoosenRecipe
+ I Read '$[infostore.Fvwm_Crystal_Recipe]'
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2015-10-12 11:26:25
|
Revision: 738
http://sourceforge.net/p/fvwm-crystal/code/738
Author: dominique_libre
Date: 2015-10-12 11:26:23 +0000 (Mon, 12 Oct 2015)
Log Message:
-----------
functions/CheckForFiles: add the FullScreenApps file into the wanted preferences
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/CheckForFiles
Modified: ChangeLog
===================================================================
--- ChangeLog 2015-10-12 10:49:04 UTC (rev 737)
+++ ChangeLog 2015-10-12 11:26:23 UTC (rev 738)
@@ -8,6 +8,7 @@
whih caused bad filenames, resulting in "No such command 'xyz'" fvwm errors when loading
the resulting application menu.
functions/Preferences-Menu: fix Reload-Recipe when the recipe is not given to the function.
+ functions/CheckForFiles: add the FullScreenApps file into the wanted preferences.
Dimanche 11 octobre 2015
apps/DesktopIcons: typo fix, icon size fixes for the icon row number
Modified: fvwm/components/functions/CheckForFiles
===================================================================
--- fvwm/components/functions/CheckForFiles 2015-10-12 10:49:04 UTC (rev 737)
+++ fvwm/components/functions/CheckForFiles 2015-10-12 11:26:23 UTC (rev 738)
@@ -38,6 +38,7 @@
CheckPrefFile BROWSER
CheckPrefFile EDITOR
CheckPrefFile Startup
+CheckPrefFile FullScreenApps
CheckApplicationsDatabase
Test (EnvIsSet PrefEd) Script scripts/PrefVars/PrefVars
UnsetEnv PrefEd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2019-11-23 14:29:16
|
Revision: 952
http://sourceforge.net/p/fvwm-crystal/code/952
Author: dominique_libre
Date: 2019-11-23 14:29:14 +0000 (Sat, 23 Nov 2019)
Log Message:
-----------
functions to start/stop the XDG menu including at startup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/CheckForFiles
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2019-11-22 18:14:42 UTC (rev 951)
+++ ChangeLog 2019-11-23 14:29:14 UTC (rev 952)
@@ -1,5 +1,10 @@
ChangeLog for FVWM-Crystal
+samedi 23 novembre 2019
+ fvwm/components/functions/CheckForFiles
+ fvwm/components/functions/Preferences-Menu: new functions to start/stop the
+ XDG menu including at startup.
+
vendredi 22 novembre 2019
fvwm/locale/[de_DE|fy_NL|nl_NL].UTF-8/LC_MESSAGES/fvwm-crystal.*: fix the "'".
+ fvwm/locale/it
Modified: fvwm/components/functions/CheckForFiles
===================================================================
--- fvwm/components/functions/CheckForFiles 2019-11-22 18:14:42 UTC (rev 951)
+++ fvwm/components/functions/CheckForFiles 2019-11-23 14:29:14 UTC (rev 952)
@@ -12,7 +12,9 @@
# Load date for last installed package with a desktop file
LoadPreferences DateLastApp
+# XDG Menu
LoadPreferences XDGMenu
+Test (EnvMatch XDGMenu yes) LoadXDGMenu
# Load the system editor
LoadPreferences EDITOR
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2019-11-22 18:14:42 UTC (rev 951)
+++ fvwm/components/functions/Preferences-Menu 2019-11-23 14:29:14 UTC (rev 952)
@@ -393,19 +393,27 @@
+ I SavePreferences DesktopMenu "Mouse 1 R $[Mod] DesktopMenu"
+ I Mouse 1 R $[Mod] DesktopMenu
+DestroyFunc NoXDGMenu
+AddToFunc NoXDGMenu
++ I Key A A $[Mod1] -
++ I Key A A $[Mod1]2 -
+
DestroyFunc SetNoXDGMenu
AddToFunc SetNoXDGMenu
+ I SavePreferences XDGMenu "SetEnv XDGMenu no"
-+ I Key A A $[Mod1] -
-+ I Key A A $[Mod1]2 -
++ I NoXDGMenu
-DestroyFunc SetXDGMenu
-AddToFunc SetXDGMenu
-+ I SavePreferences XDGMenu "SetEnv XDGMenu yes"
+DestroyFunc LoadXDGMenu
+AddToFunc LoadXDGMenu
+ I Include .menu
+ I Key A A $[Mod1] Menu FvwmMenu
+ I Key A A $[Mod1]2 Menu FvwmMenu
+DestroyFunc SetXDGMenu
+AddToFunc SetXDGMenu
++ I SavePreferences XDGMenu "SetEnv XDGMenu yes"
++ I LoadXDGMenu
+
#
# Notification Area Application
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 11:12:29
|
Revision: 987
http://sourceforge.net/p/fvwm-crystal/code/987
Author: dominique_libre
Date: 2020-02-14 11:12:27 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
Fullscreen: fix browser windows behaviour
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-12 11:08:02 UTC (rev 986)
+++ ChangeLog 2020-02-14 11:12:27 UTC (rev 987)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+vendredi 14 février 2020
+ fvwm/components/functions/Fullscreen: fix browser windows behaviour
+
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
fvwm/recipes/Clean;
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2020-02-12 11:08:02 UTC (rev 986)
+++ fvwm/components/functions/Fullscreen 2020-02-14 11:12:27 UTC (rev 987)
@@ -20,6 +20,8 @@
# Fullscreen functions {{{1
# Workaround: We need a wrapper because of buggy browser windowss which think they know better than the window manager.
+# TODO: make a preference setting for which window(s) to trick.
+
DestroyFunc Fullscreen
AddToFunc Fullscreen
+ I ThisWindow (!FvwmButtons, !FvwmPager, !FvwmMiniConsoleNeedsUniqueName, !QuakeConsoleNeedsUniqueName, !FvwmIconMan, !MPlayer) ToggleFullscreen
@@ -31,7 +33,7 @@
+ I WindowStyle !Borders, !Title
+ I UpdateStyles
+ I State 4 True
-+ I Current Schedule Periodic 1000 $[w.id] ThisWindow (State 4, !Fullscreen) Maximize FullScreen True
++ I Current Schedule Periodic 1000 FS$[w.id] ThisWindow (State 4, !Fullscreen) Maximize FullScreen True
DestroyFunc PutOutFSProp
AddToFunc PutOutFSProp
@@ -38,13 +40,13 @@
+ I WindowStyle Borders, Title
+ I UpdateStyles
+ I State 4 False
-+ I Current Deschedule $[w.id]
++ I Current Deschedule FS$[w.id]
DestroyFunc ToggleFullscreen
AddToFunc ToggleFullscreen
-+ I ThisWindow (Fullscreen) PutOutFSProp
-+ I TestRc (NoMatch) PutInFSProp
-+ I Maximize Fullscreen
++ I ThisWindow (Fullscreen, "Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutOutFSProp
++ I KeepRc Maximize Fullscreen
++ I TestRc (NoMatch) ThisWindow ("Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutInFSProp
# Disapear functions {{{1
DestroyFunc Disappear
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-15 10:25:53
|
Revision: 995
http://sourceforge.net/p/fvwm-crystal/code/995
Author: dominique_libre
Date: 2020-02-15 10:25:51 +0000 (Sat, 15 Feb 2020)
Log Message:
-----------
Fullscreen: add Navigator and Firefox into the browser FS workaround
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 21:37:12 UTC (rev 994)
+++ ChangeLog 2020-02-15 10:25:51 UTC (rev 995)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+samedi 15 février 2020
+ fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
+ browser FS workaround
+
vendredi 14 février 2020
fvwm/components/functions/Fullscreen: fix browser windows behaviour
fvwm/scripts/FontSelector/FontSelector: change the default Coloset, workaround
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2020-02-14 21:37:12 UTC (rev 994)
+++ fvwm/components/functions/Fullscreen 2020-02-15 10:25:51 UTC (rev 995)
@@ -44,9 +44,9 @@
DestroyFunc ToggleFullscreen
AddToFunc ToggleFullscreen
-+ I ThisWindow (Fullscreen, "Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutOutFSProp
++ I ThisWindow (Fullscreen, "Navigator|Firefox*|Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutOutFSProp
+ I KeepRc Maximize Fullscreen
-+ I TestRc (NoMatch) ThisWindow ("Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutInFSProp
++ I TestRc (NoMatch) ThisWindow ("Navigator|Firefox*|Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutInFSProp
# Disapear functions {{{1
DestroyFunc Disappear
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 18:03:29
|
Revision: 47
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=47&view=rev
Author: dominique_libre
Date: 2010-12-31 18:03:23 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Added terminator support into AT Exec accelerator
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Exec-Accelerator
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 17:48:27 UTC (rev 46)
+++ ChangeLog 2010-12-31 18:03:23 UTC (rev 47)
@@ -9,6 +9,7 @@
* Icon-Thumbnails : cleanup and added comment
* Debug-Functions : cleanup and support for font preferences
* EWMH-BaseStruts : support for double top panel like in the rewrited amiga recipe
+ * Added terminator support into AT Exec accelerator
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator 2010-12-31 17:48:27 UTC (rev 46)
+++ fvwm/components/functions/Exec-Accelerator 2010-12-31 18:03:23 UTC (rev 47)
@@ -58,7 +58,7 @@
DestroyFunc AT
AddToFunc AT
+ I Window-SetPlacementPolicy
-+ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal) Exec exec $[DefaultTerminal] -title $0 -e $1
++ I Test (!EnvMatch DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator) Exec exec $[DefaultTerminal] -title $0 -e $1
+ I TestRc (NoMatch) Exec exec $[DefaultTerminal] --title "$0" -e "$1"
# Usage: X [command] [command options]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 18:08:55
|
Revision: 48
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=48&view=rev
Author: dominique_libre
Date: 2010-12-31 18:08:49 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
FvwmFormDefault : cleanup and support for font preferences
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/FvwmFormDefault
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 18:03:23 UTC (rev 47)
+++ ChangeLog 2010-12-31 18:08:49 UTC (rev 48)
@@ -10,6 +10,7 @@
* Debug-Functions : cleanup and support for font preferences
* EWMH-BaseStruts : support for double top panel like in the rewrited amiga recipe
* Added terminator support into AT Exec accelerator
+ * FvwmFormDefault : cleanup and support for font preferences
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Modified: fvwm/components/functions/FvwmFormDefault
===================================================================
--- fvwm/components/functions/FvwmFormDefault 2010-12-31 18:03:23 UTC (rev 47)
+++ fvwm/components/functions/FvwmFormDefault 2010-12-31 18:08:49 UTC (rev 48)
@@ -1,14 +1,10 @@
# Default settings for FvwmForm
*FvwmFormDefault: Colorset $[cs_panel_inactive]
*FvwmFormDefault: ItemColorset $[cs_panel_active]
-*FvwmFormDefault: Font "xft:Verdana:pixelsize=13"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmFormDefault: Font "xft:Verdana:pixelsize=13:encoding=iso10646-1"
-*FvwmFormDefault: InputFont "xft:Monospace:pixelsize=13"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmFormDefault: InputFont "xft:Monospace:pixelsize=13:encoding=iso10646-1"
-*FvwmFormDefault: ButtonFont "xft:Verdana:pixelsize=13:Bold"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmFormDefault: ButtonFont "xft:Verdana:pixelsize=13:Bold:encoding=iso10646-1"
-*FvwmFormDefault: TimeoutFont "xft:Verdana:pixelsize=13:Bold"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmFormDefault: TimeOutFont "xft:Verdana:pixelsize=13:Bold:encoding=iso10646-1"
+*FvwmFormDefault: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
+*FvwmFormDefault: InputFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
+*FvwmFormDefault: ButtonFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
+*FvwmFormDefault: TimeoutFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
# ViM modeline {{{1
# vim:foldmethod=marker:foldenable:foldlevel=0:filetype=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 18:29:27
|
Revision: 49
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=49&view=rev
Author: dominique_libre
Date: 2010-12-31 18:29:21 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Window-Decorations : cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Window-Decorations
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 18:08:49 UTC (rev 48)
+++ ChangeLog 2010-12-31 18:29:21 UTC (rev 49)
@@ -11,6 +11,7 @@
* EWMH-BaseStruts : support for double top panel like in the rewrited amiga recipe
* Added terminator support into AT Exec accelerator
* FvwmFormDefault : cleanup and support for font preferences
+ * Window-Decorations : cleanup
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Modified: fvwm/components/functions/Window-Decorations
===================================================================
--- fvwm/components/functions/Window-Decorations 2010-12-31 18:08:49 UTC (rev 48)
+++ fvwm/components/functions/Window-Decorations 2010-12-31 18:29:21 UTC (rev 49)
@@ -11,11 +11,11 @@
DestroyFunc Window-Decorations-Set
AddToFunc Window-Decorations-Set
+ I Test (f '$0/$[Window_Decorations_ButtonModel]') Read '$0/$[Window_Decorations_ButtonModel]'
-+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
+#+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
+ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set \"$*\""
+ I TestRc (NoMatch) KeepRc FindFile Window_Decorations_ButtonModel-Temp '$0' Theme.nextstep Theme.os2 Theme.macosx Theme.windows Theme.amigaos Theme.fvwm-crystal
+ I TestRc (NoMatch) Test (f '$0/$[Window_Decorations_ButtonModel-Temp]') Read '$0/$[Window_Decorations_ButtonModel-Temp]'
-+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
+#+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
+ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set \"$*\""
+ I UnsetEnv Window_Decorations_ButtonModel-Temp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 21:46:18
|
Revision: 54
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=54&view=rev
Author: dominique_libre
Date: 2010-12-31 21:46:10 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Introducing unified Mixer control
Modified Paths:
--------------
ChangeLog
Added Paths:
-----------
fvwm/components/functions/Mixer
Removed Paths:
-------------
fvwm/components/functions/Mixer-amixer
fvwm/components/functions/Mixer-audacious
fvwm/components/functions/Mixer-aumix
fvwm/components/functions/Mixer-cdcd
fvwm/components/functions/Mixer-cmus
fvwm/components/functions/Mixer-mpd
fvwm/components/functions/Mixer-quodlibet
fvwm/components/functions/Mixer-xmms
fvwm/components/functions/Mixer-xmms2
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 18:54:23 UTC (rev 53)
+++ ChangeLog 2010-12-31 21:46:10 UTC (rev 54)
@@ -16,6 +16,7 @@
* Added script Infoline for the Amiga recipe
* script makefontlist : cleanup
* Added scripts to generate the media playlists from the menu
+ * Introducing unified Mixer control
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
Added: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer (rev 0)
+++ fvwm/components/functions/Mixer 2010-12-31 21:46:10 UTC (rev 54)
@@ -0,0 +1,162 @@
+# Support for mixer controls
+# Written by: Dominique Michel
+# All the previously supported mixers are supported now by this file.
+# New mixers will be added here.
+#
+# The original mixers are ALSA mixer (alsamixer, alsamixergui and
+# alsamixerguis (a script part of bmpdj)),
+# audacious, aumix, cdcd, cmus, mpd, quodlibet, xmms and xmms2.
+#
+# The original controls was written by Maciej Delmanowski <ha...@li...>
+# at the exception of alsamixer, bindings for multimadia keys
+# and dB support by Dominique Michel,
+# audacious control by Rafael Antonio Porras Samaniego <sp...@di...>
+# and xmms2 control by Michal Gorny <per...@ma...>
+#
+# Only alsamixer do have direct dB control. It will be approximated for the other mixers.
+#
+# TODO: Put alsamixerguis with fvwm-crystal
+# Move the mixer preferences into the mixer menu (left todo: remove it from the normal pref menu)
+# Change the default Mixer preference to amixer into the preferences directory.
+# Test for Master control for all the mixers when possible.
+# Make a pref setting with the Mixer-Volume-Up(Down) step.
+# Internationalisation.
+
+#
+# WARNINGS: At that time and for what I know, only amixer do have a native dB support.
+# I considere this like a must have feature for a professional mixer control.
+#
+# A good sound card is also a must if you want a good sound experience with your box.
+# The value for the Mixer-Volume-Up(Down) and for the % volume scale in dB
+# was setup with amixer and an audiophile 192 for 3 and 6dB steps.
+# Those values can match or not your sound card (read than they can or not be
+# of 3 and 6 dB with your card).
+# The low values of the sound level can also work or not with your card (Mine is
+# a 24 bits sound card, its dynamic is better than with a 16 bits card.). If they
+# are not working, the sound will be muted.
+# Other mixers than amixer will also give you different steps values (the steps
+# will not have the same value than with amixer). Well, the usual sound related mess.
+# The good news is that amixer look like to be the only professional mixer here...
+# So, if you are not sure but want to know what you are doing, use amixer.
+
+# Value for 3dB steps when no native dB control is used or found. Modify it here
+# if you want or need another value. Used here and for the multimedia keys binding.
+SetEnv 3dB_Step "4.5"
+
+## The following part is for amixer only
+# Test with amixer if a Master mixer exist, fallback to PCM
+Test (EnvMatch Mixer amixer) PipeRead "NVolControl=`amixer get Master \| grep Master -c`; echo SetEnv VolControl `if [[ $NVolControl == 0 ]]; then echo PCM; else echo Master; fi`"
+
+# Test if the sound card is capable of dB control with amixer.
+# pro: better dB approximation
+# con: one more env variable, more complicated code
+Test (EnvMatch Mixer amixer) PipeRead "echo SetEnv SnddB `amixer get $[VolControl] \| grep dB -c`"
+Test (!EnvMatch Mixer amixer) PipeRead "echo SetEnv SnddB 0"
+##
+
+## Test with aumix if master mixer exist, fallback to pcm
+Test (EnvMatch Mixer aumix) PipeRead "echo SetEnv NVolControl `aumix -q \| grep master -c`"
+Test (EnvMatch Mixer aumix) PipeRead "echo SetEnv VolControl `if [[ $NVolControl == 0 ]]; then echo w; else echo v; fi`"
+Test (EnvMatch Mixer aumix) UnsetEnv NVolControl
+##
+
+## Basics functions
+
+DestroyFunc Mixer-Volume
+AddToFunc Mixer-Volume
++ I Test (EnvMatch Mixer amixer) Exec exec amixer set '$[VolControl]' $0 > /dev/null
++ I Test (EnvMatch Mixer audacious) Exec exec audtool set-volume $0
++ I Test (EnvMatch Mixer aumix) Exec exec aumix -'$[VolControl]' $0
++ I Test (EnvMatch Mixer cdcd) Exec exec cdcd setvol $0 > /dev/null
++ I Test (EnvMatch Mixer cmus) Exec cmus-remote --volume $0% > /dev/null
++ I Test (EnvMatch Mixer mpd) Exec exec mpc volume $0 > /dev/null
++ I Test (EnvMatch Mixer quodlibet) Exec exec quodlibet --volume $0 > /dev/null
++ I Test (EnvMatch Mixer xmms) Exec exec xmms-shell -e "volume $0"
++ I Test (EnvMatch Mixer xmms2) Exec exec xmms2 config output.volume $0/$0
+
+DestroyFunc Mixer-Volume-Up
+AddToFunc Mixer-Volume-Up
++ I Test (EnvMatch Mixer amixer) Exec exec amixer set '$[VolControl]' $0%+ > /dev/null
++ I Test (EnvMatch Mixer audacious) Exec exec audtool set-volume +$0
++ I Test (EnvMatch Mixer aumix) Exec exec aumix -'$[VolControl]' +$0
++ I Test (EnvMatch Mixer cdcd) Nop
++ I Test (EnvMatch Mixer cmus) Exec cmus-remote --volume +$0% > /dev/null
++ I Test (EnvMatch Mixer mpd) Exec exec mpc volume +$0 > /dev/null
++ I Test (EnvMatch Mixer quodlibet) Exec exec quodlibet --volume-up > /dev/null
++ I Test (EnvMatch Mixer xmms) Exec exec xmms-shell -e "upvolume $0"
++ I Test (EnvMatch Mixer xmms2) Nop
+
+DestroyFunc Mixer-Volume-Down
+AddToFunc Mixer-Volume-Down
++ I Test (EnvMatch Mixer amixer) Exec exec amixer set '$[VolControl]' $0%- > /dev/null
++ I Test (EnvMatch Mixer audacious) Exec exec audtool set-volume -$0
++ I Test (EnvMatch Mixer aumix) Exec exec aumix -'$[VolControl]' -$0
++ I Test (EnvMatch Mixer cdcd) Nop
++ I Test (EnvMatch Mixer cmus) Exec cmus-remote --volume -$0% > /dev/null
++ I Test (EnvMatch Mixer mpd) Exec exec mpc volume -$0 > /dev/null
++ I Test (EnvMatch Mixer quodlibet) Exec exec quodlibet --volume-down > /dev/null
++ I Test (EnvMatch Mixer xmms) Exec exec xmms-shell -e "downvolume $0"
++ I Test (EnvMatch Mixer xmms2) Nop
+
+DestroyFunc Mixer-Volume-dB
+AddToFunc Mixer-Volume-dB
++ I Exec exec amixer -c 0 -- set '$[VolControl]' $0 > /dev/null
+
+DestroyFunc Mixer-GUI
+AddToFunc Mixer-GUI
+Test (EnvMatch Mixer amixer) + I All ("ALSA Mixer") Close
+Test (EnvMatch Mixer amixer) + I TestRc (NoMatch) None ("ALSA Mixer") Test (x alsamixerguis) X alsamixerguis
+Test (EnvMatch Mixer amixer) + I TestRc (Match) None ("ALSA Mixer") Test (x alsamixergui) X alsamixergui
+Test (EnvMatch Mixer amixer) + I TestRc (Match) None ("ALSA Mixer") AT "ALSA Mixer" alsamixer
+Test (EnvMatch Mixer audacious) + I Nop
+Test (EnvMatch Mixer aumix) + I All (aumix) Close
+Test (EnvMatch Mixer aumix) + I TestRc (NoMatch) None (aumix) X aumix
+Test (EnvMatch Mixer cdcd) + I Nop
+Test (EnvMatch Mixer cmus) + I Nop
+Test (EnvMatch Mixer mpd) + I Nop
+Test (EnvMatch Mixer quodlibet) + I Nop
+Test (EnvMatch Mixer xmms) + I Nop
+Test (EnvMatch Mixer xmms2) + I Nop
+
+## Mixer menu
+DestroyMenu /Mixer
+AddToMenu /Mixer
++ '$[gt.Show main mixer]' Mixer-GUI
++ '%22x22/fvwm-crystal/multimedia-volume-control.png%$[gt.Audio mixer]' Popup /Preferences/Mixer
++ "" Nop
+Test (!EnvMatch SnddB 0) + " 0 dB" Mixer-Volume-dB 0dB
+Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "-3dB"
+Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "-6dB"
+Test (!EnvMatch SnddB 0) + " -9 dB" Mixer-Volume-dB "-9dB"
+Test (!EnvMatch SnddB 0) + "-12 dB" Mixer-Volume-dB "-12dB"
+Test (!EnvMatch SnddB 0) + "-15 dB" Mixer-Volume-dB "-15dB"
+Test (!EnvMatch SnddB 0) + "-18 dB" Mixer-Volume-dB "-18dB"
+Test (!EnvMatch SnddB 0) + "-24 dB" Mixer-Volume-dB "-24dB"
+Test (!EnvMatch SnddB 0) + "-30 dB" Mixer-Volume-dB "-30dB"
+Test (!EnvMatch SnddB 0) + "-36 dB" Mixer-Volume-dB "-36dB"
+Test (!EnvMatch SnddB 0) + "-42 dB" Mixer-Volume-dB "-42dB"
+Test (!EnvMatch SnddB 0) + "-48 dB" Mixer-Volume-dB "-48dB"
+Test (!EnvMatch SnddB 0) + "-54 dB" Mixer-Volume-dB "-54dB"
+Test (!EnvMatch SnddB 0) + "-60 dB" Mixer-Volume-dB "-60dB"
+Test (EnvMatch SnddB 0) + " 0 dB" Mixer-Volume 100
+Test (EnvMatch SnddB 0) + " -3 dB" Mixer-Volume 95
+Test (EnvMatch SnddB 0) + " -6 dB" Mixer-Volume 91
+Test (EnvMatch SnddB 0) + " -9 dB" Mixer-Volume 86
+Test (EnvMatch SnddB 0) + "-12 dB" Mixer-Volume 81
+Test (EnvMatch SnddB 0) + "-15 dB" Mixer-Volume 76
+Test (EnvMatch SnddB 0) + "-18 dB" Mixer-Volume 72
+Test (EnvMatch SnddB 0) + "-24 dB" Mixer-Volume 62
+Test (EnvMatch SnddB 0) + "-30 dB" Mixer-Volume 53
+Test (EnvMatch SnddB 0) + "-36 dB" Mixer-Volume 43
+Test (EnvMatch SnddB 0) + "-42 dB" Mixer-Volume 34
+Test (EnvMatch SnddB 0) + "-48 dB" Mixer-Volume 24
+Test (EnvMatch SnddB 0) + "-54 dB" Mixer-Volume 15
+Test (EnvMatch SnddB 0) + "-60 dB" Mixer-Volume 6
++ " 0" Mixer-Volume 0
+Test (!EnvMatch SnddB 0) + "" Nop
+Test (!EnvMatch SnddB 0) + " +6 dB" Mixer-Volume-dB "6dB+"
+Test (!EnvMatch SnddB 0) + " +3 dB" Mixer-Volume-dB "3dB+"
+Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "3dB-"
+Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "6dB-"
+
+# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-amixer
===================================================================
--- fvwm/components/functions/Mixer-amixer 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-amixer 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,68 +0,0 @@
-# Support for ALSA mixer
-# Written by: Maciej Delmanowski <ha...@li...>
-# Dominique Michel: support for alsamixergui(s) + dB volume control
-
-# Test if a Master mixer exist, fallback to PCM
-PipeRead "echo SetEnv NVolControl `amixer get Master \| grep Master -c`"
-PipeRead "echo SetEnv VolControl `if [[ $NVolControl == 0 ]]; then echo PCM; else echo Master; fi`"
-UnsetEnv NVolControl
-
-# Test if the sound card is capable of dB control:
-PipeRead "echo SetEnv SnddB `amixer get $[VolControl] \| grep dB -c`"
-
-# Binding for multimedia keys
-Key XF86AudioLowerVolume A $[Mod0] Mixer-Volume-Down "5"
-Key XF86AudioRaiseVolume A $[Mod0] Mixer-Volume-Up "5"
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec amixer set '$[VolControl]' $0 > /dev/null
-
-DestroyFunc Mixer-Volume-dB
-AddToFunc Mixer-Volume-dB
-+ I Exec exec amixer -c 0 set '$[VolControl]' $0 > /dev/null
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec exec amixer set '$[VolControl]' $0%+ > /dev/null
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec exec amixer set '$[VolControl]' $0%- > /dev/null
-
-# Launch and stop alsamixer. If you have more as one sound card, install
-# alsamixer, alsamixergui and bmpdj. alsamixerguis is part of bmpdj.
-DestroyFunc Mixer-GUI
-AddToFunc Mixer-GUI
-+ I All ("ALSA Mixer") Close
-+ I TestRc (NoMatch) None ("ALSA Mixer") Test (x alsamixerguis) X alsamixerguis
-+ I TestRc (Match) None ("ALSA Mixer") Test (x alsamixergui) X alsamixergui
-+ I TestRc (Match) None ("ALSA Mixer") AT "ALSA Mixer" alsamixer
-
-# Mixer menu
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ '$[gt.Show main mixer]' Mixer-GUI
-+ "" Nop
-Test (!EnvMatch SnddB 0) + " 0 dB" Mixer-Volume-dB 0dB
-Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "3dB-"
-Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "6dB-"
-Test (!EnvMatch SnddB 0) + "-12 dB" Mixer-Volume-dB "12dB-"
-Test (!EnvMatch SnddB 0) + "-18 dB" Mixer-Volume-dB "18dB-"
-Test (!EnvMatch SnddB 0) + "-24 dB" Mixer-Volume-dB "24dB-"
-Test (!EnvMatch SnddB 0) + "-30 dB" Mixer-Volume-dB "30dB-"
-Test (!EnvMatch SnddB 0) + "-36 dB" Mixer-Volume-dB "36dB-"
-Test (EnvMatch SnddB 0) + "100%%" Mixer-Volume 100
-Test (EnvMatch SnddB 0) + " 90%%" Mixer-Volume 90
-Test (EnvMatch SnddB 0) + " 80%%" Mixer-Volume 80
-Test (EnvMatch SnddB 0) + " 50%%" Mixer-Volume 50
-Test (EnvMatch SnddB 0) + " 30%%" Mixer-Volume 30
-+ " 0" Mixer-Volume 0
-Test (!EnvMatch SnddB 0) + "" Nop
-Test (!EnvMatch SnddB 0) + " +6 dB" Mixer-Volume-dB "6dB+"
-Test (!EnvMatch SnddB 0) + " +3 dB" Mixer-Volume-dB "3dB+"
-Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "3dB-"
-Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "6dB-"
-
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-audacious
===================================================================
--- fvwm/components/functions/Mixer-audacious 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-audacious 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,29 +0,0 @@
-# Support for Audacious music player - mixer control
-# Written by: Rafael Antonio Porras Samaniego <sp...@di...>
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec audtool set-volume $0
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec exec audtool set-volume +$0
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec exec audtool set-volume -$0
-
-DestroyFunc Mixer-GUI
-AddToFunc Mixer-GUI
-+ I Nop
-
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-aumix
===================================================================
--- fvwm/components/functions/Mixer-aumix 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-aumix 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,46 +0,0 @@
-# Support for Aumix mixer
-# Written by: Maciej Delmanowski <ha...@po...>
-#
-# Binding for multimedia key and db support by
-# Dominique Michel <dom...@so...>
-
-# Binding for multimedia keys
-
-Key XF86AudioLowerVolume A $[Mod0] Mixer-Volume-Down 5
-Key XF86AudioRaiseVolume A $[Mod0] Mixer-Volume-Up 5
-
-# Basics functions
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec aumix -v $0
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec exec aumix -v +$0
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec exec aumix -v -$0
-
-DestroyFunc Mixer-GUI
-AddToFunc Mixer-GUI
-+ I All (aumix) Close
-+ I TestRc (NoMatch) None (aumix) X aumix
-
-# Mixer menu
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ '$[gt.Show main mixer]' Mixer-GUI
-+ "" Nop
-+ " 0 dB%" Mixer-Volume 100
-+ " -3 db%" Mixer-Volume 92
-+ " -6 db%" Mixer-Volume 85
-+ "-12 db%" Mixer-Volume 70
-+ "-18 db%" Mixer-Volume 55
-+ "-24 db%" Mixer-Volume 40
-+ "-30 db%" Mixer-Volume 25
-+ "-40 db%" Mixer-Volume 1
-+ " 0%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-cdcd
===================================================================
--- fvwm/components/functions/Mixer-cdcd 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-cdcd 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,30 +0,0 @@
-# Support for CDCD CDAudio player - mixer control
-# Written by: Maciej Delmanowski <ha...@po...>
-# sed commands by: Grzegorz Niew�owski <ho...@do...>
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec cdcd setvol $0 > /dev/null
-
-DestroyFunc Mixer-Volume-Up
-#AddToFunc Mixer-Volume-Up
-#+ I Nop
-
-DestroyFunc Mixer-Volume-Down
-#AddToFunc Mixer-Volume-Down
-#+ I Nop
-
-DestroyFunc Mixer-GUI
-#AddToFunc Mixer-GUI
-#+ I Nop
-
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-cmus
===================================================================
--- fvwm/components/functions/Mixer-cmus 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-cmus 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,32 +0,0 @@
-# Support for C* Music Player
-# Written by: Maciej Delmanowski <ha...@po...>
-
-# These functions control the mixer volume using 'cmus-remote' commands.
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec cmus-remote --volume $0% > /dev/null
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec cmus-remote --volume +$0% > /dev/null
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec cmus-remote --volume -$0% > /dev/null
-
-DestroyFunc Mixer-GUI
-AddToFunc Mixer-GUI
-+ I Nop
-
-# Mixer menu
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-mpd
===================================================================
--- fvwm/components/functions/Mixer-mpd 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-mpd 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,33 +0,0 @@
-# Support for MPD music player
-# Written by: Maciej Delmanowski <ha...@po...>
-# sed commands by: Grzegorz Niew�owski <ho...@do...>
-
-# These functions control the mixer volume using 'mpc' commands.
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec mpc volume $0 > /dev/null
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec exec mpc volume +$0 > /dev/null
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec exec mpc volume -$0 > /dev/null
-
-DestroyFunc Mixer-GUI
-#AddToFunc Mixer-GUI
-#+ I Nop
-
-# Mixer menu
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-quodlibet
===================================================================
--- fvwm/components/functions/Mixer-quodlibet 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-quodlibet 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,30 +0,0 @@
-# Support for MPD music player - mixer control
-# Written by: Maciej Delmanowski <ha...@po...>
-# sed commands by: Grzegorz Niew�owski <ho...@do...>
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec quodlibet --volume $0 > /dev/null
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec exec quodlibet --volume-up > /dev/null
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec exec quodlibet --volume-down > /dev/null
-
-DestroyFunc Mixer-GUI
-#AddToFunc Mixer-GUI
-#+ I Nop
-
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-xmms
===================================================================
--- fvwm/components/functions/Mixer-xmms 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-xmms 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,29 +0,0 @@
-# Support for XMMS music player - mixer control
-# Written by: Maciej Delmanowski <ha...@po...>
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec xmms-shell -e "volume $0"
-
-DestroyFunc Mixer-Volume-Up
-AddToFunc Mixer-Volume-Up
-+ I Exec exec xmms-shell -e "upvolume $0"
-
-DestroyFunc Mixer-Volume-Down
-AddToFunc Mixer-Volume-Down
-+ I Exec exec xmms-shell -e "downvolume $0"
-
-DestroyFunc Mixer-GUI
-#AddToFunc Mixer-GUI
-#+ I Nop
-
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
Deleted: fvwm/components/functions/Mixer-xmms2
===================================================================
--- fvwm/components/functions/Mixer-xmms2 2010-12-31 18:54:23 UTC (rev 53)
+++ fvwm/components/functions/Mixer-xmms2 2010-12-31 21:46:10 UTC (rev 54)
@@ -1,32 +0,0 @@
-# Support for XMMS2
-# Author: Michal Gorny <per...@ma...>
-# Based on xmms2 command-line client, version 0.2 DrBombay
-
-
-DestroyFunc Mixer-Volume
-AddToFunc Mixer-Volume
-+ I Exec exec xmms2 config output.volume $0/$0
-
-DestroyFunc Mixer-Volume-Up
-#AddToFunc Mixer-Volume-Up
-#+ I Nop
-
-DestroyFunc Mixer-Volume-Down
-#AddToFunc Mixer-Volume-Down
-#+ I Nop
-
-DestroyFunc Mixer-GUI
-#AddToFunc Mixer-GUI
-#+ I Nop
-
-# Mixer menu
-DestroyMenu /Mixer
-AddToMenu /Mixer
-+ "100%%" Mixer-Volume 100
-+ "90%%" Mixer-Volume 90
-+ "80%%" Mixer-Volume 80
-+ "50%%" Mixer-Volume 50
-+ "30%%" Mixer-Volume 30
-+ "0%%" Mixer-Volume 0
-
-# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-01 12:14:15
|
Revision: 57
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=57&view=rev
Author: dominique_libre
Date: 2011-01-01 12:14:09 +0000 (Sat, 01 Jan 2011)
Log Message:
-----------
Wimdow-Raise-Move-Lover witll focus on a non overlapped window of the current page, if any.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Window-Basic
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-01 10:28:10 UTC (rev 56)
+++ ChangeLog 2011-01-01 12:14:09 UTC (rev 57)
@@ -1,7 +1,8 @@
ChangeLog for FVWM-Crystal
Samedi 1 janvier 2011 Dominique Michel
- * Wimdow-Raise-Move-Lover witll focus the previous window of the current page, if any.
+ * Wimdow-Raise-Move-Lover witll focus on a non overlapped window
+ of the current page, if any.
Vendredi 31 décembre 2011 Dominique Michel
* Added font support from font preference in FvwmIdent
Modified: fvwm/components/functions/Window-Basic
===================================================================
--- fvwm/components/functions/Window-Basic 2011-01-01 10:28:10 UTC (rev 56)
+++ fvwm/components/functions/Window-Basic 2011-01-01 12:14:09 UTC (rev 57)
@@ -47,7 +47,7 @@
+ C Raise
+ M Move
+ C Lower
-+ C Prev (!Iconic, CurrentPage) Focus
++ C All (!Iconic, !Focused, CurrentPage, !Overlapped) Focus
# }
# { Used in recipes/Amiga for the pager
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:03:41
|
Revision: 60
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=60&view=rev
Author: dominique_libre
Date: 2011-01-29 20:03:35 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Updated About dialog
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/About
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:00:34 UTC (rev 59)
+++ ChangeLog 2011-01-29 20:03:35 UTC (rev 60)
@@ -4,6 +4,7 @@
* Removed non needed UTF-8 test
* Updated DesktopDir in fvwm-crystal.generate-menu
* Added mplayer wrapper
+ * Updated About dialog
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2011-01-29 20:00:34 UTC (rev 59)
+++ fvwm/components/functions/About 2011-01-29 20:03:35 UTC (rev 60)
@@ -5,14 +5,16 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.0.6"
+*About: Text "$[gt.Version]: 3.0.7"
*About: Line center
*About: Line center
-*About: Text "$[gt.Author]: Maciej Delmanowski <ha...@gn...>"
+*About: Text "$[gt.Original author]: Maciej Delmanowski <ha...@gn...>"
*About: Line center
-*About: Text "http://fvwm-crystal.org/"
+*About: Text "$[gt.Author]: Dominique Michel <dom...@so...>
*About: Line center
+*About: Text "http://fvwm-crystal.sourceforge.net/"
*About: Line center
+*About: Line center
*About: Text "$[gt.FVWM version]: $[version.num] $[version.info]"
*About: Line center
*About: Text "http://www.fvwm.org/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:09:51
|
Revision: 61
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=61&view=rev
Author: dominique_libre
Date: 2011-01-29 20:09:44 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Developper menu: replaced man system doc browser by support for info browser via emacs, pinfo or tkinfo
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Developer-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:03:35 UTC (rev 60)
+++ ChangeLog 2011-01-29 20:09:44 UTC (rev 61)
@@ -5,6 +5,8 @@
* Updated DesktopDir in fvwm-crystal.generate-menu
* Added mplayer wrapper
* Updated About dialog
+ * Developper menu: replaced man system doc browser by support for info browser
+ via emacs, pinfo or tkinfo
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Developer-Menu
===================================================================
--- fvwm/components/functions/Developer-Menu 2011-01-29 20:03:35 UTC (rev 60)
+++ fvwm/components/functions/Developer-Menu 2011-01-29 20:09:44 UTC (rev 61)
@@ -1,8 +1,5 @@
# FVWM-Crystal Developer menu
-# Where is your system documentation:
-SetEnv System_Documentation /usr/share/doc
-
DestroyMenu /Developer
AddToMenu /Developer '$[gt.Developer menu]' Title
+ '$[gt.Reload current recipe]' Include preferences/LastChoosenRecipe
@@ -22,9 +19,11 @@
+ '$[gt.FVWM-Crystal documentation]' Popup /Developer/FVWM-Crystal-Documentation
+ '$[gt.FVWM manpages]' Popup /Developer/FvwmManpages
+ '$[gt.X.org documentation]' Popup /Developer/X.Org-Documentation
-+ MissingSubmenuFunction System_Documentation-generator
-+ '$[gt.Main system documentation]' Popup $[System_Documentation]
+ "" Nop
+Test (x emacs) + '$[gt.Browse Info pages with EMacs]' X emacs -f info
+Test (x pinfo) + '$[gt.Browse Info pages with pinfo]' A pinfo
+Test (x tkinfo) + '$[gt.Browse Info pages with tkinfo]' X tkinfo
++ "" Nop
+ '$[gt.WindowStyle]' Popup /Developer/WindowStyle
DestroyMenu /Developer/FVWM-Crystal-Documentation
@@ -154,19 +153,6 @@
+ "%22x22/categories/help.png%exa" FvwmViewManPage exa
+ "%22x22/categories/help.png%fbdevhw" FvwmViewManPage fbdevhw
-DestroyFunc System_Documentation-generator
-AddToFunc System_Documentation-generator
-+ I Test (EnvIsSet PAGER) PipeRead 'case "$0" in \
- "$[System_Documentation]"*) myexec="$[PAGER]" direxec="mc";; \
- esac; \
- fvwm-menu-directory --func-name System_Documentation-generator --dir "$0" --exec-t="${direxec}" \
- --exec-file "${myexec}"'
-+ I Test (!EnvIsSet PAGER) PipeRead 'case "$0" in \
- "$[System_Documentation]"*) myexec="less" direxec="mc";; \
- esac; \
- fvwm-menu-directory --func-name System_Documentation-generator --dir "$0" --exec-t="${direxec}" \
- --exec-file "${myexec}"'
-
DestroyMenu /Developer/WindowStyle
AddToMenu /Developer/WindowStyle "WindowStyle" Title
+ "DestroyWindowStyle" Pick DestroyWindowStyle
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X