X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2FModules.am;h=32f5fabd6f7368773cdae2f3c5c6da9bd339b5d9;hb=88b4c402e279e9999c845cf69cab2665c2d31fda;hp=a863447dd126ff98bcc9b7d3a539d489eaa5027d;hpb=14f37b2101842fa6e427f962f689db74eff6faba;p=vlc

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index a863447dd1..32f5fabd6f 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -20,6 +20,7 @@ nodist_SOURCES_qt4 = \
 		dialogs_provider.moc.cpp \
 		input_manager.moc.cpp \
 		actions_manager.moc.cpp \
+		extensions_manager.moc.cpp \
 		recents.moc.cpp \
 		variables.moc.cpp \
 		dialogs/playlist.moc.cpp \
@@ -27,6 +28,7 @@ nodist_SOURCES_qt4 = \
 		dialogs/mediainfo.moc.cpp \
 		dialogs/extended.moc.cpp \
 		dialogs/messages.moc.cpp \
+		dialogs/epg.moc.cpp \
 		dialogs/errors.moc.cpp \
 		dialogs/external.moc.cpp \
 		dialogs/plugins.moc.cpp \
@@ -40,6 +42,8 @@ nodist_SOURCES_qt4 = \
 		dialogs/openurl.moc.cpp \
 		dialogs/podcast_configuration.moc.cpp \
 		dialogs/vlm.moc.cpp \
+		dialogs/firstrun.moc.cpp \
+		dialogs/extensions.moc.cpp \
 		components/extended_panels.moc.cpp \
 		components/info_panels.moc.cpp \
 		components/preferences_widgets.moc.cpp \
@@ -49,10 +53,13 @@ nodist_SOURCES_qt4 = \
 		components/interface_widgets.moc.cpp \
 		components/controller.moc.cpp \
 		components/controller_widget.moc.cpp \
+		components/epg/EPGRuler.moc.cpp \
+		components/epg/EPGView.moc.cpp \
+		components/epg/EPGWidget.moc.cpp \
+		components/playlist/icon_view.moc.cpp \
 		components/playlist/playlist_model.moc.cpp \
-		components/playlist/playlist_item.moc.cpp \
 		components/playlist/playlist.moc.cpp \
-		components/playlist/panels.moc.cpp \
+		components/playlist/standardpanel.moc.cpp \
 		components/playlist/selector.moc.cpp \
 		components/sout/profile_selector.moc.cpp \
 		components/sout/sout_widgets.moc.cpp \
@@ -95,6 +102,7 @@ DEPS_res = \
 	pixmaps/menus/stream_16px.png \
 	pixmaps/next.png \
 	pixmaps/next_16px.png \
+	pixmaps/noart-64.png \
 	pixmaps/noart.png \
 	pixmaps/pause.png \
 	pixmaps/pause_16px.png \
@@ -103,6 +111,7 @@ DEPS_res = \
 	pixmaps/playlist/add.png \
 	pixmaps/playlist/jumpto.png \
 	pixmaps/playlist/playlist.png \
+	pixmaps/playlist/remove.png \
 	pixmaps/playlist/repeat_all.png \
 	pixmaps/playlist/repeat_off.png \
 	pixmaps/playlist/repeat_one.png \
@@ -124,6 +133,10 @@ DEPS_res = \
 	pixmaps/previous.png \
 	pixmaps/previous_16px.png \
 	pixmaps/profile_new.png \
+	pixmaps/sample_classic.png \
+	pixmaps/sample_complete.png \
+	pixmaps/sample_minimal.png \
+	pixmaps/sample_skins.png \
 	pixmaps/slower.png \
 	pixmaps/space.png \
 	pixmaps/stop.png \
@@ -175,19 +188,29 @@ DEPS_res = \
 
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
 
+moc_verbose = $(moc_verbose_$(V))
+moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY))
+moc_verbose_0 = @echo "  MOC   " $@;
+moc_verbose__0 = $(oc_verbose_0)
+
+uic_verbose = $(uic_verbose_$(V))
+uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
+uic_verbose_0 = @echo "  UIC   " $@;
+uic_verbose__0 = $(uic_verbose_0)
+
 resources.cpp: vlc.qrc $(DEPS_res)
