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

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

Revision: 998
          http://sourceforge.net/p/fvwm-crystal/code/998
Author:   dominique_libre
Date:     2020-02-17 12:13:08 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Fix the madia players styles

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Media-Music-functions
    fvwm/components/functions/Music-alsaplayer
    fvwm/components/functions/Music-audacious
    fvwm/components/functions/Music-cdcd
    fvwm/components/functions/Music-cmus
    fvwm/components/functions/Music-mocp
    fvwm/components/functions/Music-mpd
    fvwm/components/functions/Music-mplayer
    fvwm/components/functions/Music-mplayer2
    fvwm/components/functions/Music-quodlibet
    fvwm/components/functions/Music-xmms2
    fvwm/components/styles/Application-Icons-22-32

Added Paths:
-----------
    fvwm/components/styles/MediaPlayers-Style

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-02-17 12:03:55 UTC (rev 997)
+++ ChangeLog	2020-02-17 12:13:08 UTC (rev 998)
@@ -5,6 +5,21 @@
 
 lundi 17 février
   fvwm/components/functions/Exit: cleanup and try our best to find systemctl when present
+  fvwm/components/functions/Media-Music-functions;
+  fvwm/components/functions/Music-alsaplayer;
+  fvwm/components/functions/Music-audacious;
+  fvwm/components/functions/Music-cdcd;
+  fvwm/components/functions/Music-cmus;
+  fvwm/components/functions/Music-mocp;
+  fvwm/components/functions/Music-mpd;
+  fvwm/components/functions/Music-mplayer;
+  fvwm/components/functions/Music-mplayer2;
+  fvwm/components/functions/Music-quodlibet;
+  fvwm/components/functions/Music-xmms2;
+  fvwm/components/styles/Application-Icons-22-32;
++ fvwm/components/styles/MediaPlayers-Style: Fix the madia players styles.
+  This fix the icons at top after a recipe change bug and make the non
+  prefered players to get the defaut style in any case.
 
 samedi 15 février 2020
   fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
@@ -3630,3 +3645,4 @@
 
 Thu Jul  7 23:32:06 CEST 2005  Maciej Delmanowski <ha...@po...>
   * Initialization of the darcs repository
+M       ChangeLog

Modified: fvwm/components/functions/Media-Music-functions
===================================================================
--- fvwm/components/functions/Media-Music-functions	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Media-Music-functions	2020-02-17 12:13:08 UTC (rev 998)
@@ -30,7 +30,7 @@
 InfoStoreRemove fvwm_audio_exec
 
 # Styles for media players windows {{{1
-# See components/styles/Applications-Icons-22-32
+Include components/styles/MediaPlayers-Style
 
 ############################################################
 ### We don't want player specific functions lying around ###
@@ -64,6 +64,13 @@
 DestroyMenu /Player
 # mouse 2 Music-GUI : allready here {{{2
 
+DestroyFunc Music-Iconify
+AddToFunc Music-Iconify
++ I ThisWindow (Iconic) WindowStyle Icon
++ I TestRc (NoMatch) WindowStyle NoIcon
++ I Iconify toggle
++ I UpdateStyles
+
 # mouse 3 Music-QJackGUI (all)
 DestroyFunc Music-QJackGUI
 AddToFunc Music-QJackGUI
@@ -70,7 +77,7 @@
 # startjack first => it is under the other windows
 + I All (start_jack) Iconify toggle
 + I All (qjackctl) Iconify toggle
-+ I All (start_cadence) Iconify toggle
++ I All (start_cadence) Iconify
 + I All (Cadence) Iconify toggle
 + I All (Cadence-*) Iconify toggle
 + I All (Catia) Iconify toggle

Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-alsaplayer	2020-02-17 12:13:08 UTC (rev 998)
@@ -5,6 +5,9 @@
 # Initialisations, shared functions {{{1
 Include components/functions/Music
 
+Style alsaplayer 	NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+Style Alsaplayer 	UseStyle alsaplayer
+
 # Alsaplayer normal speed
 InfoStoreAdd speed 1
 

Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-audacious	2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,10 @@
 
 # Initialisations, shared functions
 Include components/functions/Music
+Style audacious 	StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+Style Audacious		UseStyle audacious
+Style playlist		UseStyle audacious
+Style equalizer		UseStyle audacious
 
 # First button {{{1
 # Player controls and prefs

Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-cdcd	2020-02-17 12:13:08 UTC (rev 998)
@@ -11,6 +11,7 @@
 
 # Initialisations, shared functions
 Include components/functions/Music
