X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=d809c062ad5f14ed7cb3569e50465843bd0e2b26;hb=ed5d9a5f11cb3990e9cfef5677fba3fabf191871;hp=4d04e669064145890f8e6b55204963267b7ccb1a;hpb=cddce50db926951edcd3330744f0ef77c1d0ab8a;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 4d04e66..d809c06 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -152,7 +152,7 @@ divert
 #
 # Colon seperated unix directory paths for Modules, xpm files, and bitmaps
 #ModulePath /usr/lib/fvwm
-ImagePath /usr/share/pixmaps/fvwm:/usr/share/pixmaps:/usr/include/X11/bitmaps #:/usr/local/firefox/browser/chrome/icons/default:/usr/local/firefox/browser/icons
+ImagePath /usr/share/icons/hicolor/32x32/apps/:/usr/share/pixmaps/fvwm:/usr/share/pixmaps:/usr/include/X11/bitmaps #:/usr/local/firefox/browser/chrome/icons/default:/usr/local/firefox/browser/icons
 
 ############################################################################
 # COLORS and FONTS
@@ -583,6 +583,8 @@ AddToFunc Raise-All           I All Raise
 
 DestroyFunc PaVuControl
 AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
++                             I Exec exec pulseaudio --kill
++                             I Exec exec cgmem_nice 200 pulseaudio --start
 +                             I Exec exec cgmem_nice 200 pavucontrol
 +                             I Wait "Volume Control"
 
@@ -636,6 +638,10 @@ DestroyFunc Pidgin
 AddToFunc Pidgin              I GotoDeskAndPage 1 1 0
 +                             I Exec exec cgmem_nice 300 pidgin
 
+DestroyFunc Skype
+AddToFunc Skype               I GotoDeskAndPage 0 0 1
++                             I Exec BROWSER=firefox exec cgmem_nice 1000 skypeforlinux
+
 DestroyFunc XFilename
 AddToFunc XSetbgFilename      I Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 
@@ -802,9 +808,9 @@ AddToMenu RootMenu "Root Menu"  Title
 
 DestroyMenu OSMenu
 AddToMenu OSMenu        "OS commands:" Title
-+                       "Suspend to ram"  Exec exec s2r
-+                       "Suspend to disk" Exec exec s2d
 +                       "Suspend to both" Exec exec s2b
++                       "Suspend to disk" Exec exec s2d
++                       "Suspend to ram"  Exec exec s2r
 
 # This menu will fire up some often used programs
 DestroyMenu Utilities
@@ -817,7 +823,8 @@ AddToMenu Utilities     "Choose one:" Title
 +                       "Refresh Screen" Refresh
 +                       "xrefresh" Exec exec xrefresh
 +                       ""       Nop
-+                       "Skype" Exec BROWSER=firefox exec cgmem_nice 1000 skypeforlinux
++                       "Skype" Skype
++                       "pavucontrol" PaVuControl
 
 DestroyMenu  Browsers
 AddToMenu Browsers      "Choose one:" Title
@@ -920,10 +927,11 @@ popdef(`TERM_KOI8', `TERM_RU_UTF8')
 *FvwmButtons: (Title Wallpaper, Icon find1.xpm,        Action Exec "gxmessage" "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
 *FvwmButtons: (Title "-1",      Icon find1.xpm,        Action Exec "gxmessage" "$HOME"/current/projects/xsetbg/print-filename.py 1 | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)
 *FvwmButtons: (Title Next,      Icon Jrecycle.xpm,     Action Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-force)
-*FvwmButtons: (Title pavucontrol, Icon mini.sound.xpm, Action Exec "Volume Control" exec cgmem_nice 200 pavucontrol)
+#*FvwmButtons: (Title pavucontrol, Icon mini.sound.xpm, Action Exec "Volume Control" exec cgmem_nice 200 pavucontrol)
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
 *FvwmButtons: (Title AudioPlayer,  Icon bell.xpm,      Action Exec "Audacious" LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 200 audacious)
 #*FvwmButtons: (Title XLock,     Icon Jxlock.xpm,      Action Exec exec xscreensaver-command -lock)
+*FvwmButtons: (Title Skype,    Icon skypeforlinux.png, Action Skype)
 
 ############################################################################
 # FvwmForm