* share/Makefile.am: added default skins2 theme and vlm http files.

* modules/gui/skins2/Modules.am: removed old skins2 theme.

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index deddb4a9ebcaa43b86e78663d3edf614a5863407..d09f95734f9b032bd1846f50aa7c849165fd1f85 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -187,68 +187,3 @@ SOURCES_skins2 = \
        x11/x11_tooltip.cpp \
        x11/x11_tooltip.hpp \
        $(NULL)
-
-EXTRA_DIST += \
-       theme/add_item_onclick.png \
-       theme/add_item.png \
-       theme/body.png \
-       theme/close_mouseover.png \
-       theme/close_onclick.png \
-       theme/close.png \
-       theme/delete_item_onclick.png \
-       theme/delete_item.png \
-       theme/disabled.png \
-       theme/fast_disabled.png \
-       theme/fast_onclick.png \
-       theme/fast.png \
-       theme/FreeSansBold.ttf \
-       theme/FreeSans.ttf \
-       theme/next_disabled.png \
-       theme/next_onclick.png \
-       theme/next.png \
-       theme/pause_onclick.png \
-       theme/pause.png \
-       theme/playlist_body1.png \
-       theme/playlist_body2.png \
-       theme/playlist_body3.png \
-       theme/playlist_body4.png \
-       theme/playlist_body6.png \
-       theme/playlist_body7.png \
-       theme/playlist_body8.png \
-       theme/playlist_body9.png \
-       theme/playlist_button2.png \
-       theme/playlist_button_onclick2.png \
-       theme/playlist_button_onclick.png \
-       theme/playlist_button.png \
-       theme/playlist.png \
-       theme/play_onclick.png \
-       theme/play.png \
-       theme/preferences_onclick.png \
-       theme/preferences.png \
-       theme/previous_disabled.png \
-       theme/previous_onclick.png \
-       theme/previous.png \
-       theme/reduce_disabled.png \
-       theme/reduce_onclick.png \
-       theme/reduce.png \
-       theme/resize.png \
-       theme/rev_disabled.png \
-       theme/rev_onclick.png \
-       theme/rev.png \
-       theme/skin.dtd \
-       theme/slider2.png \
-       theme/slider_onclick.png \
-       theme/slider_playlist.png \
-       theme/slider.png \
-       theme/slider_volume_onclick.png \
-       theme/slider_volume.png \
-       theme/slow_disabled.png \
-       theme/slow_onclick.png \
-       theme/slow.png \
-       theme/sort_onclick.png \
-       theme/sort.png \
-       theme/stop_disabled.png \
-       theme/stop_onclick.png \
-       theme/stop.png \
-       theme/theme.xml \
-       theme/volume.png

diff --git a/share/Makefile.am b/share/Makefile.am
index c372ef2a316e86dd12e9ca0a67d848e2cb1e00e3..bffa00b2e36ad2d19535ce9b3d2be4812d0149ee 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -14,6 +14,7 @@ dist_pkgdata_DATA = \
 
 nobase_dist_pkgdata_DATA = \
        $(DIST_skins) \
+       $(DIST_skins2) \
        $(DIST_http) \
        $(NULL)
 
@@ -130,6 +131,73 @@ DIST_skins = \
        skins/default/stop1.bmp \
        $(NULL)
 
+DIST_skins2 = \
+       skins2/default/FreeSansBold.ttf \
+       skins2/default/add_item.png \
+       skins2/default/add_item_onclick.png \
+       skins2/default/body.png \
+       skins2/default/close.png \
+       skins2/default/close_mouseover.png \
+       skins2/default/close_onclick.png \
+       skins2/default/delete_item.png \
+       skins2/default/delete_item_onclick.png \
+       skins2/default/disabled.png \
+       skins2/default/fast.png \
+       skins2/default/fast_disabled.png \
+       skins2/default/fast_onclick.png \
+       skins2/default/next.png \
+       skins2/default/next_disabled.png \
+       skins2/default/next_onclick.png \
+       skins2/default/pause.png \
+       skins2/default/pause_onclick.png \
+       skins2/default/play.png \
+       skins2/default/play_onclick.png \
+       skins2/default/playlist.png \
+       skins2/default/playlist_body1.png \
+       skins2/default/playlist_body2.png \
+       skins2/default/playlist_body3.png \
+       skins2/default/playlist_body4.png \
+       skins2/default/playlist_body6.png \
+       skins2/default/playlist_body7.png \
+       skins2/default/playlist_body8.png \
+       skins2/default/playlist_body9.png \
+       skins2/default/playlist_button.png \
+       skins2/default/playlist_button2.png \
+       skins2/default/playlist_button_onclick.png \
+       skins2/default/playlist_button_onclick2.png \
+       skins2/default/preferences.png \
+       skins2/default/preferences_onclick.png \
+       skins2/default/previous.png \
+       skins2/default/previous_disabled.png \
+       skins2/default/previous_onclick.png \
+       skins2/default/reduce.png \
+       skins2/default/reduce_disabled.png \
+       skins2/default/reduce_onclick.png \
+       skins2/default/resize.png \
+       skins2/default/rev.png \
+       skins2/default/rev_disabled.png \
+       skins2/default/rev_onclick.png \
+       skins2/default/skin.dtd \
+       skins2/default/slider.png \
+       skins2/default/slider2.png \
+       skins2/default/slider_onclick.png \
+       skins2/default/slider_playlist.png \
+       skins2/default/slider_volume.png \
+       skins2/default/slider_volume_onclick.png \
+       skins2/default/slow.png \
+       skins2/default/slow_disabled.png \
+       skins2/default/slow_onclick.png \
+       skins2/default/sort.png \
+       skins2/default/sort_onclick.png \
+       skins2/default/stop.png \
+       skins2/default/stop_disabled.png \
+       skins2/default/stop_onclick.png \
+       skins2/default/theme.xml \
+       skins2/default/volume.png \
+       \
+       skins2/fonts/FreeSans.ttf \
+       $(NULL)
+
 DIST_http = \
        http/index.html \
        http/info.html \
@@ -137,5 +205,8 @@ DIST_http = \
        http/admin/browse.html \
        http/admin/dboxfiles.html \
        http/admin/.access \
+       http/vlm/edit.html \
+       http/vlm/index.html \
+       http/vlm/new.html \
        http/style.css \
        $(NULL)