Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[114]
|
From: <dom...@us...> - 2012-04-30 20:43:04
|
Revision: 114
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=114&view=rev
Author: dominique_libre
Date: 2012-04-30 20:42:55 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Multimedia players: introducing common file with common functions, updated man pages
Modified Paths:
--------------
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-mocp
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
fvwm/components/functions/Music-xmms2
man/ApplicationDatabase.1
man/CrystalRoxHOWTO.1
man/FVWMCrystalFAQ.1
man/KeyboardBindings.1
man/MouseBindings.1
man/Tips.1
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music 2012-04-30 20:42:55 UTC (rev 114)
@@ -49,7 +49,7 @@
## didn't changed it. We keep them or the user settings. ##
###########################################################################
-# The playlists was previously in different places. They are now in 3 places:
+# The playlists was previously in different places. They are now in 4 places:
# ~/PlaylistsAudio for the playlists of audio files,
# ~/PlaylistsVideo for the playlists of movie files and
# ~/Playlists/Audio for "by the user managed" audio playlists
@@ -61,6 +61,12 @@
# Todo: function AddFavorite (add a playlist from ~/PlaylistsAudio and
# ~/PlaylistsVideo to the "by the user managed" playlists
#
+# Note: according to /etc/xdg/iser-dirs.defaults, the default medias paths
+# are $HOME/Music and $HOME/Videos and will be translated on a
+# per-path-element basis into the users locale.
+# TODO: centralize here the paths
+# make them locale aware
+#
# WARNING: I cannot test xmms anymore because it compile but just don't run for me.
# In consequence, xmms support will be removed with the next release.
###############################################################################
@@ -74,10 +80,10 @@
## Variables ##
###############
## Where are stored the playlists, needed in all cases (<=recereate playlists)
-Piperead 'echo SetEnv AudioPlaylists "/home/`id -un`/PlaylistsAudio"'
-Piperead 'echo SetEnv VideoPlaylists "/home/`id -un`/PlaylistsVideo"'
-Piperead 'echo SetEnv UserManagedAudioPlaylists "/home/`id -un`/Playlists/Audio"'
-Piperead 'echo SetEnv UserManagedVideoPlaylists "/home/`id -un`/Playlists/Video"'
+Piperead 'echo SetEnv AudioPlaylists "/home/`id -un`/Playlists/Audio"'
+Piperead 'echo SetEnv VideoPlaylists "/home/`id -un`/Playlists/Video"'
+Piperead 'echo SetEnv UserManagedAudioPlaylists "/home/`id -un`/Playlists/User/Audio"'
+Piperead 'echo SetEnv UserManagedVideoPlaylists "/home/`id -un`/Playlists/User/Video"'
## speed control ## (alsaplayer, mplayer)
# player normal speed (We want normal speed)
UnSetEnv speed
@@ -89,7 +95,7 @@
Test (EnvMatch MusicPlayer alsaplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
Test (EnvMatch MusicPlayer mplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
## We don't want player specific variables lying around
-# mplayer
+# mplayer(2)
UnSetEnv USERDIR
UnSetEnv fvwm_video_path
UnSetEnv fvwm_video_path2
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music-alsaplayer 2012-04-30 20:42:55 UTC (rev 114)
@@ -91,7 +91,7 @@
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
"$[AudioPlaylists]"*) myexec="alsaplayer -e";; \
- "$[NonManagedPlaylists]"*) myexec="alsaplayer -e";; \
+ "$[UserManagedAudioPlaylists]"*) myexec="alsaplayer -e";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -104,8 +104,8 @@
AddToMenu /Music/LoadPlaylist
+ '$[gt.Choose playlist to load]' Nop
+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
DestroyFunc Music-ClearPlaylist
AddToFunc Music-ClearPlaylist
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music-audacious 2012-04-30 20:42:55 UTC (rev 114)
@@ -96,7 +96,7 @@
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
"$[AudioPlaylists]"*) myexec="audacious";; \
- "$[NonManagedPlaylists]"*) myexec="audacious";; \
+ "$[UserManagedAudioPlaylists]"*) myexec="audacious";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -109,8 +109,8 @@
DestroyMenu /Music/LoadPlaylist
AddToMenu /Music/LoadPlaylist
+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
DestroyFunc Music-ClearPlaylist
AddToFunc Music-ClearPlaylist
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music-mocp 2012-04-30 20:42:55 UTC (rev 114)
@@ -48,7 +48,7 @@
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
"$[AudioPlaylists]"*) myexec="mocp --sync --append";; \
- "$[NonManagedPlaylists]"*) myexec="mocp --sync --append";; \
+ "$[UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -61,8 +61,8 @@
DestroyMenu /Music/LoadPlaylist
AddToMenu /Music/LoadPlaylist
+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
DestroyFunc Music-ClearPlaylist
AddToFunc Music-ClearPlaylist
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music-mplayer 2012-04-30 20:42:55 UTC (rev 114)
@@ -112,7 +112,9 @@
AddToFunc FuncFvwmMenuAudioDirectory
+ I PipeRead 'case "$0" in \
"$[AudioPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
- "$[NonManagedPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
+ "$[UserManagedAudioPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
+ "$[VideoPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
+ "$[UserManagedVideoPlaylists]"*) myexec="fvwm-crystal.mplayer-wrapper list $USERDIR";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -125,8 +127,10 @@
DestroyMenu /Music/LoadPlaylist
AddToMenu /Music/LoadPlaylist
+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[UserManagedAudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Video playlists]' Popup $[VideoPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal video playlists]' Popup $[UserManagedVideoPlaylists]
DestroyFunc Music-RemovePlaylist-generator
AddToFunc Music-RemovePlaylist-generator
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music-mplayer2 2012-04-30 20:42:55 UTC (rev 114)
@@ -127,10 +127,10 @@
DestroyMenu /Music/LoadPlaylist
AddToMenu /Music/LoadPlaylist
+ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[UserManagedAudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[VideoPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[UserManagedVideoPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Video playlists]' Popup $[VideoPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal video playlists]' Popup $[UserManagedVideoPlaylists]
DestroyFunc Music-RemovePlaylist-generator
AddToFunc Music-RemovePlaylist-generator
Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2 2011-06-13 12:21:48 UTC (rev 113)
+++ fvwm/components/functions/Music-xmms2 2012-04-30 20:42:55 UTC (rev 114)
@@ -98,7 +98,7 @@
AddToFunc FuncFvwmMenuPlaylistDirectory
+ I PipeRead 'case "$0" in \
"$[AudioPlaylists]"*) myexec="$[fvwm_audio_exec]";; \
- "$[NonManagedPlaylists]"*) myexec="$[fvwm_audio_exec]";; \
+ "$[UserManagedAudioPlaylists]"*) myexec="$[fvwm_audio_exec]";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
@@ -109,7 +109,7 @@
DestroyMenu /Music/AddPlaylist
AddToMenu /Music/AddPlaylist MissingSubmenuFunction FuncFvwmMenuPlaylistDirectory
+ '%22x22/categories/video_movies_view.png%$[gt.Audio playlists]' Popup $[AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Custom playlists]' Popup $[NonManagedPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Personal audio playlists]' Popup $[UserManagedAudioPlaylists]
DestroyFunc Music-RemoveSong
AddToFunc Music-RemoveSong
Modified: man/ApplicationDatabase.1
===================================================================
--- man/ApplicationDatabase.1 2011-06-13 12:21:48 UTC (rev 113)
+++ man/ApplicationDatabase.1 2012-04-30 20:42:55 UTC (rev 114)
@@ -1,4 +1,4 @@
-.TH ApplicationDatabase 1 "mai 06, 2007" "version 3.0.5" "FVWM-Crystal"
+.TH ApplicationDatabase 1 "June 13, 2011" "version 3.1.0" "FVWM-Crystal"
.SH NAME
\fBFVWM-Crystal: application database
\fB
Modified: man/CrystalRoxHOWTO.1
===================================================================
--- man/CrystalRoxHOWTO.1 2011-06-13 12:21:48 UTC (rev 113)
+++ man/CrystalRoxHOWTO.1 2012-04-30 20:42:55 UTC (rev 114)
@@ -1,4 +1,4 @@
-.TH CrystalRoxHOWTO 1 "mai 05, 2007" "version 3.0.5" "FVWM-Crystal"
+.TH CrystalRoxHOWTO 1 "June 13, 2011" "version 3.1.0" "FVWM-Crystal"
.SH NAME
Crystal ROX! HOWTO
(Read as "Crystal rocks!" ;)
Modified: man/FVWMCrystalFAQ.1
===================================================================
--- man/FVWMCrystalFAQ.1 2011-06-13 12:21:48 UTC (rev 113)
+++ man/FVWMCrystalFAQ.1 2012-04-30 20:42:55 UTC (rev 114)
@@ -1,4 +1,4 @@
-.TH FVWMCrystalFAQ 1 "mai 06, 2007" "version 3.0.5" "FVWM-Crystal"
+.TH FVWMCrystalFAQ 1 "June 13, 2011" "version 3.1.0" "FVWM-Crystal"
.SH NAME
\fBFVWM-Crystal - FAQ
\fB
@@ -46,13 +46,15 @@
.SS Q 1.1: What is FVWM-Crystal?
A: It's a set of FVWM configuration files, some Python and shell scripts, a set of application icons and images. This combination produces a fairly decent and customized Linux window manager using FVWM as it's basic component. With additional file managers, such as ROX-Filer or Nautilus (from GNOME Project) you can create useable and good-looking Linux desktop environment.
.SS Q 1.2: Who are the authors?
-A: The author and current maintainer of FVWM-Crystal is Maciej Delmanowski. You can contact with him using his e-mail account <ha...@be...> or through Jabber network <ha...@ja...>.
+A: The initial author of FVWM-Crystal is Maciej Delmanowski. You can contact with him using his e-mail account <ha...@be...> or through Jabber network <ha...@ja...>.
.PP
+The current maintainer and developper is Dominique Michel <dom...@so...>
+.PP
FVWM-Crystal could not be in the present state without the help of other people. You can find their list in the AUTHORS file included in the project's package.
.SS Q 1.3: Where can I get the newest version?
-A: Newest stable version can be always found on the main FVWM-Crystal website: http://fvwm-crystal.berlios.de/. Some GNU/Linux distributions have already included packages, usually named 'fvwm-crystal'.
+A: Newest stable version can be always found on the main FVWM-Crystal website: http://fvwm-crystal.sourceforge.net/. Some GNU/Linux distributions have already included packages, usually named 'fvwm-crystal'.
.PP
-You can also use the development version. It is a Darcs repository which contains the newest code. You can find more information on http://linux.net.pl/~harnir/fvwm-crystal/.
+You can also use the development version. It is a subversion (svn) repository which contains the newest code. You can find more information on http://sourceforge.net/projects/fvwm-crystal/.
.SS Q 1.4: Is there a mailing list?
A: Yes, there is. You can read the archives by pointing your web browser on http://lists.berlios.de/pipermail/fvwm-crystal-users/
.PP
@@ -65,7 +67,7 @@
A: If you want to use FVWM-Crystal, you need to have:
.RS
.IP \(bu 3
-FVWM window manager, version 2.5.13+
+FVWM window manager, version 2.6.1+
.IP \(bu 3
Python interpreter
.IP \(bu 3
@@ -77,7 +79,7 @@
You can install these applications to get additional functionality:
.RS
.IP \(bu 3
-terminal emulator (xterm, Aterm, Eterm, urxvt, mrxvt, gnome-terminal, konsole, mgt or xfce4-terminal are currently supported)
+terminal emulator (xterm, Aterm, Eterm, urxvt, mrxvt, gnome-terminal, konsole, mgt, terminator or xfce4-terminal are currently supported)
.IP \(bu 3
ImageMagick - for window thumbnails and making screenshots
.IP \(bu 3
@@ -91,10 +93,14 @@
.IP \(bu 3
GDM (gdmflexiserver) - for shutdown/reboot/new login commands
.IP \(bu 3
-a music player - XMMS, XMMS2 , QuodLibet, cdcd, alsaplayer or MPD are supported
+Xephyr - for nested sessions
.IP \(bu 3
+a music player - audacious, cmus, mocp, mpd, XMMS, XMMS2 , QuodLibet, cdcd, alsaplayer, mplayer, mplayer2 or MPD are supported
+.IP \(bu 3
graphical file manager - ROX-Filer or Nautilus
.IP \(bu 3
+transset-df and xcompmgr - for true transparency support
+.IP \(bu 3
gnome-session - for saving amd restoring of your FVWM-Crystal session
.RE
.PP
@@ -194,8 +200,8 @@
http://www.gnome.org
.RE
.PP
-.SS Q 2.2: Can I use FVWM-Crystal with "stable" FVWM branch (2.4.x)?
-A: No. Old FVWM version (so called "stable") is in fact, old. 2.5.x series has many improvements over the stable tree, for example support for PNG images, new modules, improvements in existing modules and bugfixes. I strongly encurage you to not use FVWM 2.4.x for FVWM-Crystal and install the newest unstable version.
+.SS Q 2.2: Can I use FVWM-Crystal with "old stable" FVWM branch (2.4.x)?
+A: No. Old FVWM version is in fact, old. 2.5.x series has many improvements over the stable tree, for example support for PNG images, new modules, improvements in existing modules and bugfixes. From 2.6.1, FVWM doesn't offer stable and unstable version anymore. For the best experience with FVWM-Crystal, I strongly encurage you to install and use the newest stable version (2.6.1 at that time of writing).
.SS Q 2.3: How to install FVWM-Crystal from distributed packages?
A: Unpack fvwm-crystal-X.Y.tar.gz to an empty directory. After that cd into unpacked directory and execute:
.PP
@@ -214,12 +220,12 @@
.fam T
.fi
After successful installation you can copy sample ~/.Xresources file from "addons/" directory of the FVWM-Crystal package, if you don't have one. If you use GDM as your login manager, you can copy file "addons/fvwm-crystal.desktop" to /usr/share/xsessions, so you will be able to select FVWM-Crystal as your window manager.
-.SS Q 2.4 How to install FVWM-Crystal from darcs repository?
-A: You need to create a local copy of a darcs repository by issuing command:
+.SS Q 2.4 How to install FVWM-Crystal from the subversion repository?
+A: You need to create a local copy of a subversion repository by issuing command:
.PP
.nf
.fam C
- darcs get http://linux.net.pl/~harnir/fvwm-crystal/
+ svn co https://fvwm-crystal.svn.sourceforge.net/svnroot/fvwm-crystal fvwm-crystal
.fam T
.fi
@@ -227,7 +233,6 @@
.PP
.nf
.fam C
- darcs changes > ChangeLog
make install
.fam T
@@ -274,7 +279,7 @@
.PP
.nf
.fam C
- Exec=gnome-session --choose-session=FVWM-Crystal
+ Exec=gnome-session
.fam T
.fi
Save the file as '/usr/share/xsessions/fvwm-crystal.desktop' so at gdm can see it. Be aware at the exact location of this file can differ between different linux distributions.
@@ -283,7 +288,7 @@
.PP
.nf
.fam C
- gnome-session --choose-session=FVWM-Crystal
+ gnome-session
.fam T
.fi
.IP 4) 4
Modified: man/KeyboardBindings.1
===================================================================
--- man/KeyboardBindings.1 2011-06-13 12:21:48 UTC (rev 113)
+++ man/KeyboardBindings.1 2012-04-30 20:42:55 UTC (rev 114)
@@ -1,9 +1,11 @@
-.TH KeyboardBindings 1 "mai 06, 2007" "version 3.0.5" "FVWM-Crystal"
+.TH KeyboardBindings 1 "June 13, 2011" "version 3.1.0" "FVWM-Crystal"
.SH NAME
\fBFVWM-Crystal Keyboard Bindings Reference
\fB
.SH AUTHOR
Maciej Delmanowski <ha...@be...>
+.SH MAINTAINER
+Dominique Michel <dom...@so...>
.SH DESCRIPTION
In this file you can find all keyboard bindings used in FVWM-Crystal desktop.
.SS LEGEND
Modified: man/MouseBindings.1
===================================================================
--- man/MouseBindings.1 2011-06-13 12:21:48 UTC (rev 113)
+++ man/MouseBindings.1 2012-04-30 20:42:55 UTC (rev 114)
@@ -1,4 +1,4 @@
-.TH MouseBindings 1 "mai 05, 2007" "version 3.0.5" "FVWM-Crystal"
+.TH MouseBindings 1 "June 13, 2011" "version 3.1.0" "FVWM-Crystal"
.SH NAME
\fBFVWM-Crystal Mouse Bindings Reference
\fB
@@ -39,6 +39,10 @@
.B
MMB
Middle Mouse Button
+.TP
+.B
+WHEEL
+Mouse wheel
.SH THE DESKTOP
.TP
.B
@@ -115,6 +119,10 @@
.B
MMB + drag
Resize selected window (choose window \fBedge\fP(s) to move).
+.TP
+.B
+WHEEL
+Increase or decrease the transparency of the selected window.
.SH TITLEBAR BUTTONS
.TP
.B
Modified: man/Tips.1
===================================================================
--- man/Tips.1 2011-06-13 12:21:48 UTC (rev 113)
+++ man/Tips.1 2012-04-30 20:42:55 UTC (rev 114)
@@ -1,4 +1,4 @@
-.TH Tips 1 "mai 05, 2007" "version 3.0.5" "FVWM-Crystal"
+.TH Tips 1 "June 13, 2011" "version 3.1.0" "FVWM-Crystal"
.SH NAME
FVWM-Crystal: Tips & tricks
.SH DESCRIPTION
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
