From: Nick Bowler <nbowler@draconx.ca>
Date: Sun, 26 Apr 2009 03:29:07 +0000 (-0400)
Subject: Merge branch 'master' of git://git.draconx.ca/fvwmconf
X-Git-Url: http://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/09eeb2273c30e4f4763a5d1e36b4f70d43ac9d2b?hp=c589febab53264c1c442d0c4ac14916324dbb9de

Merge branch 'master' of git://git.draconx.ca/fvwmconf
---

diff --git a/aphrodite/rootmenu b/aphrodite/rootmenu
index 355480b..bfdabb3 100644
--- a/aphrodite/rootmenu
+++ b/aphrodite/rootmenu
@@ -10,11 +10,12 @@ AddToFunc   MakeMenuFvwmRoot
 + I PipeRead 'echo AddToMenu MenuFvwmRoot "$USER@`hostname`" Title'
 + I AddToMenu MenuFvwmRoot "Terminal%terminal.svg:16x16%" Exec exec $[TERMINAL]
 + I AddToMenu MenuFvwmRoot "Firefox%firefox.png%" Exec exec firefox
++ I AddToMenu MenuFvwmRoot "Thunar" Exec exec thunar
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Wallpaper%wallpaper.svg:16x16%" Popup MenuWallpaper
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Restart FVWM%reload.svg:16x16%" Restart
 + I AddToMenu MenuFvwmRoot "Exit FVWM%logout.svg:16x16%"\
-	Module FvwmForm FvwmForm-QuitVerify
+	Exec exec gxquitdialog
 
 Mouse 3 R A Menu MenuFvwmRoot
diff --git a/atropos/rootmenu b/atropos/rootmenu
index f2786bb..a7985df 100644
--- a/atropos/rootmenu
+++ b/atropos/rootmenu
@@ -26,7 +26,7 @@ AddToFunc   MakeMenuFvwmRoot
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Restart FVWM%reload.svg:16x16%" Restart
 + I AddToMenu MenuFvwmRoot "Exit FVWM%logout.svg:16x16%"\
-	Module FvwmForm FvwmForm-QuitVerify
+	Exec exec gxquitdialog --quit "FvwmCommand Quit"
 
 DestroyMenu MenuNetwork
 AddToMenu   MenuNetwork
diff --git a/global/fullscreen b/global/fullscreen
index deb5e41..ede1a19 100644
--- a/global/fullscreen
+++ b/global/fullscreen
@@ -1,4 +1,5 @@
 Key F10 W C DoFullScreen
+Key F10 W CS DoMegaFullScreen
 
 DestroyFunc Fullscreen
 AddToFunc   FullScreen
@@ -24,3 +25,17 @@ AddToFunc Fullscreen-Stop
 + I UpdateStyles
 + I ThisWindow (Maximized) Maximize
 + I Layer default
+
+DestroyFunc MegaFulScreen
+AddToFunc MegaFullScreen
++ I Pick () DoMegaFullScreen
+
+DestroyFunc DoMegaFullScreen
+AddToFunc DoMegaFullScreen
++ I WindowStyle !Borders, !Title, !Iconifiable
++ I UpdateStyles
++ I Move 0 0
++ I Layer 0 7
++ I WindowStyle FixedPosition, FixedSize
++ I UpdateStyles
++ I Exec exec xrandr -s $[cw.width]x$[cw.height]