Qt4 - New icons for extended preferences.

[vlc] / modules / gui / qt4 / Modules.am

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index ad563a23b6c9a7a9d1def68006b1c7d7a8387366..c65e99f38a265d02bf917853a3325bfe3c7f507b 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -10,6 +10,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
+CLEANFILES += dialogs/about.hpp
 SUFFIXES += .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
@@ -29,6 +30,8 @@ nodist_SOURCES_qt4 = \
                dialogs/help.moc.cpp \
                dialogs/gototime.moc.cpp \
                dialogs/open.moc.cpp \
+               dialogs/podcast_configuration.moc.cpp \
+               dialogs/vlm.moc.cpp \
                components/extended_panels.moc.cpp \
                components/infopanels.moc.cpp \
                components/preferences_widgets.moc.cpp \
@@ -42,12 +45,15 @@ nodist_SOURCES_qt4 = \
                util/customwidgets.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
+               ui/spatializer.h \
                ui/video_effects.h \
                ui/open_file.h \
                ui/open_disk.h \
                ui/open_net.h \
                ui/open_capture.h \
                ui/open.h \
+               ui/vlm.h \
+               ui/podcast_configuration.h \
                ui/sprefs_audio.h \
                ui/sprefs_input.h \
                ui/sprefs_interface.h \
@@ -58,7 +64,7 @@ nodist_SOURCES_qt4 = \
                ui/sout.h
 
 if ENABLE_QT4
-BUILT_SOURCES += $(nodist_SOURCES_qt4)
+BUILT_SOURCES += $(nodist_SOURCES_qt4) dialogs/about.hpp
 endif
 
 resources.cpp: res.qrc
@@ -72,8 +78,24 @@ resources.cpp: res.qrc
        rm -f $@ $@.tmp
        echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
        $(UIC) -tr "Q_" $< >> $@.tmp
-       sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp
-       mv -f $@.tmp $@
+       sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
+       rm -f $@.tmp
+
+dialogs/help.cpp: dialogs/about.hpp
+
+dialogs/about.hpp: Modules.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
+       mkdir -p -- dialogs
+       echo "/* Automatically generated file - DO NOT EDIT */" > dialogs/about.hpp.tmp
+       echo "static const char psz_license[] =" >> dialogs/about.hpp.tmp
+       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
+       echo ";" >> dialogs/about.hpp.tmp
+       echo "static const char psz_thanks[] =" >> dialogs/about.hpp.tmp
+       grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
+       echo ";" >> dialogs/about.hpp.tmp
+       echo "static const char psz_authors[] =" >> dialogs/about.hpp.tmp
+       grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
+       echo ";" >> dialogs/about.hpp.tmp
+       mv -f -- dialogs/about.hpp.tmp dialogs/about.hpp
 
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
@@ -92,6 +114,8 @@ SOURCES_qt4 =        qt4.cpp \
                dialogs/help.cpp \
                dialogs/gototime.cpp \
                dialogs/open.cpp \
+        dialogs/vlm.cpp \
+               dialogs/podcast_configuration.cpp \
                components/extended_panels.cpp \
                components/infopanels.cpp \
                components/preferences_widgets.cpp \
@@ -119,9 +143,12 @@ noinst_HEADERS = \
        dialogs/preferences.hpp \
        dialogs/interaction.hpp \
        dialogs/sout.hpp \
+       dialogs/about.hpp \
        dialogs/help.hpp \
        dialogs/gototime.hpp \
        dialogs/open.hpp \
+       dialogs/vlm.hpp \
+       dialogs/podcast_configuration.hpp \
        components/extended_panels.hpp \
        components/infopanels.hpp \
        components/preferences_widgets.hpp \
@@ -139,12 +166,14 @@ noinst_HEADERS = \
 EXTRA_DIST += \
        res.qrc \
        ui/equalizer.ui \
+       ui/spatializer.ui \
        ui/video_effects.ui \
        ui/open_file.ui \
        ui/open_disk.ui \
        ui/open_net.ui \
        ui/open_capture.ui \
        ui/open.ui \
+       ui/podcast_configuration.ui \
        ui/sprefs_audio.ui \
        ui/sprefs_input.ui \
        ui/sprefs_interface.ui \
@@ -153,13 +182,10 @@ EXTRA_DIST += \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
        ui/sout.ui \
-       pixmaps/advanced.xpm \
-       pixmaps/audio.xpm \
+       ui/vlm.ui \
        pixmaps/codec.xpm \
-       pixmaps/intf.xpm \
        pixmaps/type_net.xpm \
        pixmaps/type_playlist.xpm \
-       pixmaps/video.xpm \
        pixmaps/type_unknown.xpm \
        pixmaps/type_file.xpm \
        pixmaps/type_card.xpm \
@@ -172,6 +198,7 @@ EXTRA_DIST += \
        pixmaps/noart.png \
        pixmaps/playlist_icon.png \
        pixmaps/play.png \
+       pixmaps/pause.png \
        pixmaps/previous.png \
        pixmaps/spref_cone_Audio_64.png \
        pixmaps/spref_cone_Hotkeys_64.png \
@@ -182,6 +209,7 @@ EXTRA_DIST += \
        pixmaps/stop.png \
        pixmaps/volume-high.png \
        pixmaps/volume-low.png \
+       pixmaps/volume-muted.png \
        pixmaps/vlc_help_16px.png \
        pixmaps/vlc_stop_16px.png \
        pixmaps/vlc_play_16px.png \
@@ -203,4 +231,16 @@ EXTRA_DIST += \
        pixmaps/vlc_file-wide_16px.png \
        pixmaps/vlc_info_16px.png \
        pixmaps/vlc_previous_16px.png \
-       pixmaps/vlc_next_16px.png
+       pixmaps/vlc_next_16px.png \
+       pixmaps/vlc_playlist_add.png \
+       pixmaps/vlc_playlist_repeat_off.png \
+       pixmaps/vlc_playlist_repeat_all.png \
+       pixmaps/vlc_playlist_repeat_one.png \
+       pixmaps/vlc_playlist_shuffle_on.png \
+       pixmaps/vlc_playlist_shuffle_off.png \
+       pixmaps/vlc_advprefs_audio.png \
+       pixmaps/vlc_advprefs_video.png \
+       pixmaps/vlc_advprefs_intf.png \
+       pixmaps/vlc_advprefs_sout.png \
+       pixmaps/vlc_advprefs_extended.png \
+       pixmaps/vlc_advprefs_playlist.png