Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[516]
|
From: <dom...@us...> - 2013-07-13 18:29:21
|
Revision: 516
http://sourceforge.net/p/fvwm-crystal/code/516
Author: dominique_libre
Date: 2013-07-13 18:29:19 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
asciidoc/create.sh: added aotomatic man and html file move when only 1 file is created. components/apps/DesktopIcons: added mount/umout options using mount, pmount and pmount-gui. asciidoc/fvwm-crystal: desktop icons - added mount/umount description. + fvwm/scripts/findumpartitions: helper script for dito.
Modified Paths:
--------------
ChangeLog
asciidoc/create.sh
asciidoc/fvwm-crystal
doc/html/fvwm-crystal.html
fvwm/components/apps/DesktopIcons
man/fvwm-crystal.1
Added Paths:
-----------
fvwm/scripts/findumpartitions
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-07-06 20:29:17 UTC (rev 515)
+++ ChangeLog 2013-07-13 18:29:19 UTC (rev 516)
@@ -1,5 +1,14 @@
ChangeLog for FVWM-Crystal
+Samedi 13 Juillet 2013 Dominique Michel
+ asciidoc/create.sh: added aotomatic man and html file move when only 1 file
+ is created.
+ components/apps/DesktopIcons: added mount/umout options using mount, pmount
+ and pmount-gui.
+ asciidoc/fvwm-crystal: desktop icons - added mount/umount description.
++ scripts/findumpartitions: helper script that check for unmounted partitions
+ in /etc&fstab and add the corresponding menu items if they have the user(s) key.
+
Samedi 6 Juillet 2013 Dominique Michel
Added trasmission icons and app script
Modified: asciidoc/create.sh
===================================================================
--- asciidoc/create.sh 2013-07-06 20:29:17 UTC (rev 515)
+++ asciidoc/create.sh 2013-07-13 18:29:19 UTC (rev 516)
@@ -33,4 +33,6 @@
controldoc
else
dodoc $1
+ mv $1.1 ../man/$1.1
+ mv $1.html ../doc/html/$1.html
fi
Modified: asciidoc/fvwm-crystal
===================================================================
--- asciidoc/fvwm-crystal 2013-07-06 20:29:17 UTC (rev 515)
+++ asciidoc/fvwm-crystal 2013-07-13 18:29:19 UTC (rev 516)
@@ -2,7 +2,7 @@
===============
:doctype: manpage
:man source: fvwm-crystal
-:man version: 3.2.1
+:man version: 3.2.3
:man manual: FVWM-Crystal
NAME
@@ -206,8 +206,10 @@
In the same menu, you can select the actions for the left and middle clicks. Several file managers have built-in support: +Thunar+, +Worker+ (a very good Directory Opus clone), +Midnight Commander+ (mc in short), +ROX-Filer+, +Nautilus+, +Krusader+, +Xfm+, +4Pane+, +Ranger+ (a Vim like file manager), +PCMan FM+, +gentoo+ (another dopus clone), +Konqueror+, +emelFM2+ (which, like mc, support extfs), +Dolphin+ and +SpaceFM+.
+
A custom command can also be set where both console commands and X commands can be used. A self documented form will be launched, which let you update and save the configuration.
++
+If +pmount-gui+ is installed, the contextual menu of the Home icon will show 2 options for mounting and unmounting the removable devices. The contextual menu of the partition's icons will show the mount points of the patitions and an item for umounting the partitions. This options will use +pumount+ if the partition is mounted in /media, +umount+ otherwise.
+You will also get menu items to mount the unmounted partitions, if they are present in /etc/fstab with the option user(s).
-
_Application Icons_::
+
They are the icons of the iconic applications. This will work only with the recipe that doesn't provide an icon manager for them.
Modified: doc/html/fvwm-crystal.html
===================================================================
--- doc/html/fvwm-crystal.html 2013-07-06 20:29:17 UTC (rev 515)
+++ doc/html/fvwm-crystal.html 2013-07-13 18:29:19 UTC (rev 516)
@@ -976,6 +976,8 @@
<div class="paragraph"><p>When <code>FVWM-Crystal</code> is selected, it will show all its icons be default. Right clicking on the <code>Home</code> icon will open the <code>Desktop icons preference menu</code>. the <code>Home</code> icon is mandatory, both the <code>XDG user directories</code> icons and the <code>partitions</code> icons are optionals.</p></div>
<div class="paragraph"><p>In the same menu, you can select the actions for the left and middle clicks. Several file managers have built-in support: <code>Thunar</code>, <code>Worker</code> (a very good Directory Opus clone), <code>Midnight Commander</code> (mc in short), <code>ROX-Filer</code>, <code>Nautilus</code>, <code>Krusader</code>, <code>Xfm</code>, <code>4Pane</code>, <code>Ranger</code> (a Vim like file manager), <code>PCMan FM</code>, <code>gentoo</code> (another dopus clone), <code>Konqueror</code>, <code>emelFM2</code> (which, like mc, support extfs), <code>Dolphin</code> and <code>SpaceFM</code>.</p></div>
<div class="paragraph"><p>A custom command can also be set where both console commands and X commands can be used. A self documented form will be launched, which let you update and save the configuration.</p></div>
+<div class="paragraph"><p>If <code>pmount-gui</code> is installed, the contextual menu of the Home icon will show 2 options for mounting and unmounting the removable devices. The contextual menu of the partition’s icons will show the mount points of the patitions and an item for umounting the partitions. This options will use <code>pumount</code> if the partition is mounted in /media, <code>umount</code> otherwise.
+You will also get menu items to mount the unmounted partitions, if they are present in /etc/fstab with the option user(s).</p></div>
</dd>
<dt class="hdlist1">
<em>Application Icons</em>
@@ -1251,7 +1253,7 @@
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-06-06 21:48:56 CEST
+Last updated 2013-07-13 20:15:11 CEST
</div>
</div>
</body>
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2013-07-06 20:29:17 UTC (rev 515)
+++ fvwm/components/apps/DesktopIcons 2013-07-13 18:29:19 UTC (rev 516)
@@ -1,6 +1,6 @@
-# Desktop icons with Thunar and mc support for Fvwm-Crystal.
+# Desktop icons for Fvwm-Crystal. Support any file manager.
#
-# Version: 2.0.0
+# Version: 2.1.0
# Licence: GPL 2
#
# Written by Dominique Michel <dom...@us...>, 2010-2013
@@ -14,7 +14,8 @@
# A middle click will do the same with mc (Thunar doesn't heve a built-in shell).
# A right click on the $HOME icon open the preferences.
#
-# Requirement: gawk, sort, Thunar, mc and /proc/mounts.
+# Requirement: gawk, sort, Thunar, mc, mount, and /proc/mounts.
+# Recommanded: pmount and pmount-gui
# Preferences {{{1
LoadPreferences ShowXDG
@@ -45,6 +46,15 @@
# IconBox {{{1
#+ I PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+$[infostore.DeskIconsXSup))))x$(($[vp.height]-92))+$((36+((50*$[IconColumnsNumber]))))+46"'
+# umount/pumount wrapper
+DestroyFunc DesktopUmount
+AddToFunc DesktopUmount
++ I PipeRead 'if [[ $(echo $* | grep -e media) != "" ]]; \
+ then exem="pumount"; \
+ else exem="umount"; \
+ fi ; \
+ echo "+ \\\"Unmount $*\\\" Exec exec ${exem} $*"'
+
# The button {{{1
DestroyFunc ShowDesktopIcons
AddToFunc ShowDesktopIcons
@@ -77,6 +87,7 @@
echo "DestroyMenu /Partitions${line}"; \
echo "AddToMenu /Partitions${line}"; \
echo "+ ${line} Nop"; \
+ echo "DesktopUmount ${line}"; \
if [[ "${line}" == "/" ]]; \
then icon="48x48/categories/Root.png"; \
else if [[ $(echo ${line} | grep -e cdrom -e dvd) != "" ]]; \
@@ -99,10 +110,23 @@
# Preferences menu {{{2
DestroyMenu /Preferences/IconLauncher
AddToMenu /Preferences/IconLauncher
-+ '$[gt.XDG user directories]' PopUp /Preferences/XDG
-+ '$[gt.Mounted partitions]' PopUp /Preferences/Partitions
-+ '$[gt.Actions]' PopUp /Preferences/FileBrowser
++ DynamicPopupAction Function IconLauncher-generator /Preferences/IconLauncher
+DestroyFunc FindUMPartitions
+AddToFunc FindUMPartitions
++ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do partition=${line}; exist=0; while read lines; do if [[ ${partition} == ${lines} ]]; then exist=1; fi; done </tmp/Icon-Drives; if [[ ${exist} == 0 ]]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
+
+DestroyFunc IconLauncher-generator
+AddToFunc IconLauncher-generator
++ I DestroyMenu recreate $0
++ I AddToMenu $0
++ I Test (x pmount-gui) AddToMenu $0 'PMount' Exec exec pmount-gui
++ I Test (x pmount-gui) AddToMenu $0 'PUmount' Exec exec pmount-gui -u
++ I PipeRead "${FVWM_SYSTEMDIR}/scripts/findumpartitions $0"
++ I AddToMenu $0 '$[gt.XDG user directories]' PopUp /Preferences/XDG
++ I AddToMenu $0 '$[gt.Mounted partitions]' PopUp /Preferences/Partitions
++ I AddToMenu $0 '$[gt.Actions]' PopUp /Preferences/FileBrowser
+
DestroyMenu /Preferences/XDG
AddToMenu /Preferences/XDG
+ '%22x22/fvwm-crystal/On.png%$[gt.On]' ShowXDG
Added: fvwm/scripts/findumpartitions
===================================================================
--- fvwm/scripts/findumpartitions (rev 0)
+++ fvwm/scripts/findumpartitions 2013-07-13 18:29:19 UTC (rev 516)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Find the unmounted partitions from /etc/fstab
+# This file is part of FVWM-Crystal
+#
+# Version: 1.0.0
+# Licence: GPL 2
+#
+# Written by Dominique Michel <dom...@us...>, 2013
+# for Fvwm-Crystal.
+
+cat /etc/fstab|grep user|grep -v \#| awk '{print $2}'|while read line
+do partition=${line}
+ exist=0
+ while read lines
+ do if [[ ${partition} == ${lines} ]]
+ then exist=1
+ fi
+ done </tmp/Icon-Drives
+ if [[ ${exist} == 0 ]]
+ then echo AddToMenu $1 \"Mount ${line}\" Exec exec mount ${line}
+ fi
+done
+
Property changes on: fvwm/scripts/findumpartitions
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: man/fvwm-crystal.1
===================================================================
--- man/fvwm-crystal.1 2013-07-06 20:29:17 UTC (rev 515)
+++ man/fvwm-crystal.1 2013-07-13 18:29:19 UTC (rev 516)
@@ -2,12 +2,12 @@
.\" Title: fvwm-crystal
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\" Date: 06/18/2013
+.\" Date: 07/13/2013
.\" Manual: FVWM-Crystal
-.\" Source: fvwm-crystal 3.2.1
+.\" Source: fvwm-crystal 3.2.3
.\" Language: English
.\"
-.TH "FVWM\-CRYSTAL" "1" "06/18/2013" "fvwm\-crystal 3\&.2\&.1" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL" "1" "07/13/2013" "fvwm\-crystal 3\&.2\&.3" "FVWM\-Crystal"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -492,6 +492,14 @@
SpaceFM\&.
.sp
A custom command can also be set where both console commands and X commands can be used\&. A self documented form will be launched, which let you update and save the configuration\&.
+.sp
+If
+pmount\-gui
+is installed, the contextual menu of the Home icon will show 2 options for mounting and unmounting the removable devices\&. The contextual menu of the partition\(cqs icons will show the mount points of the patitions and an item for umounting the partitions\&. This options will use
+pumount
+if the partition is mounted in /media,
+umount
+otherwise\&. You will also get menu items to mount the unmounted partitions, if they are present in /etc/fstab with the option user(s)\&.
.RE
.PP
\fIApplication Icons\fR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
