From 21457d1aba3cb8395173679e3a799a17c344a8d2 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 17 Jan 2011 20:35:44 +0100 Subject: data -> share, data/examples -> examples --- Makefile | 6 +- data/examples/keys | 40 ---------- data/examples/themes | 69 ---------------- data/fonts/black.style | 4 - data/fonts/menu.style | 4 - data/fonts/yudit.ttf | Bin 57708 -> 0 bytes data/images/about.png | Bin 61171 -> 0 bytes data/images/logo.svg | 162 -------------------------------------- data/images/menubg_aluminium.png | Bin 1862 -> 0 bytes data/images/menubg_aqua.png | Bin 5325 -> 0 bytes data/images/menubg_black.png | Bin 1716 -> 0 bytes data/images/menubg_brushed.png | Bin 8649 -> 0 bytes data/images/menubg_default.png | Bin 209 -> 0 bytes data/images/menubg_sky.png | Bin 1928 -> 0 bytes examples/keys | 40 ++++++++++ examples/themes | 69 ++++++++++++++++ share/fonts/black.style | 4 + share/fonts/menu.style | 4 + share/fonts/yudit.ttf | Bin 0 -> 57708 bytes share/images/about.png | Bin 0 -> 61171 bytes share/images/logo.svg | 162 ++++++++++++++++++++++++++++++++++++++ share/images/menubg_aluminium.png | Bin 0 -> 1862 bytes share/images/menubg_aqua.png | Bin 0 -> 5325 bytes share/images/menubg_black.png | Bin 0 -> 1716 bytes share/images/menubg_brushed.png | Bin 0 -> 8649 bytes share/images/menubg_default.png | Bin 0 -> 209 bytes share/images/menubg_sky.png | Bin 0 -> 1928 bytes 27 files changed, 282 insertions(+), 282 deletions(-) delete mode 100644 data/examples/keys delete mode 100644 data/examples/themes delete mode 100644 data/fonts/black.style delete mode 100644 data/fonts/menu.style delete mode 100644 data/fonts/yudit.ttf delete mode 100644 data/images/about.png delete mode 100644 data/images/logo.svg delete mode 100644 data/images/menubg_aluminium.png delete mode 100644 data/images/menubg_aqua.png delete mode 100644 data/images/menubg_black.png delete mode 100644 data/images/menubg_brushed.png delete mode 100644 data/images/menubg_default.png delete mode 100644 data/images/menubg_sky.png create mode 100644 examples/keys create mode 100644 examples/themes create mode 100644 share/fonts/black.style create mode 100644 share/fonts/menu.style create mode 100644 share/fonts/yudit.ttf create mode 100644 share/images/about.png create mode 100644 share/images/logo.svg create mode 100644 share/images/menubg_aluminium.png create mode 100644 share/images/menubg_aqua.png create mode 100644 share/images/menubg_black.png create mode 100644 share/images/menubg_brushed.png create mode 100644 share/images/menubg_default.png create mode 100644 share/images/menubg_sky.png diff --git a/Makefile b/Makefile index 5c9b3c1..7de7229 100644 --- a/Makefile +++ b/Makefile @@ -41,19 +41,19 @@ install-bin: install-font: @echo installing fonts to ${font_dir} @mkdir -p ${font_dir} - @cp data/fonts/* ${font_dir} + @cp share/fonts/* ${font_dir} @chmod 644 ${font_dir}/* install-img: @echo installing images to ${image_dir} @mkdir -p ${image_dir} - @cp data/images/* ${image_dir} + @cp share/images/* ${image_dir} @chmod 644 ${image_dir}/* install-examples: @echo installing examples to ${example_dir} @mkdir -p ${example_dir} - @cp data/examples/* ${example_dir} + @cp examples/* ${example_dir} @chmod 644 ${example_dir}/* diff --git a/data/examples/keys b/data/examples/keys deleted file mode 100644 index 1f1f374..0000000 --- a/data/examples/keys +++ /dev/null @@ -1,40 +0,0 @@ -# feh key configuration. -# Comments start with a # sign, do not use them mid-line. -# Each line must be blank, a comment, or a key definition. -# -# key definition: [ []] -# -# Each is an X11 keysym (as output by xev) with optional modifier. -# For instance, C-x would be Ctrl+X, or 4-space Mod4+Space - -# Examples for vim-like menu bindings on a qwerty keyboard: -menu_parent h Left -menu_child l Right -menu_down j Down -menu_up k Up -menu_select space Return - -# Same for image navigation ... -next_img j Right space -prev_img k Left BackSpace -remove l Delete -delete C-l C-Delete - -# and image movement -scroll_up J C-Up -scroll_down K C-Down -scroll_left H C-Left -scroll_right L C-Right - -# zooming -zoom_in C-Up f -zoom_out C-Down a -zoom_default d -zoom_fit s - -# I only hit these accidentaly -save_image -save_filelist - -# This leaves some conflicts with existing default bindings, but you should -# get the idea. And I'm not gonna fix the conflicts, I don't use qwerty ;-) diff --git a/data/examples/themes b/data/examples/themes deleted file mode 100644 index a507951..0000000 --- a/data/examples/themes +++ /dev/null @@ -1,69 +0,0 @@ -# Feh themes configuration file. -# Lines starting with # are comments. Midline comments are not supported. -# Place this as either ~/.config/feh/themes or /etc/feh/themes - -# Options are defined in theme_name/options pairs. -# Separate themename and options by whitespace. - -# There are two ways of specifying the theme. Either use feh -Tthemename, -# or use a symbolic link to feh with the name of the theme. eg -# ln -s `which feh` ~/bin/mkindex -# Now when you run 'mkindex', feh will load the config specified for the -# mkindex theme. - -# Multiple options can of course be used. If they are too long for one line, -# you can use a \ to make them continue on the next one, but not mid-option. -# imagemap -rV --quiet -W 400 -H 300 \ -# --thumb-width 40 --thumb-height 30 - -# ==================== -# A few default themes -# ==================== - -# Webcam mode, simply specify the url(s). -# e.g. feh -Twebcam http://cam1 http://cam2 -webcam --multiwindow --reload 20 - -# Create an index of the current directory. This version uses . as the -# current dir, so you don't even need any commandline arguments. -mkindex -iVO index.jpg . - -# More ambitious version... -imgidx --index --output-only .fehindex.jpg --limit-width 1024 \ - --thumb-width 128 --thumb-height 128 --verbose --quiet - -# Show a presentation -present --full-screen --sort name --hide-pointer - -# Booth mode ;-) -booth --full-screen --hide-pointer --slideshow-delay 20 - -# Screw xscreensaver, use feh =) -screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer - -# Different menus -brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png -aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png -aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png -sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png -black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \ - --menu-style " PREFIX "/share/feh/fonts/black.style - -# Some more examples, used by the feh developer - -rfs --full-screen --hide-pointer --auto-zoom --randomize -fs --full-screen --hide-pointer --auto-zoom --sort filename - -thumb_s --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \ - --limit-width 1024 --sort filename \ - --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 - -thumb_b --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \ - --limit-width 1024 --sort filename \ - --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 - -thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \ - --limit-width 1024 --sort filename --index-name 0 - -thumb_b_nt --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \ - --limit-width 1024 --sort filename --index-name 0 diff --git a/data/fonts/black.style b/data/fonts/black.style deleted file mode 100644 index d2a86a9..0000000 --- a/data/fonts/black.style +++ /dev/null @@ -1,4 +0,0 @@ -#Style -#NAME Menu -255 255 255 64 2 2 -255 255 255 255 0 0 diff --git a/data/fonts/menu.style b/data/fonts/menu.style deleted file mode 100644 index 8557360..0000000 --- a/data/fonts/menu.style +++ /dev/null @@ -1,4 +0,0 @@ -#Style -#NAME Menu -0 0 0 64 2 2 -0 0 0 0 0 0 diff --git a/data/fonts/yudit.ttf b/data/fonts/yudit.ttf deleted file mode 100644 index 8099e63..0000000 Binary files a/data/fonts/yudit.ttf and /dev/null differ diff --git a/data/images/about.png b/data/images/about.png deleted file mode 100644 index 5aaaf17..0000000 Binary files a/data/images/about.png and /dev/null differ diff --git a/data/images/logo.svg b/data/images/logo.svg deleted file mode 100644 index e07b95d..0000000 --- a/data/images/logo.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/data/images/menubg_aluminium.png b/data/images/menubg_aluminium.png deleted file mode 100644 index eed00f1..0000000 Binary files a/data/images/menubg_aluminium.png and /dev/null differ diff --git a/data/images/menubg_aqua.png b/data/images/menubg_aqua.png deleted file mode 100644 index 3a72590..0000000 Binary files a/data/images/menubg_aqua.png and /dev/null differ diff --git a/data/images/menubg_black.png b/data/images/menubg_black.png deleted file mode 100644 index 08b4c2b..0000000 Binary files a/data/images/menubg_black.png and /dev/null differ diff --git a/data/images/menubg_brushed.png b/data/images/menubg_brushed.png deleted file mode 100644 index 32fad47..0000000 Binary files a/data/images/menubg_brushed.png and /dev/null differ diff --git a/data/images/menubg_default.png b/data/images/menubg_default.png deleted file mode 100644 index dd21188..0000000 Binary files a/data/images/menubg_default.png and /dev/null differ diff --git a/data/images/menubg_sky.png b/data/images/menubg_sky.png deleted file mode 100644 index e0be8ca..0000000 Binary files a/data/images/menubg_sky.png and /dev/null differ diff --git a/examples/keys b/examples/keys new file mode 100644 index 0000000..1f1f374 --- /dev/null +++ b/examples/keys @@ -0,0 +1,40 @@ +# feh key configuration. +# Comments start with a # sign, do not use them mid-line. +# Each line must be blank, a comment, or a key definition. +# +# key definition: [ []] +# +# Each is an X11 keysym (as output by xev) with optional modifier. +# For instance, C-x would be Ctrl+X, or 4-space Mod4+Space + +# Examples for vim-like menu bindings on a qwerty keyboard: +menu_parent h Left +menu_child l Right +menu_down j Down +menu_up k Up +menu_select space Return + +# Same for image navigation ... +next_img j Right space +prev_img k Left BackSpace +remove l Delete +delete C-l C-Delete + +# and image movement +scroll_up J C-Up +scroll_down K C-Down +scroll_left H C-Left +scroll_right L C-Right + +# zooming +zoom_in C-Up f +zoom_out C-Down a +zoom_default d +zoom_fit s + +# I only hit these accidentaly +save_image +save_filelist + +# This leaves some conflicts with existing default bindings, but you should +# get the idea. And I'm not gonna fix the conflicts, I don't use qwerty ;-) diff --git a/examples/themes b/examples/themes new file mode 100644 index 0000000..a507951 --- /dev/null +++ b/examples/themes @@ -0,0 +1,69 @@ +# Feh themes configuration file. +# Lines starting with # are comments. Midline comments are not supported. +# Place this as either ~/.config/feh/themes or /etc/feh/themes + +# Options are defined in theme_name/options pairs. +# Separate themename and options by whitespace. + +# There are two ways of specifying the theme. Either use feh -Tthemename, +# or use a symbolic link to feh with the name of the theme. eg +# ln -s `which feh` ~/bin/mkindex +# Now when you run 'mkindex', feh will load the config specified for the +# mkindex theme. + +# Multiple options can of course be used. If they are too long for one line, +# you can use a \ to make them continue on the next one, but not mid-option. +# imagemap -rV --quiet -W 400 -H 300 \ +# --thumb-width 40 --thumb-height 30 + +# ==================== +# A few default themes +# ==================== + +# Webcam mode, simply specify the url(s). +# e.g. feh -Twebcam http://cam1 http://cam2 +webcam --multiwindow --reload 20 + +# Create an index of the current directory. This version uses . as the +# current dir, so you don't even need any commandline arguments. +mkindex -iVO index.jpg . + +# More ambitious version... +imgidx --index --output-only .fehindex.jpg --limit-width 1024 \ + --thumb-width 128 --thumb-height 128 --verbose --quiet + +# Show a presentation +present --full-screen --sort name --hide-pointer + +# Booth mode ;-) +booth --full-screen --hide-pointer --slideshow-delay 20 + +# Screw xscreensaver, use feh =) +screensave --recursive --full-screen --randomize --slideshow-delay 10 --hide-pointer + +# Different menus +brushed --menu-bg " PREFIX "/share/feh/images/menubg_brushed.png +aluminium --menu-bg " PREFIX "/share/feh/images/menubg_aluminium.png +aqua --menu-bg " PREFIX "/share/feh/images/menubg_aqua.png +sky --menu-bg " PREFIX "/share/feh/images/menubg_sky.png +black --menu-bg " PREFIX "/share/feh/images/menubg_black.png \ + --menu-style " PREFIX "/share/feh/fonts/black.style + +# Some more examples, used by the feh developer + +rfs --full-screen --hide-pointer --auto-zoom --randomize +fs --full-screen --hide-pointer --auto-zoom --sort filename + +thumb_s --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \ + --limit-width 1024 --sort filename \ + --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 + +thumb_b --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \ + --limit-width 1024 --sort filename \ + --fontpath /usr/share/fonts/truetype/ttf-dejavu/ --font DejaVuSans/8 + +thumb_s_nt --thumbnails --cache-thumbnails --thumb-width 128 --thumb-height 128 \ + --limit-width 1024 --sort filename --index-name 0 + +thumb_b_nt --thumbnails --cache-thumbnails --thumb-width 256 --thumb-height 256 \ + --limit-width 1024 --sort filename --index-name 0 diff --git a/share/fonts/black.style b/share/fonts/black.style new file mode 100644 index 0000000..d2a86a9 --- /dev/null +++ b/share/fonts/black.style @@ -0,0 +1,4 @@ +#Style +#NAME Menu +255 255 255 64 2 2 +255 255 255 255 0 0 diff --git a/share/fonts/menu.style b/share/fonts/menu.style new file mode 100644 index 0000000..8557360 --- /dev/null +++ b/share/fonts/menu.style @@ -0,0 +1,4 @@ +#Style +#NAME Menu +0 0 0 64 2 2 +0 0 0 0 0 0 diff --git a/share/fonts/yudit.ttf b/share/fonts/yudit.ttf new file mode 100644 index 0000000..8099e63 Binary files /dev/null and b/share/fonts/yudit.ttf differ diff --git a/share/images/about.png b/share/images/about.png new file mode 100644 index 0000000..5aaaf17 Binary files /dev/null and b/share/images/about.png differ diff --git a/share/images/logo.svg b/share/images/logo.svg new file mode 100644 index 0000000..e07b95d --- /dev/null +++ b/share/images/logo.svg @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/share/images/menubg_aluminium.png b/share/images/menubg_aluminium.png new file mode 100644 index 0000000..eed00f1 Binary files /dev/null and b/share/images/menubg_aluminium.png differ diff --git a/share/images/menubg_aqua.png b/share/images/menubg_aqua.png new file mode 100644 index 0000000..3a72590 Binary files /dev/null and b/share/images/menubg_aqua.png differ diff --git a/share/images/menubg_black.png b/share/images/menubg_black.png new file mode 100644 index 0000000..08b4c2b Binary files /dev/null and b/share/images/menubg_black.png differ diff --git a/share/images/menubg_brushed.png b/share/images/menubg_brushed.png new file mode 100644 index 0000000..32fad47 Binary files /dev/null and b/share/images/menubg_brushed.png differ diff --git a/share/images/menubg_default.png b/share/images/menubg_default.png new file mode 100644 index 0000000..dd21188 Binary files /dev/null and b/share/images/menubg_default.png differ diff --git a/share/images/menubg_sky.png b/share/images/menubg_sky.png new file mode 100644 index 0000000..e0be8ca Binary files /dev/null and b/share/images/menubg_sky.png differ -- cgit v1.2.3