General tidying and some minor upgrades.

2 years ago · b8c632fbf3
parent 0694b02351
commit b8c632fbf3
10 changed files with 14 additions and 13 deletions
--- a/.data/prefrc
+++ b/.data/prefrc
@ -25,6 +25,5 @@ PipeRead 'echo "InfoStoreAdd    locker     `cat $FVWM_USERDIR/.data/prefs/progs/

 # [Current Theme]
 PipeRead 'echo "InfoStoreAdd    theme      `cat $FVWM_USERDIR/.data/prefs/cosmetics/theme`"'
-PipeRead 'echo "InfoStoreAdd    colors     `cat $FVWM_USERDIR/.data/prefs/cosmetics/colors`"'
 PipeRead 'echo "InfoStoreAdd    pape       `cat $FVWM_USERDIR/.data/prefs/cosmetics/pape`"'
 PipeRead 'echo "InfoStoreAdd    std_font   `cat $FVWM_USERDIR/.data/prefs/cosmetics/std_font`"'
--- a/.data/prefs/progs/deditor
+++ b/.data/prefs/progs/deditor
--- a/1
+++ b/1
@ -0,0 +1 @@
+/home/midfavila/.config/fxde/fxde-assets/
--- a/assets/audio/dummy
+++ b/assets/audio/dummy
--- a/assets/themes
+++ b/assets/themes
@ -1 +0,0 @@
-Just symlink fxde-themes to this directory, or copy theme packages into it.
--- a/assets/wallpaper/dummy
+++ b/assets/wallpaper/dummy
--- a/infra/kbindrc
+++ b/infra/kbindrc
@ -19,11 +19,11 @@ Key I A CM Exec exec $[infostore.im]
 Key C A CM Exec exec $[infostore.calc]

 # Shortcut for killing stuff
-Key Q A CM Close
+Key Q A CM Destroy

 # Window focus
-Key Tab A M  Next (CurrentDesk, AcceptsFocus) FocusFunc
-Key Tab A SM Prev (CurrentDesk, AcceptsFocus) FocusFunc
+Key Tab A M  Next (CurrentPage, AcceptsFocus) TaskSwitchFunc
+Key Tab A SM Prev (CurrentPage, AcceptsFocus) TaskSwitchFunc

 # Maximize
 Key F11 A A Maximize
--- a/10
+++ b/10
@ -3,11 +3,6 @@



-Read modules/shelf
-Read modules/taskbar
-Read modules/pager
-Read modules/events
-
 Read .data/prefrc
 Read infra/funcrc
 Read infra/varrc
@ -16,6 +11,11 @@ Read infra/kbindrc
 Read infra/menurc
 Read infra/windrc

+Read modules/shelf
+Read modules/taskbar
+Read modules/pager
+Read modules/events
+
 DestroyFunc StartFunction
 AddToFunc StartFunction

--- a/modules/shelf
+++ b/modules/shelf
@ -1,7 +1,8 @@
 #Define the shelf.

-Style "Shelf" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \
-       CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, !Iconifiable, NeverFocus
+Style "Shelf" NeverFocus, NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \
+       CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \
+       !Iconifiable, !Closable, !Maximizable

 DestroyModuleConfig Shelf

--- a/modules/taskbar
+++ b/modules/taskbar
@ -33,10 +33,11 @@ DestroyModuleConfig TaskBarButtons
 *TaskBarButtons: IconButton down
 *TaskBarButtons: IconAndSelectButton down
 *TaskBarButtons: SelectButton up
+*TaskBarButtons: FocusAndSelectButton up

 *TaskBarButtons: Colorset 16
 *TaskBarButtons: FocusAndSelectColorset 17
-
+*TaskBarButtons: IconAndSelectColorset 18
 *TaskBarButtons: Shape true

 # Button actions.
				`@ -1 +0,0 @@`
				`Just symlink fxde-themes to this directory, or copy theme packages into it.`