From 5fee59e19e46ccee891c96e8177afb7d4c400e57 Mon Sep 17 00:00:00 2001 From: dakkar Date: Tue, 2 Jun 2015 16:16:36 +0100 Subject: 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. --- preferences/DefaultFocusPolicy | 1 + preferences/DefaultMixer | 1 - preferences/DefaultMusicPlayer | 1 - preferences/DefaultTerminal | 2 +- preferences/DeskPageXY | 2 ++ preferences/DesktopMenu | 1 + preferences/FvwmConsoleTerminal | 1 + preferences/IconDirs | 11 +++++++++++ preferences/IconsType | 1 + preferences/LastChoosenButtonModel | 2 +- preferences/LastChoosenColorset | 2 +- preferences/LastChoosenRecipe | 2 +- preferences/LastChoosenWallpaper | 2 +- preferences/LastChoosenWindowDecoration | 2 +- preferences/MediaDirectories | 4 ++++ preferences/MenuFont | 1 + preferences/MenuFontSize | 1 + preferences/MenuFontStyle | 1 + preferences/NotificationAreaManager | 1 + preferences/PanelFont | 1 + preferences/PanelFontSize | 1 + preferences/PanelFontStyle | 1 + preferences/QuakeConsoleHeight | 1 - preferences/QuakeConsoleTerminal | 2 +- preferences/Startup | 2 ++ preferences/TitleFont | 1 + preferences/TitleFontSize | 1 + preferences/TitleFontStyle | 1 + preferences/XScreenSaver | 1 + 29 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 preferences/DefaultFocusPolicy delete mode 100644 preferences/DefaultMixer delete mode 100644 preferences/DefaultMusicPlayer create mode 100644 preferences/DeskPageXY create mode 100644 preferences/DesktopMenu create mode 100644 preferences/FvwmConsoleTerminal create mode 100644 preferences/IconDirs create mode 100644 preferences/IconsType create mode 100644 preferences/MediaDirectories create mode 100644 preferences/MenuFont create mode 100644 preferences/MenuFontSize create mode 100644 preferences/MenuFontStyle create mode 100644 preferences/NotificationAreaManager create mode 100644 preferences/PanelFont create mode 100644 preferences/PanelFontSize create mode 100644 preferences/PanelFontStyle delete mode 100644 preferences/QuakeConsoleHeight create mode 100644 preferences/Startup create mode 100644 preferences/TitleFont create mode 100644 preferences/TitleFontSize create mode 100644 preferences/TitleFontStyle create mode 100644 preferences/XScreenSaver (limited to 'preferences') diff --git a/preferences/DefaultFocusPolicy b/preferences/DefaultFocusPolicy new file mode 100644 index 0000000..df39ca8 --- /dev/null +++ b/preferences/DefaultFocusPolicy @@ -0,0 +1 @@ +Include components/styles/FocusPolicy-FVWM-Crystal diff --git a/preferences/DefaultMixer b/preferences/DefaultMixer deleted file mode 100644 index e09f3e0..0000000 --- a/preferences/DefaultMixer +++ /dev/null @@ -1 +0,0 @@ -Include components/functions/Mixer-amixer diff --git a/preferences/DefaultMusicPlayer b/preferences/DefaultMusicPlayer deleted file mode 100644 index a2ca0d6..0000000 --- a/preferences/DefaultMusicPlayer +++ /dev/null @@ -1 +0,0 @@ -Include components/functions/Music-audacious diff --git a/preferences/DefaultTerminal b/preferences/DefaultTerminal index f90afe1..516ba78 100644 --- a/preferences/DefaultTerminal +++ b/preferences/DefaultTerminal @@ -1 +1 @@ -FindCommand DefaultTerminal urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal +FindCommand DefaultTerminal urxvt terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal diff --git a/preferences/DeskPageXY b/preferences/DeskPageXY new file mode 100644 index 0000000..5a11560 --- /dev/null +++ b/preferences/DeskPageXY @@ -0,0 +1,2 @@ +InfoStoreAdd Desk_Pages_X 5 +InfoStoreAdd Desk_Pages_Y 5 diff --git a/preferences/DesktopMenu b/preferences/DesktopMenu new file mode 100644 index 0000000..3b753ad --- /dev/null +++ b/preferences/DesktopMenu @@ -0,0 +1 @@ +# no desktop menu diff --git a/preferences/FvwmConsoleTerminal b/preferences/FvwmConsoleTerminal new file mode 100644 index 0000000..3fa7b2d --- /dev/null +++ b/preferences/FvwmConsoleTerminal @@ -0,0 +1 @@ +FindCommand FvwmConsoleTerminal urxvt mrxvt urxvt aterm xterm diff --git a/preferences/IconDirs b/preferences/IconDirs new file mode 100644 index 0000000..0c3cd05 --- /dev/null +++ b/preferences/IconDirs @@ -0,0 +1,11 @@ +# FVWM-Crystal preference for menu icons +# Put in this file, all the directories that +# must be searched for icon files. +# Those directories will be searched by +# fvwm-crystal.generate-menu for the generation +# of the application menu. +# It must be one directory per line. +# Lines that begin with # will be ignored. +/usr/share/icons +/usr/share/pixmaps +#/usr/kde/3.5/share/icons diff --git a/preferences/IconsType b/preferences/IconsType new file mode 100644 index 0000000..bb18dd2 --- /dev/null +++ b/preferences/IconsType @@ -0,0 +1 @@ +Include components/desktop/Icon-Thumbnails diff --git a/preferences/LastChoosenButtonModel b/preferences/LastChoosenButtonModel index 6ffabc9..793e7e8 100644 --- a/preferences/LastChoosenButtonModel +++ b/preferences/LastChoosenButtonModel @@ -1 +1 @@ -SetEnv Window_Decorations_ButtonModel Theme.os2 +SetEnv Window_Decorations_ButtonModel 'Theme.os2' diff --git a/preferences/LastChoosenColorset b/preferences/LastChoosenColorset index d756132..0661c12 100644 --- a/preferences/LastChoosenColorset +++ b/preferences/LastChoosenColorset @@ -1 +1 @@ -Colorsets-Set '/home/dakkar/.fvwm-crystal/colorsets/WhiteDesktop.cs' +Colorsets-Set '/usr/bin/../share/fvwm-crystal/fvwm/colorsets/WhiteDesktop.cs' diff --git a/preferences/LastChoosenRecipe b/preferences/LastChoosenRecipe index cfaa445..fe9c046 100644 --- a/preferences/LastChoosenRecipe +++ b/preferences/LastChoosenRecipe @@ -1 +1 @@ -Read '/home/dakkar/.fvwm-crystal/recipes/TopLine' +InfoStoreAdd Fvwm_Crystal_Recipe '/home/dakkar/.fvwm-crystal/recipes/Dakkar' diff --git a/preferences/LastChoosenWallpaper b/preferences/LastChoosenWallpaper index b3fbef6..ec6c40d 100644 --- a/preferences/LastChoosenWallpaper +++ b/preferences/LastChoosenWallpaper @@ -1 +1 @@ -Wallpaper-Set '/usr/bin/../share/fvwm-crystal/fvwm/wallpapers/fvwm-crystal-dark2-1024x768.jpg' +Wallpaper-Set /home/dakkar/pics/nausicaa/drappo-wide.png diff --git a/preferences/LastChoosenWindowDecoration b/preferences/LastChoosenWindowDecoration index a3382ae..4431da2 100644 --- a/preferences/LastChoosenWindowDecoration +++ b/preferences/LastChoosenWindowDecoration @@ -1 +1 @@ -Window-Decorations-Set '/home/dakkar/.fvwm-crystal/decorations/Dakkar' +Window-Decorations-Set '/home/dakkar/.fvwm-crystal/decorations/Dakkar/Default' diff --git a/preferences/MediaDirectories b/preferences/MediaDirectories new file mode 100644 index 0000000..8f56dbc --- /dev/null +++ b/preferences/MediaDirectories @@ -0,0 +1,4 @@ +audio /home/name/Musique +video /home/name/Movies +cdrom /dev/cdrom0 +dvd /dev/cdrom1 diff --git a/preferences/MenuFont b/preferences/MenuFont new file mode 100644 index 0000000..f07d3c6 --- /dev/null +++ b/preferences/MenuFont @@ -0,0 +1 @@ +SetEnv menu_font "Verdana" diff --git a/preferences/MenuFontSize b/preferences/MenuFontSize new file mode 100644 index 0000000..fbeb7ec --- /dev/null +++ b/preferences/MenuFontSize @@ -0,0 +1 @@ +SetEnv menu_font_size 20 diff --git a/preferences/MenuFontStyle b/preferences/MenuFontStyle new file mode 100644 index 0000000..76a30e3 --- /dev/null +++ b/preferences/MenuFontStyle @@ -0,0 +1 @@ +SetEnv menu_font_style Regular diff --git a/preferences/NotificationAreaManager b/preferences/NotificationAreaManager new file mode 100644 index 0000000..3a9581b --- /dev/null +++ b/preferences/NotificationAreaManager @@ -0,0 +1 @@ +FindCommand NotificationAreaManager trayer trayer stalonetray diff --git a/preferences/PanelFont b/preferences/PanelFont new file mode 100644 index 0000000..067ad64 --- /dev/null +++ b/preferences/PanelFont @@ -0,0 +1 @@ +SetEnv panel_font "Verdana" diff --git a/preferences/PanelFontSize b/preferences/PanelFontSize new file mode 100644 index 0000000..acfa657 --- /dev/null +++ b/preferences/PanelFontSize @@ -0,0 +1 @@ +SetEnv panel_font_size 18 diff --git a/preferences/PanelFontStyle b/preferences/PanelFontStyle new file mode 100644 index 0000000..d12c3af --- /dev/null +++ b/preferences/PanelFontStyle @@ -0,0 +1 @@ +SetEnv panel_font_style Regular diff --git a/preferences/QuakeConsoleHeight b/preferences/QuakeConsoleHeight deleted file mode 100644 index dd36499..0000000 --- a/preferences/QuakeConsoleHeight +++ /dev/null @@ -1 +0,0 @@ -SetEnv QuakeConsole_Height 436p diff --git a/preferences/QuakeConsoleTerminal b/preferences/QuakeConsoleTerminal index 2a10399..8f519a9 100644 --- a/preferences/QuakeConsoleTerminal +++ b/preferences/QuakeConsoleTerminal @@ -1 +1 @@ -FindCommand QuakeConsoleTerminal urxvt +FindCommand QuakeConsoleTerminal urxvt mrxvt urxvt aterm xterm diff --git a/preferences/Startup b/preferences/Startup new file mode 100644 index 0000000..d750037 --- /dev/null +++ b/preferences/Startup @@ -0,0 +1,2 @@ +# stuff to do after basic functions are loaded, but before +# applications / bindings are set \ No newline at end of file diff --git a/preferences/TitleFont b/preferences/TitleFont new file mode 100644 index 0000000..c69471e --- /dev/null +++ b/preferences/TitleFont @@ -0,0 +1 @@ +SetEnv title_font "Verdana" diff --git a/preferences/TitleFontSize b/preferences/TitleFontSize new file mode 100644 index 0000000..181ced6 --- /dev/null +++ b/preferences/TitleFontSize @@ -0,0 +1 @@ +SetEnv title_font_size 22 diff --git a/preferences/TitleFontStyle b/preferences/TitleFontStyle new file mode 100644 index 0000000..3e5f4e0 --- /dev/null +++ b/preferences/TitleFontStyle @@ -0,0 +1 @@ +SetEnv title_font_style Regular diff --git a/preferences/XScreenSaver b/preferences/XScreenSaver new file mode 100644 index 0000000..e10b29d --- /dev/null +++ b/preferences/XScreenSaver @@ -0,0 +1 @@ +X xscreensaver -nosplash -- cgit v1.2.3