+Style cdcd 		NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
 
 # First button {{{1
 # Player controls and prefs

Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-cmus	2020-02-17 12:13:08 UTC (rev 998)
@@ -11,6 +11,8 @@
 
 # Initialisations, shared functions
 Include components/functions/Music
+Style cmus 		NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style cmus*		UseStyle cmus
 
 # First button
 # Player controls and prefs {{{1

Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mocp	2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,8 @@
 
 # Initialisations, shared functions
 Include components/functions/Music
+Style mocp		NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style MOC*		UseStyle mocp
 
 # First button {{{1
 # Player controls and prefs

Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mpd	2020-02-17 12:13:08 UTC (rev 998)
@@ -10,6 +10,11 @@
 
 # Initialisations, shared functions
 Include components/functions/Music
+Style FvwmApplet-MpdAddSong 	MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style FvwmApplet-MpdPlEd 	MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style pympd 			NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style gmpc			UseStyle pympd
+Style Gmpc			UseStyle pympd
 
 # Variables {{{1
 # mpd know where the playlists are. See 'man mpd.conf'

Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mplayer	2020-02-17 12:13:08 UTC (rev 998)
@@ -3,6 +3,9 @@
 
 # Load shared functions and initialisations 
 Include components/functions/Media
+Style MPlayer			!Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style "MPlayer - Video"		Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style XDRadio			NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
 
 # specific function
 AddToMenu /Music/Start

Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mplayer2	2020-02-17 12:13:08 UTC (rev 998)
@@ -3,6 +3,9 @@
 
 # Initialisations, shared functions
 Include components/functions/Media
+Style MPlayer			!Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style "MPlayer - Video"		Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style XDRadio			NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
 
 # specific function
 AddToMenu /Music/Start

Modified: fvwm/components/functions/Music-quodlibet
===================================================================
--- fvwm/components/functions/Music-quodlibet	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-quodlibet	2020-02-17 12:13:08 UTC (rev 998)
@@ -4,14 +4,16 @@
 # Modifications, debugging and improvments by Dominique Michel 2008-2019
 # <dom...@us...>
 
-# Initialisations, shared functions
+# Initialisations, shared functions {{{1
 Include components/functions/Music
+Style quodlibet		NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style Quodlibet		UseStyle quodlibet
 
 # First button {{{1
 # Player controls and prefs
-# mouse 1 Menu /Player {{{1
+# mouse 1 Menu /Player {{{2
 AddToFunc Music-GUI
-+ I All (quodlibet) Iconify toggle
++ I All (Quodlibet) Iconify toggle
 
 AddToFunc Player-generator
 + I DestroyMenu recreate /Player
@@ -27,7 +29,7 @@
 
 # mouse 2 Music-GUI : allready here {{{2
 ## mouse 3 Music-QJackGUI : in Music
-# mouse 2 Menu /Playback {{{1
+# mouse 2 Menu /Playback
 AddToFunc Music-Next
 + I Exec quodlibet --next > /dev/null
 
@@ -89,6 +91,8 @@
 + I AddToMenu /Music '$[gt.Show/Hide player]'	Music-GUI
 + I AddToMenu /Music '$[gt.Show/Hide Audio controls]'	Music-QJackGUI
 + I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Start Quod Libet]' Exec exec quodlibet > /dev/null
++ I AddToMenu /Music '$[gt.Stop player]' Exec exec quodlibet --quit
 + I AddToMenu /Music '$[gt.Music player]'	Popup /Preferences/MusicPlayer
 
 # Fake button functions {{{1

Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-xmms2	2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,12 @@
 
 # Initialisations, shared functions {{{1
 Include components/functions/Music
+Style xmms		StaysOnTop
+Style XMMS_Player	StartIconic, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
+Style XMMS_Playlist	UseStyle XMMS_Player
+Style XMMS_Equalizer	UseStyle XMMS_Player
+Style Gxmms2		NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style xmms2		UseStyle Gxmms2
 InfoStoreAdd fvwm_audio_exec "nyxmms2 add -P"
 
 # First button {{{1

