From: Jean-Paul Saman Date: Sat, 20 Dec 2008 17:02:29 +0000 (+0100) Subject: Remove osdmenu configurations minimal and dvd pictures. X-Git-Tag: 1.0.0-pre1~1046 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8091b5bfd27eb250eee7d242c34ff3562a51a4b2;p=vlc Remove osdmenu configurations minimal and dvd pictures. Osdmenu 'dvd' configuration is the same as 'default' configuration and 'minimal' is just a simple example. The 'default' configuration is descriptive enough in combination with doxygen comments. --- diff --git a/share/Makefile.am b/share/Makefile.am index 938501ff36..18f4e06c15 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -27,8 +27,6 @@ EXTRA_DIST = \ $(DIST_http_lua) \ $(DIST_lua) \ $(DIST_osdmenu_default) \ - $(DIST_osdmenu_dvd) \ - $(DIST_osdmenu_minimal) \ $(DIST_mozilla) \ $(DIST_maemo) @@ -44,9 +42,7 @@ nobase_dist_pkgdata_DATA += $(DIST_http) endif if BUILD_OSDMENU nobase_dist_pkgdata_DATA += \ - $(DIST_osdmenu_default) \ - $(DIST_osdmenu_dvd) \ - $(DIST_osdmenu_minimal) + $(DIST_osdmenu_default) endif if BUILD_LUA nobase_dist_pkgdata_DATA += $(DIST_lua) @@ -242,49 +238,6 @@ DIST_osdmenu_default = \ osdmenu/default/volume/volume_09.png \ osdmenu/default/volume/volume_10.png -DIST_osdmenu_dvd = \ - osdmenu/dvd.cfg \ - osdmenu/dvd/selection/bw.png \ - osdmenu/dvd/selection/esc.png \ - osdmenu/dvd/selection/fw.png \ - osdmenu/dvd/selection/mute.png \ - osdmenu/dvd/selection/next.png \ - osdmenu/dvd/selection/pause.png \ - osdmenu/dvd/selection/play.png \ - osdmenu/dvd/selection/previous.png \ - osdmenu/dvd/selection/slow.png \ - osdmenu/dvd/selection/stop.png \ - osdmenu/dvd/selected/bw.png \ - osdmenu/dvd/selected/next.png \ - osdmenu/dvd/selected/play.png \ - osdmenu/dvd/selected/fw.png \ - osdmenu/dvd/selected/stop.png \ - osdmenu/dvd/selected/pause.png \ - osdmenu/dvd/selected/previous.png \ - osdmenu/dvd/selected/esc.png \ - osdmenu/dvd/selected/mute.png \ - osdmenu/dvd/selected/slow.png \ - osdmenu/dvd/selected/volume.png \ - osdmenu/dvd/volume/volume00.png \ - osdmenu/dvd/volume/volume01.png \ - osdmenu/dvd/volume/volume02.png \ - osdmenu/dvd/volume/volume03.png \ - osdmenu/dvd/volume/volume04.png \ - osdmenu/dvd/volume/volume05.png \ - osdmenu/dvd/unselect/barroff.png - -DIST_osdmenu_minimal = \ - osdmenu/minimal.cfg \ - osdmenu/minimal/fs_panel_simple.xcf \ - osdmenu/minimal/fs_panel_skip_next.png \ - osdmenu/minimal/fs_panel_simple.png \ - osdmenu/minimal/fs_panel_volume_max.png \ - osdmenu/minimal/fs_panel.xcf \ - osdmenu/minimal/fs_panel_skip_previous.png \ - osdmenu/minimal/fs_panel_volume_min.png \ - osdmenu/minimal/fs_panel.png \ - osdmenu/minimal/fs_panel_mockup.png - DIST_lua= \ lua/README.txt \ lua/meta/README.txt \ diff --git a/share/osdmenu/dvd.cfg b/share/osdmenu/dvd.cfg deleted file mode 100644 index ab7e89d186..0000000000 --- a/share/osdmenu/dvd.cfg +++ /dev/null @@ -1,67 +0,0 @@ -dir share/osdmenu/dvd -action key-play (0,0) - unselect unselect/barroff.png - select selection/play.png - pressed selected/play.png -end -action key-slower (0,0) - unselect unselect/barroff.png - selected selection/slow.png - pressed selected/slow.png -end -action key-play-pause (0,0) - unselect unselect/barroff.png - select selection/pause.png - pressed selected/pause.png -end -action key-stop (0,0) - unselect unselect/barroff.png - select selection/stop.png - pressed selected/stop.png -end -action key-chapter-prev (0,0) - unselect unselect/barroff.png - select selection/previous.png - pressed selected/previous.png -end -action key-jump-medium (0,0) - unselect unselect/barroff.png - select selection/bw.png - pressed selected/bw.png -end -action key-jump+medium (0,0) - unselect unselect/barroff.png - select selection/fw.png - pressed selected/fw.png -end -action key-chapter-next (0,0) - unselect unselect/barroff.png - select selection/next.png - pressed selected/next.png -end -action key-quit (0,0) - unselect unselect/barroff.png - select selection/esc.png - pressed selected/esc.png -end -action key-vol-up (0,0) - unselect unselect/barroff.png - select selection/mute.png - pressed selected/mute.png - action key-vol-up (480,0) - type volume - range key-vol-down 3 - volume/volume00.png - volume/volume01.png - volume/volume01.png - volume/volume02.png - volume/volume02.png - volume/volume03.png - volume/volume03.png - volume/volume04.png - volume/volume04.png - volume/volume05.png - volume/volume05.png - end - end -end diff --git a/share/osdmenu/dvd/selected/bw.png b/share/osdmenu/dvd/selected/bw.png deleted file mode 100644 index d27e0fe2f8..0000000000 Binary files a/share/osdmenu/dvd/selected/bw.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/esc.png b/share/osdmenu/dvd/selected/esc.png deleted file mode 100644 index c5c1a64e20..0000000000 Binary files a/share/osdmenu/dvd/selected/esc.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/fw.png b/share/osdmenu/dvd/selected/fw.png deleted file mode 100644 index ccac51dd9a..0000000000 Binary files a/share/osdmenu/dvd/selected/fw.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/mute.png b/share/osdmenu/dvd/selected/mute.png deleted file mode 100644 index a8258c5ac9..0000000000 Binary files a/share/osdmenu/dvd/selected/mute.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/next.png b/share/osdmenu/dvd/selected/next.png deleted file mode 100644 index 3e9f8b7e28..0000000000 Binary files a/share/osdmenu/dvd/selected/next.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/pause.png b/share/osdmenu/dvd/selected/pause.png deleted file mode 100644 index 1103247704..0000000000 Binary files a/share/osdmenu/dvd/selected/pause.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/play.png b/share/osdmenu/dvd/selected/play.png deleted file mode 100644 index 48e0eebd43..0000000000 Binary files a/share/osdmenu/dvd/selected/play.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/previous.png b/share/osdmenu/dvd/selected/previous.png deleted file mode 100644 index c4b7b24f46..0000000000 Binary files a/share/osdmenu/dvd/selected/previous.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/slow.png b/share/osdmenu/dvd/selected/slow.png deleted file mode 100644 index aa19a2f74c..0000000000 Binary files a/share/osdmenu/dvd/selected/slow.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/stop.png b/share/osdmenu/dvd/selected/stop.png deleted file mode 100644 index 44282c5a23..0000000000 Binary files a/share/osdmenu/dvd/selected/stop.png and /dev/null differ diff --git a/share/osdmenu/dvd/selected/volume.png b/share/osdmenu/dvd/selected/volume.png deleted file mode 100644 index a8258c5ac9..0000000000 Binary files a/share/osdmenu/dvd/selected/volume.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/bw.png b/share/osdmenu/dvd/selection/bw.png deleted file mode 100644 index 4b1de09e0e..0000000000 Binary files a/share/osdmenu/dvd/selection/bw.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/esc.png b/share/osdmenu/dvd/selection/esc.png deleted file mode 100644 index 55a65ac85e..0000000000 Binary files a/share/osdmenu/dvd/selection/esc.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/fw.png b/share/osdmenu/dvd/selection/fw.png deleted file mode 100644 index b8dec661fc..0000000000 Binary files a/share/osdmenu/dvd/selection/fw.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/mute.png b/share/osdmenu/dvd/selection/mute.png deleted file mode 100644 index 6e754a20f5..0000000000 Binary files a/share/osdmenu/dvd/selection/mute.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/next.png b/share/osdmenu/dvd/selection/next.png deleted file mode 100644 index 097751d76f..0000000000 Binary files a/share/osdmenu/dvd/selection/next.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/pause.png b/share/osdmenu/dvd/selection/pause.png deleted file mode 100644 index 9aea63de77..0000000000 Binary files a/share/osdmenu/dvd/selection/pause.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/play.png b/share/osdmenu/dvd/selection/play.png deleted file mode 100644 index cddcda2920..0000000000 Binary files a/share/osdmenu/dvd/selection/play.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/previous.png b/share/osdmenu/dvd/selection/previous.png deleted file mode 100644 index 7d133505e2..0000000000 Binary files a/share/osdmenu/dvd/selection/previous.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/slow.png b/share/osdmenu/dvd/selection/slow.png deleted file mode 100644 index 060fc84f25..0000000000 Binary files a/share/osdmenu/dvd/selection/slow.png and /dev/null differ diff --git a/share/osdmenu/dvd/selection/stop.png b/share/osdmenu/dvd/selection/stop.png deleted file mode 100644 index 93fa306b4b..0000000000 Binary files a/share/osdmenu/dvd/selection/stop.png and /dev/null differ diff --git a/share/osdmenu/dvd/unselect/barroff.png b/share/osdmenu/dvd/unselect/barroff.png deleted file mode 100644 index e187422b5b..0000000000 Binary files a/share/osdmenu/dvd/unselect/barroff.png and /dev/null differ diff --git a/share/osdmenu/dvd/volume/volume00.png b/share/osdmenu/dvd/volume/volume00.png deleted file mode 100644 index 6d997e0c29..0000000000 Binary files a/share/osdmenu/dvd/volume/volume00.png and /dev/null differ diff --git a/share/osdmenu/dvd/volume/volume01.png b/share/osdmenu/dvd/volume/volume01.png deleted file mode 100644 index 278fef9439..0000000000 Binary files a/share/osdmenu/dvd/volume/volume01.png and /dev/null differ diff --git a/share/osdmenu/dvd/volume/volume02.png b/share/osdmenu/dvd/volume/volume02.png deleted file mode 100644 index 6583a4a821..0000000000 Binary files a/share/osdmenu/dvd/volume/volume02.png and /dev/null differ diff --git a/share/osdmenu/dvd/volume/volume03.png b/share/osdmenu/dvd/volume/volume03.png deleted file mode 100644 index 27d15cb80c..0000000000 Binary files a/share/osdmenu/dvd/volume/volume03.png and /dev/null differ diff --git a/share/osdmenu/dvd/volume/volume04.png b/share/osdmenu/dvd/volume/volume04.png deleted file mode 100644 index f059facd38..0000000000 Binary files a/share/osdmenu/dvd/volume/volume04.png and /dev/null differ diff --git a/share/osdmenu/dvd/volume/volume05.png b/share/osdmenu/dvd/volume/volume05.png deleted file mode 100644 index 032b9256ca..0000000000 Binary files a/share/osdmenu/dvd/volume/volume05.png and /dev/null differ diff --git a/share/osdmenu/minimal.cfg b/share/osdmenu/minimal.cfg deleted file mode 100644 index da76ec1229..0000000000 --- a/share/osdmenu/minimal.cfg +++ /dev/null @@ -1,21 +0,0 @@ -dir share/osdmenu/minimal -action key-prev (0,0) - unselect fs_panel_simple.png - select fs_panel_skip_previous.png - pressed fs_panel_skip_previous.png -end -action key-next (0,0) - unselect fs_panel_simple.png - select fs_panel_skip_next.png - pressed fs_panel_skip_next.png -end -action key-vol-up (0,0) - unselect fs_panel_simple.png - select fs_panel_volume_max.png - pressed fs_panel_volume_max.png -end -action key-vol-mute (0,0) - unselect fs_panel_simple.png - select fs_panel_volume_min.png - pressed fs_panel_volume_min.png -end diff --git a/share/osdmenu/minimal/fs_panel.png b/share/osdmenu/minimal/fs_panel.png deleted file mode 100644 index d49e3f6af1..0000000000 Binary files a/share/osdmenu/minimal/fs_panel.png and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel.xcf b/share/osdmenu/minimal/fs_panel.xcf deleted file mode 100644 index 468b63d5f9..0000000000 Binary files a/share/osdmenu/minimal/fs_panel.xcf and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_mockup.png b/share/osdmenu/minimal/fs_panel_mockup.png deleted file mode 100644 index d522a08dec..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_mockup.png and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_simple.png b/share/osdmenu/minimal/fs_panel_simple.png deleted file mode 100644 index b0a8b1d4f4..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_simple.png and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_simple.xcf b/share/osdmenu/minimal/fs_panel_simple.xcf deleted file mode 100644 index f0ec6c0156..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_simple.xcf and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_skip_next.png b/share/osdmenu/minimal/fs_panel_skip_next.png deleted file mode 100644 index f9cf04e342..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_skip_next.png and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_skip_previous.png b/share/osdmenu/minimal/fs_panel_skip_previous.png deleted file mode 100644 index 16c64ca2ad..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_skip_previous.png and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_volume_max.png b/share/osdmenu/minimal/fs_panel_volume_max.png deleted file mode 100644 index 326266e676..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_volume_max.png and /dev/null differ diff --git a/share/osdmenu/minimal/fs_panel_volume_min.png b/share/osdmenu/minimal/fs_panel_volume_min.png deleted file mode 100644 index ce27141a2d..0000000000 Binary files a/share/osdmenu/minimal/fs_panel_volume_min.png and /dev/null differ