aboutsummaryrefslogtreecommitdiff
path: root/components/desktop
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2015-06-02 16:16:36 +0100
committerdakkar <dakkar@thenautilus.net>2015-06-02 16:16:36 +0100
commit5fee59e19e46ccee891c96e8177afb7d4c400e57 (patch)
tree5b7bf522a8f77f302bdf6c7c0c98e827605440a2 /components/desktop
parentshift-FF for private window (diff)
downloadfvwm-crystal-5fee59e19e46ccee891c96e8177afb7d4c400e57.tar.gz
fvwm-crystal-5fee59e19e46ccee891c96e8177afb7d4c400e57.tar.bz2
fvwm-crystal-5fee59e19e46ccee891c96e8177afb7d4c400e57.zip
update to fvwm-crystal 3.2.3
This update is big: upstream has simplified and refactored everything, so I had to move stuff around a lot. I now rely much more on the overlay system, instead of adding custom files all over the place.
Diffstat (limited to 'components/desktop')
-rw-r--r--components/desktop/FVWM-Crystal_Preferences3
-rw-r--r--components/desktop/Keyboard16
-rw-r--r--components/desktop/Keyboard_NumLock1
-rw-r--r--components/desktop/dakkar_Preferences6
4 files changed, 7 insertions, 19 deletions
diff --git a/components/desktop/FVWM-Crystal_Preferences b/components/desktop/FVWM-Crystal_Preferences
new file mode 100644
index 0000000..66121aa
--- /dev/null
+++ b/components/desktop/FVWM-Crystal_Preferences
@@ -0,0 +1,3 @@
+LoadPreferences NotificationAreaManager
+LoadPreferences DeskPageXY
+DesktopSize $[infostore.Desk_Pages_X]x$[infostore.Desk_Pages_Y]
diff --git a/components/desktop/Keyboard b/components/desktop/Keyboard
index 84bd7d9..2a2fcc2 100644
--- a/components/desktop/Keyboard
+++ b/components/desktop/Keyboard
@@ -1,17 +1,7 @@
-# Standard keyboard layout
-# You need several functions to use all of the keybindings
-
-Include components/bindings/Music
Include components/bindings/Pager-Square
Include components/bindings/PageSwitch-Square
-#Include components/bindings/Window-Control
+Include components/bindings/Window-Control
Include components/bindings/Window-List
-#Include components/bindings/Window-Rearrange
+Include components/bindings/Window-Rearrange
Include components/bindings/Misc-Keybindings
-Include components/bindings/Window-Control-Dakkar
-Include components/bindings/Numpad-Focus
-Include components/bindings/TheLauncher
-
-Key apostrophe A $[Mod1] Menu /Applications root c c
-Key quotedbl A $[Mod1] Menu /FVWM-Crystal root c c
-
+Include components/bindings/Extra-Keybindings
diff --git a/components/desktop/Keyboard_NumLock b/components/desktop/Keyboard_NumLock
new file mode 100644
index 0000000..7b4fde6
--- /dev/null
+++ b/components/desktop/Keyboard_NumLock
@@ -0,0 +1 @@
+# numlock disables everything! we want this.
diff --git a/components/desktop/dakkar_Preferences b/components/desktop/dakkar_Preferences
deleted file mode 100644
index b2d6254..0000000
--- a/components/desktop/dakkar_Preferences
+++ /dev/null
@@ -1,6 +0,0 @@
-AddToMenu /Preferences/Mixer
-Test (x amixer) + '%22x22/apps/alsamixer.png%ALSA' SelectMixer amixer
-
-AddToMenu /Preferences/MusicPlayer
-Test (x amarok) + '%22x22/apps/amarok.png%AmaroK' SelectMusicPlayer amarok
-