Move xsetbg from ~/lib/xsetbg to ~/admin/prog/xsetbg

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index 0ffae9f011b85f925264621c55c97b4b4818be57..21b289a2316dd395b0445ed73ca58b7fdc17ec9b 100644 (file)
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -793,26 +793,26 @@ AddToMenu XScreenSaverMenu     "Choose mode:" Title
 +                       "Kill Screen Saver"         Exec exec xscreensaver-command -exit
 
 AddToMenu XSetBgMenu    "XSetBg" Title
-+                       "Change wallpaper" Exec exec "$HOME"/lib/xsetbg/xsetbg-force
-+                       "Start" Exec exec "$HOME"/lib/xsetbg/xsetbg-http-start
-+                       "Stop" Exec exec "$HOME"/lib/xsetbg/xsetbg-http-stop
-+                       "Restart" Exec exec "$HOME"/lib/xsetbg/xsetbg-http-restart
++                       "Change wallpaper" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-force
++                       "Start" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-start
++                       "Stop" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-stop
++                       "Restart" Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-restart
 +                       ""       Nop
 changequote([,])
 +                       "Xli" Exec fn="`$HOME/lib/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
 +                       "Xli (scaled)" Exec fn="`$HOME/lib/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
 +                       "Open in browser" Exec exec webbrowserX -n "`$HOME/lib/xsetbg/print-filename.py -e koi8-r`"
-+                       "Filename" Exec exec "$HOME"/lib/xsetbg/print-filename.py -e koi8-r
-+                       "XFilename" Exec "$HOME"/lib/xsetbg/print-filename.py | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
-+                       "XFilename (wrapped)" Exec "$HOME"/lib/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "Filename" Exec exec "$HOME"/admin/prog/xsetbg/print-filename.py -e koi8-r
++                       "XFilename" Exec "$HOME"/admin/prog/xsetbg/print-filename.py | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "XFilename (wrapped)" Exec "$HOME"/admin/prog/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +                       ""       Nop
 +                       "Xli (prev.)" Exec fn="`$HOME/lib/xsetbg/print-filename.py -e koi8-r -o`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
 +                       "Xli (prev., scaled)" Exec fn="`$HOME/lib/xsetbg/print-filename.py -e koi8-r -o`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
 +                       "Open in browser (prev.)" Exec exec webbrowserX -n "`$HOME/lib/xsetbg/print-filename.py -e koi8-r -o`"
 changequote([`], ['])
-+                       "Filename (prev.)" Exec exec "$HOME"/lib/xsetbg/print-filename.py -e koi8-r -o
-+                       "XFilename (prev.)" Exec "$HOME"/lib/xsetbg/print-filename.py -o | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
-+                       "XFilename (prev., wrapped)" Exec "$HOME"/lib/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "Filename (prev.)" Exec exec "$HOME"/admin/prog/xsetbg/print-filename.py -e koi8-r -o
++                       "XFilename (prev.)" Exec "$HOME"/admin/prog/xsetbg/print-filename.py -o | text-wrap.py -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++                       "XFilename (prev., wrapped)" Exec "$HOME"/admin/prog/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 
 ############################################################################
 # FvwmBacker
@@ -820,7 +820,7 @@ changequote([`], ['])
 #*FvwmBacker: Command (Desk 0, Page * *) -solid DarkCyan
 #*FvwmBacker: Command (Desk 1, Page * *) -solid steelblue
 #*FvwmBacker: Command (Desk 2, Page * *) -solid midnightblue
-*FvwmBacker: Command (Desk *, Page * *) Exec exec "$HOME"/lib/xsetbg/xsetbg-http-change
+*FvwmBacker: Command (Desk *, Page * *) Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-change
 
 ############################################################################
 # FvwmButtons
@@ -872,7 +872,7 @@ changequote([`], ['])
 
 *FvwmButtons: (Title Wallpaper, Icon find1.xpm,        Action Exec $HOME/lib/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
 *FvwmButtons: (Title "-1",      Icon find1.xpm,        Action Exec $HOME/lib/xsetbg/print-filename.py -o | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
-*FvwmButtons: (Title Next,      Icon Jrecycle.xpm,     Action Exec exec "$HOME"/lib/xsetbg/xsetbg-http-force)
+*FvwmButtons: (Title Next,      Icon Jrecycle.xpm,     Action Exec exec "$HOME"/admin/prog/xsetbg/xsetbg-http-force)
 *FvwmButtons: (Title pavucontrol, Icon mini.sound.xpm, Action PaVuControl)
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
 #*FvwmButtons: (Title Audacious, Icon bell.xpm,        Action Audacious)