-	$(RCC) -name vlc -o $@ $<
+	$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-	$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+	$(moc_verbose)$(MOC) $(DEFS) $(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
-	sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
-	rm -f $@.tmp
+	$(AM_V_at)mkdir -p -- ui
+	$(AM_V_at)rm -f $@ $@.tmp
+	$(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
+	$(uic_verbose)$(UIC) -tr "Q_" $< >> $@.tmp
+	$(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
+	$(AM_V_at)rm -f $@.tmp
 
 SOURCES_qt4 = 	qt4.cpp \
 		menus.cpp \
@@ -195,12 +218,14 @@ SOURCES_qt4 = 	qt4.cpp \
 		dialogs_provider.cpp \
 		input_manager.cpp \
 		actions_manager.cpp \
+		extensions_manager.cpp \
 		recents.cpp \
 		variables.cpp \
 		dialogs/playlist.cpp \
 		dialogs/bookmarks.cpp \
 		dialogs/preferences.cpp \
 		dialogs/mediainfo.cpp \
+		dialogs/epg.cpp \
 		dialogs/extended.cpp \
 		dialogs/messages.cpp \
 		dialogs/errors.cpp \
@@ -214,7 +239,9 @@ SOURCES_qt4 = 	qt4.cpp \
 		dialogs/open.cpp \
 		dialogs/openurl.cpp \
 		dialogs/vlm.cpp \
+		dialogs/firstrun.cpp \
 		dialogs/podcast_configuration.cpp \
+		dialogs/extensions.cpp \
 		components/extended_panels.cpp \
 		components/info_panels.cpp \
 		components/preferences_widgets.cpp \
@@ -224,6 +251,11 @@ SOURCES_qt4 = 	qt4.cpp \
 		components/interface_widgets.cpp \
 		components/controller.cpp \
 		components/controller_widget.cpp \
+		components/epg/EPGItem.cpp \
+		components/epg/EPGRuler.cpp \
+		components/epg/EPGView.cpp \
+		components/epg/EPGWidget.cpp \
+		components/playlist/icon_view.cpp \
 		components/playlist/playlist_model.cpp \
 		components/playlist/playlist_item.cpp \
 		components/playlist/standardpanel.cpp \
@@ -242,6 +274,7 @@ noinst_HEADERS = \
 	dialogs_provider.hpp \
 	input_manager.hpp \
 	actions_manager.hpp \
+	extensions_manager.hpp \
 	recents.hpp \
 	variables.hpp \
 	dialogs/playlist.hpp \
@@ -249,6 +282,7 @@ noinst_HEADERS = \
 	dialogs/mediainfo.hpp \
 	dialogs/extended.hpp \
 	dialogs/messages.hpp \
+	dialogs/epg.hpp \
 	dialogs/errors.hpp \
 	dialogs/external.hpp \
 	dialogs/plugins.hpp \
@@ -261,7 +295,9 @@ noinst_HEADERS = \
 	dialogs/open.hpp \
 	dialogs/openurl.hpp \
 	dialogs/vlm.hpp \
+	dialogs/firstrun.hpp \
 	dialogs/podcast_configuration.hpp \
+	dialogs/extensions.hpp \
 	components/extended_panels.hpp \
 	components/info_panels.hpp \
 	components/preferences_widgets.hpp \
@@ -271,9 +307,15 @@ noinst_HEADERS = \
 	components/interface_widgets.hpp \
 	components/controller.hpp \
 	components/controller_widget.hpp \
+	components/epg/EPGEvent.hpp \
+	components/epg/EPGItem.hpp \
+	components/epg/EPGRuler.hpp \
+	components/epg/EPGView.hpp \
+	components/epg/EPGWidget.hpp \
+	components/playlist/icon_view.hpp \
 	components/playlist/playlist_model.hpp \
 	components/playlist/playlist_item.hpp \
-	components/playlist/panels.hpp \
+	components/playlist/standardpanel.hpp \
 	components/playlist/playlist.hpp \
 	components/playlist/selector.hpp \
 	components/playlist/sorting.h \
@@ -285,7 +327,9 @@ noinst_HEADERS = \
 	util/qvlcframe.hpp \
 	util/qvlcapp.hpp \
 	util/qt_dirs.hpp \
-	util/registry.hpp
+	util/registry.hpp \
+	util/singleton.hpp
+
 
 EXTRA_DIST += \
 	vlc.qrc \