aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2011-05-15 12:59:58 +0100
committerdakkar <dakkar@thenautilus.net>2011-05-15 12:59:58 +0100
commit9f08e36f858225b3b3b778720da2bbff38cad205 (patch)
treeda18d9d8ff44d31613d0d549e5c0cecb160d7d29
parentignore variable stuff (diff)
parentupdate single-screen recipe (diff)
downloadfvwm-crystal-9f08e36f858225b3b3b778720da2bbff38cad205.tar.gz
fvwm-crystal-9f08e36f858225b3b3b778720da2bbff38cad205.tar.bz2
fvwm-crystal-9f08e36f858225b3b3b778720da2bbff38cad205.zip
Merge remote branch 'origin/master'
-rw-r--r--recipes/TopLine-single73
1 files changed, 48 insertions, 25 deletions
diff --git a/recipes/TopLine-single b/recipes/TopLine-single
index fe145b4..9e00aa8 100644
--- a/recipes/TopLine-single
+++ b/recipes/TopLine-single
@@ -5,7 +5,7 @@
# ImagePath {{{1
SetEnv Icon_Theme "Default"
-ImagePath $[FVWM_USERDIR]/icons/$[Icon_Theme]:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]
+ImagePath /usr/share/icons/crystalsvg:$[FVWM_USERDIR]/icons/$[Icon_Theme]:$[FVWM_SYSTEMDIR]/icons/$[Icon_Theme]
# Includes and FVWM modules {{{1
Module FvwmCommandS
@@ -14,6 +14,7 @@ Module FvwmCommandS
Include components/desktop/FVWM-Crystal_Functions
Include components/functions/Clear-FVWM-Settings
Include components/desktop/FVWM-Crystal_Preferences
+Include components/desktop/dakkar_Preferences
Append preferences/Startup
# Preferred applications {{{2
@@ -21,6 +22,9 @@ Append preferences/Startup
Include components/apps/XScreenSaver
Include components/apps/FvwmMiniConsole
Include components/apps/QuakeConsole
+Include components/functions/NotificationAreaManager-$[NotificationAreaManager]
+Include preferences/NotificationArea-Width
+Include components/functions/Music-$[MusicPlayer]
# Desktop & window bindings {{{2
Include components/bindings/Desktop-RMB-OpenTerminal
@@ -28,11 +32,12 @@ Include components/bindings/Desktop-MMB-TogglePanels
Include components/bindings/Desktop-dakkar
Include components/bindings/Window-Basic
Include components/bindings/Window-Border
+Include components/functions/Screen-Menu
# Keyboard bindings {{{2
Include components/desktop/Keyboard
-#Include components/desktop/Numpad
#Include components/desktop/Keyboard_NumLock
+#Include components/desktop/Numpad
# Use window thumbnails instead of simple icons on the desktop {{{2
Include components/desktop/Icon-Thumbnails
@@ -46,7 +51,7 @@ Style * MinOverlapPlacementPenalties 1 0 0 0 0 50
# Desktop settings {{{1
EdgeScroll 100 100
-EdgeResistance 250 1
+EdgeResistance 250 1 30
HideGeometryWindow Never
OpaqueMoveSize 100
EdgeThickness 1
@@ -56,6 +61,15 @@ SnapAttraction 10 SameType Screen
EWMH-Desktop 3 3 3 3
EWMH-Panel-Top 30
+AddToFunc StartFunction
++ I Style mwatch !FixedPosition
++ I Style gkrellm !FixedPosition
++ I UpdateStyles
++ I All (mwatch) Move -0 +30p
++ I All (gkrellm) Move -0 -0
++ I Style mwatch FixedPosition
++ I Style gkrellm FixedPosition
+
# Main menu panel {{{1
All (FvwmButtons-Panel) Close
DestroyModuleConfig FvwmButtons-Panel: *
@@ -148,7 +162,7 @@ DestroyModuleConfig FvwmPager: *
SetEnv Desk_Pages_X "5"
SetEnv Desk_Pages_Y "5"
-PipeRead 'echo SetEnv FvwmPager_Width $((28*$[Desk_Pages_X])); echo SetEnv FvwmPager_Height $((24*$[Desk_Pages_Y]))'
+PipeRead 'echo SetEnv FvwmPager_Width $((24*$[vp.width]/$[vp.height]*$[Desk_Pages_X])); echo SetEnv FvwmPager_Height $((24*$[Desk_Pages_Y]))'
PipeRead 'echo *FvwmPager: Geometry $[FvwmPager_Width]x$[FvwmPager_Height]+$((($[vp.width]-$[FvwmPager_Width])/2))+3'
PipeRead 'echo DesktopSize $[Desk_Pages_X]x$[Desk_Pages_Y]'
@@ -192,27 +206,36 @@ Style * StickyIcon
*FvwmFormDefault: ButtonFont "xft:Tahoma:pixelsize=13:Bold"
*FvwmFormDefault: TimeoutFont "xft:Tahoma:pixelsize=13:Bold"
-# Settings of Trayer {{{1
-AddToFunc ExitFunction I Exec exec killall trayer
-
-AddToFunc StartFunction I Exec exec trayer \
---SetDockType false \
---widthtype request \
---heighttype pixel \
---height 24 \
---edge top \
---align right \
---transparent true \
---alpha $[TrayerAlpha] \
---tint $[TrayerTint] \
---margin 272 \
---distance 3
-
-# mwatch
-
-Style mwatch NoTitle, NoHandles, WindowListSkip, BorderWidth 0, \
- CirculateSkip, StaysOnBottom, \
- Sticky, StickyAcrossPages, StickyAcrossDesks, FixedPosition
+SetEnv NotificationGeom 272
+
+# Settings of stalonetray {{{2
+DestroyFunc NotificationArea-Stalone
+AddToFunc NotificationArea-Stalone
++ I SetEnv trayer_ic_size "24"
++ I SetEnv trayer_area_width "$[trayer_width]"
++ I SetEnv trayer_area_eigth "24"
++ I SetEnv trayer_x "-$[NotificationGeom]"
++ I SetEnv trayer_y "+3"
++ I SetEnv trayer_ic_grav "W"
++ I SetEnv trayer_vert ""
+
+# Settings of trayer {{{2
+DestroyFunc NotificationArea-Trayer
+AddToFunc NotificationArea-Trayer
++ I SetEnv trayer_width_t "request"
++ I SetEnv trayer_heigth_t "pixel"
++ I SetEnv trayer_edge "top"
++ I SetEnv trayer_align "right"
++ I SetEnv trayer_marge "$[NotificationGeom]"
++ I SetEnv trayer_dist "3"
++ I SetEnv trayer_width_w ""
+
+Test (EnvMatch NotificationAreaManager stalonetray) NotificationArea-Stalone
+Test (EnvMatch NotificationAreaManager trayer) NotificationArea-Trayer
+Test (!EnvMatch trayer_width 0) TrayerPanel
+
+# notification support
+Include components/functions/Notify
# ViM modeline {{{1
# vim:foldmethod=marker:foldenable:foldlevel=0