Qt4 - Add a "medium" volume icon as requested on IRC, ( by Quovodis?)

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index aa66cc58631e5da4686adc527213dcadeb1fa857..cf73db2c3dc83bced068b3ce4d05476ef5a1f065 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -32,18 +32,20 @@ nodist_SOURCES_qt4 = \
                dialogs/podcast_configuration.moc.cpp \
                dialogs/vlm.moc.cpp \
                components/extended_panels.moc.cpp \
-               components/infopanels.moc.cpp \
+               components/info_panels.moc.cpp \
                components/preferences_widgets.moc.cpp \
                components/complete_preferences.moc.cpp \
                components/simple_preferences.moc.cpp \
                components/open_panels.moc.cpp \
                components/interface_widgets.moc.cpp \
+               components/playlist/playlist.moc.cpp \
                components/playlist/panels.moc.cpp \
                components/playlist/selector.moc.cpp \
                util/input_slider.moc.cpp \
                util/customwidgets.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
+               ui/v4l2.h \
                ui/video_effects.h \
                ui/open_file.h \
                ui/open_disk.h \
@@ -68,13 +70,13 @@ resources.cpp: res.qrc
        $(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(MOC) -o $@ $<
+       $(MOC) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        mkdir -p -- ui
        rm -f $@ $@.tmp
        echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
-       $(UIC) -tr "Q_" $< >> $@.tmp
+       $(UIC) -tr "Q_" $< | grep -v setObjectName | grep -v objectName >> $@.tmp
        sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
        rm -f $@.tmp
 
@@ -98,13 +100,14 @@ SOURCES_qt4 =      qt4.cpp \
                dialogs/vlm.cpp \
                dialogs/podcast_configuration.cpp \
                components/extended_panels.cpp \
-               components/infopanels.cpp \
+               components/info_panels.cpp \
                components/preferences_widgets.cpp \
                components/complete_preferences.cpp \
                components/simple_preferences.cpp \
                components/open_panels.cpp \
                components/interface_widgets.cpp \
                components/playlist/standardpanel.cpp \
+               components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
                util/input_slider.cpp \
                util/customwidgets.cpp
@@ -130,13 +133,14 @@ noinst_HEADERS = \
        dialogs/vlm.hpp \
        dialogs/podcast_configuration.hpp \
        components/extended_panels.hpp \
-       components/infopanels.hpp \
+       components/info_panels.hpp \
        components/preferences_widgets.hpp \
        components/complete_preferences.hpp \
        components/simple_preferences.hpp \
        components/open_panels.hpp \
        components/interface_widgets.hpp \
        components/playlist/panels.hpp \
+       components/playlist/playlist.hpp \
        components/playlist/selector.hpp \
        util/input_slider.hpp \
        util/directslider.hpp \
@@ -146,6 +150,7 @@ noinst_HEADERS = \
 EXTRA_DIST += \
        res.qrc \
        ui/equalizer.ui \
+       ui/v4l2.ui \
        ui/video_effects.ui \
        ui/open_file.ui \
        ui/open_disk.ui \
@@ -219,6 +224,7 @@ EXTRA_DIST += \
        pixmaps/type_playlist.png \
        pixmaps/type_unknown.xpm \
        pixmaps/volume-high.png \
+       pixmaps/volume-medium.png \
        pixmaps/volume-low.png \
        pixmaps/volume-muted.png \
        pixmaps/volume-slider.svg \