osdmenu: Reverts [22062] which was a revert of [22061], and gives the .cfg the same...
authorRafaël Carré <funman@videolan.org>
Sat, 15 Sep 2007 22:54:41 +0000 (22:54 +0000)
committerRafaël Carré <funman@videolan.org>
Sat, 15 Sep 2007 22:54:41 +0000 (22:54 +0000)
Makefile.am
share/osdmenu/menu.cfg [deleted file]
share/osdmenu/minimal.cfg [new file with mode: 0644]

index 2a5bc18..070d80b 100644 (file)
@@ -739,7 +739,7 @@ package-win32-base-debug: package-win-common
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
-       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
                mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
                for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
                         cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
diff --git a/share/osdmenu/menu.cfg b/share/osdmenu/menu.cfg
deleted file mode 100644 (file)
index da76ec1..0000000
+++ /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.cfg b/share/osdmenu/minimal.cfg
new file mode 100644 (file)
index 0000000..da76ec1
--- /dev/null
@@ -0,0 +1,21 @@
+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