Modified: fvwm/components/styles/Application-Icons-22-32
===================================================================
--- fvwm/components/styles/Application-Icons-22-32	2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/styles/Application-Icons-22-32	2020-02-17 12:13:08 UTC (rev 998)
@@ -499,10 +499,6 @@
 Style zita*		UseStyle Zita-at1
 Style zsafe		MiniIcon 22x22/apps/zsafe.png, Icon 32x32/apps/zsafe.png
 
-# We want the media players styles to be applied last {{{1
-Style Alsaplayer	NoActiveIconOverride, NoIcon, WindowListSkip, !Sticky, StaysPut
-Style alsaplayer	UseStyle Alsaplayer
-
 Style Audacious		StartIconic, NoActiveIconOverride, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
 Style playlist		StartIconic, !Title, Sticky, WindowListSkip
 Style equalizer		UseStyle playlist
@@ -509,11 +505,6 @@
 
 Style beep-media-player	!Title
 
-Style cmus		NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
-Style mocp		UseStyle cmus
-
-Style MPlayer		!Title, !Borders, EWMHIgnoreStackingOrderHints
-Style "MPlayer - Video"	Title, Borders, EWMHIgnoreStackingOrderHints
 Style XDRadio		NoIcon, Sticky, WindowListSkip
 
 Style xmms		StaysOnTop
@@ -521,8 +512,6 @@
 Style XMMS_Playlist	UseStyle XMMS_Player
 Style XMMS_Equalizer	UseStyle XMMS_Player
 
-Style quodlibet		StaysOnTop, NoIcon, Sticky, WindowListSkip
-
 Style qjackctl		NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
 Style start_jack	UseStyle qjackctl
 Style start_cadence	UseStyle qjackctl

Added: fvwm/components/styles/MediaPlayers-Style
===================================================================
--- fvwm/components/styles/MediaPlayers-Style	                        (rev 0)
+++ fvwm/components/styles/MediaPlayers-Style	2020-02-17 12:13:08 UTC (rev 998)
@@ -0,0 +1,67 @@
+# Styles for supported media players
+# The prefered player styles is changed later when it is loaded
+
+Style alsaplayer	NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, \
+			MiniIcon 22x22/apps/alsaplayer.png, Icon 32x32/apps/alsaplayer.png
+Style Alsaplayer	UseStyle alsaplayer
+
+Style audacious		!StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
+			MiniIcon 22x22/apps/audacious.png, Icon 32x32/apps/audacious.png
+Style Audacious		UseStyle audacious
+Style playlist		UseStyle audacious
+Style equalizer		UseStyle audacious
+
+Style beep-media-player	!Title
+
+Style cdcd		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/cdcd.png, Icon 32x32/apps/cdcd.png
+
+Style cmus		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/cmus.png, Icon 32x32/apps/cmus.png
+Style cmus*		UseStyle cmus
+
+Style mocp		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/mocp.png, Icon 32x32/apps/mocp.png
+Style MOC*		UseStyle mocp
+
+Style FvwmApplet-MpdAddSong MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style FvwmApplet-MpdPlEd MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style pympd		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/pympd.png, Icon 32x32/apps/pympd.png
+Style gmpc		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style Gmpc		UseStyle gmpc
+
+Style MPlayer		!Title, !Borders, EWMHIgnoreStackingOrderHints, \
+			MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+Style "MPlayer - Video"	Title, Borders, EWMHIgnoreStackingOrderHints, \
+			MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+Style XDRadio		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+
+#mplayer2 as mplayer
+
+Style quodlibet		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+Style Quodlibet		UseStyle quodlibet
+
+Style xmms		!StaysOnTop
+Style XMMS_Player	!StartIconic, Title, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+Style XMMS_Playlist	UseStyle XMMS_Player
+Style XMMS_Equalizer	UseStyle XMMS_Player
+Style Gxmms2		NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+			MiniIcon 22x22/apps/xmms2.png, Icon 32x32/apps/xmms2.png
+Style xmms2		UseStyle Gxmms2
+
+# helpers
+Style qjackctl		NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
+Style start_jack	UseStyle qjackctl
+Style start_cadence	UseStyle qjackctl
+Style Cadence		UseStyle qjackctl
+Style Cadence-*		UseStyle qjackctl
+Style cadence.py	UseStyle qjackctl
+Style Catia		UseStyle qjackctl
+Style Claudia		UseStyle qjackctl
+Style Logs		UseStyle qjackctl
+Style Render		UseStyle qjackctl

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