X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=30f1f59d7743f6ea5c7ed9fe11798788be040e99;hb=e9adc2be3b4c1d2cbf641f284458e628e839cff9;hp=1d416fbd40873bb33be58d7da12f54105c243e9f;hpb=d2d62531e689b20176d57fd122db06d4656a4180;p=vlc

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 1d416fbd40..30f1f59d77 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -12,7 +12,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
-SUFFIXES += .ui .h .hpp .moc.cpp
+SUFFIXES = .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
 		main_interface.moc.cpp \
@@ -20,13 +20,16 @@ nodist_SOURCES_qt4 = \
 		dialogs_provider.moc.cpp \
 		input_manager.moc.cpp \
 		actions_manager.moc.cpp \
+		extensions_manager.moc.cpp \
 		recents.moc.cpp \
+		adapters/seekpoints.moc.cpp \
 		variables.moc.cpp \
 		dialogs/playlist.moc.cpp \
 		dialogs/bookmarks.moc.cpp \
 		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,8 +43,11 @@ 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/info_widgets.moc.cpp \
 		components/preferences_widgets.moc.cpp \
 		components/complete_preferences.moc.cpp \
 		components/simple_preferences.moc.cpp \
@@ -49,19 +55,30 @@ nodist_SOURCES_qt4 = \
 		components/interface_widgets.moc.cpp \
 		components/controller.moc.cpp \
 		components/controller_widget.moc.cpp \
+		components/epg/EPGChannels.moc.cpp \
+		components/epg/EPGRuler.moc.cpp \
+		components/epg/EPGView.moc.cpp \
+		components/epg/EPGWidget.moc.cpp \
+		components/playlist/views.moc.cpp \
+		components/playlist/vlc_model.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 \
 		util/input_slider.moc.cpp \
+		util/timetooltip.moc.cpp \
 		util/customwidgets.moc.cpp \
+		util/searchlineedit.moc.cpp \
+		util/qmenuview.moc.cpp \
 		util/qvlcapp.moc.cpp \
+		util/pictureflow.moc.cpp \
+		util/buttons/RoundButton.moc.cpp \
+		util/buttons/DeckButtonsLayout.moc.cpp \
+		util/buttons/BrowseButton.moc.cpp \
 		resources.cpp \
 		ui/equalizer.h \
-		ui/v4l2.h \
 		ui/video_effects.h \
 		ui/open_file.h \
 		ui/open_disk.h \
@@ -77,6 +94,12 @@ nodist_SOURCES_qt4 = \
 		ui/sprefs_subtitles.h \
 		ui/sprefs_video.h \
 		ui/streampanel.h \
+		ui/messages_panel.h \
+		ui/about.h \
+		ui/update.h \
+		styles/seekstyle.moc.cpp \
+		dialogs/ml_configuration.moc.cpp \
+		components/playlist/ml_model.moc.cpp \
 		ui/sout.h
 
 DEPS_res = \
@@ -84,6 +107,7 @@ DEPS_res = \
 	pixmaps/clear.png \
 	pixmaps/eject.png \
 	pixmaps/faster.png \
+	pixmaps/faster2.png \
 	pixmaps/go-next.png \
 	pixmaps/menus/help_16px.png \
 	pixmaps/menus/info_16px.png \
@@ -95,6 +119,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 \
@@ -109,6 +134,27 @@ DEPS_res = \
 	pixmaps/playlist/repeat_one.png \
 	pixmaps/playlist/shuffle_off.png \
 	pixmaps/playlist/shuffle_on.png \
+	pixmaps/playlist/dropzone.png \
+	pixmaps/playlist/sidebar-icons/capture.png \
+	pixmaps/playlist/sidebar-icons/pictures.png \
+	pixmaps/playlist/sidebar-icons/disc.png \
+	pixmaps/playlist/sidebar-icons/playlist.png \
+	pixmaps/playlist/sidebar-icons/lan.png \
+	pixmaps/playlist/sidebar-icons/podcast.png \
+	pixmaps/playlist/sidebar-icons/library.png \
+	pixmaps/playlist/sidebar-icons/screen.png \
+	pixmaps/playlist/sidebar-icons/movie.png \
+	pixmaps/playlist/sidebar-icons/mtp.png \
+	pixmaps/playlist/sidebar-icons/music.png \
+	pixmaps/playlist/sidebar-icons/network.png \
+	pixmaps/playlist/sidebar-icons/sd/appletrailers.png \
+	pixmaps/playlist/sidebar-icons/sd/icecast.png \
+	pixmaps/playlist/sidebar-icons/sd/metachannels.png \
+	pixmaps/playlist/sidebar-icons/sd/katsomo.png \
+	pixmaps/playlist/sidebar-icons/sd/fmc.png \
+	pixmaps/playlist/sidebar-icons/sd/frenchtv.png \
+	pixmaps/playlist/sidebar-icons/sd/jamendo.png \
+	pixmaps/playlist/sidebar-icons/sd/assembleenationale.png \
 	pixmaps/prefs/advprefs_audio.png \
 	pixmaps/prefs/advprefs_codec.png \
 	pixmaps/prefs/advprefs_extended.png \
@@ -125,11 +171,11 @@ 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/slower2.png \
 	pixmaps/space.png \
 	pixmaps/stop.png \
 	pixmaps/stop_16px.png \
@@ -175,24 +221,56 @@ DEPS_res = \
 	pixmaps/types/type_node.png \
 	pixmaps/types/type_playlist.png \
 	pixmaps/types/type_unknown.xpm \
+	pixmaps/util/wait0.png \
+	pixmaps/util/wait1.png \
+	pixmaps/util/wait2.png \
+	pixmaps/util/wait3.png \
+	pixmaps/util/wait4.png \
+	pixmaps/win7/win7thumbnail_pause.png \
+	pixmaps/win7/win7thumbnail_prev.png \
+	pixmaps/win7/win7thumbnail_next.png \
+	pixmaps/win7/win7thumbnail_play.png \
 	pixmaps/update.png \
+	pixmaps/valid.png \
+	pixmaps/search_clear.png \
 	pixmaps/lock.png
 
 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 = $(moc_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 $@ $<
+if HAVE_DARWIN
+	$(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+else
+if HAVE_WIN32
+	$(moc_verbose)$(MOC) -DWIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+else
+	$(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
+endif
+endif
+
+# These MOC files depend on the configure settings:
+dialogs_provider.moc.cpp dialogs/vlm.moc.cpp: $(top_builddir)/config.h
 
 .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 \
@@ -200,12 +278,16 @@ SOURCES_qt4 = 	qt4.cpp \
 		dialogs_provider.cpp \
 		input_manager.cpp \
 		actions_manager.cpp \
+		extensions_manager.cpp \
 		recents.cpp \
+		adapters/seekpoints.cpp \
 		variables.cpp \
 		dialogs/playlist.cpp \
 		dialogs/bookmarks.cpp \
 		dialogs/preferences.cpp \
 		dialogs/mediainfo.cpp \
+		dialogs/ml_configuration.cpp \
+		dialogs/epg.cpp \
 		dialogs/extended.cpp \
 		dialogs/messages.cpp \
 		dialogs/errors.cpp \
@@ -219,9 +301,12 @@ 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/info_widgets.cpp \
 		components/preferences_widgets.cpp \
 		components/complete_preferences.cpp \
 		components/simple_preferences.cpp \
@@ -229,6 +314,15 @@ SOURCES_qt4 = 	qt4.cpp \
 		components/interface_widgets.cpp \
 		components/controller.cpp \
 		components/controller_widget.cpp \
+		components/epg/EPGChannels.cpp \
+		components/epg/EPGItem.cpp \
+		components/epg/EPGRuler.cpp \
+		components/epg/EPGView.cpp \
+		components/epg/EPGWidget.cpp \
+		components/playlist/views.cpp \
+		components/playlist/ml_item.cpp \
+		components/playlist/ml_model.cpp \
+		components/playlist/vlc_model.cpp \
 		components/playlist/playlist_model.cpp \
 		components/playlist/playlist_item.cpp \
 		components/playlist/standardpanel.cpp \
@@ -237,8 +331,21 @@ SOURCES_qt4 = 	qt4.cpp \
 		components/sout/profile_selector.cpp \
 		components/sout/sout_widgets.cpp \
 		util/input_slider.cpp \
+ 		util/timetooltip.cpp \
 		util/customwidgets.cpp \
-		util/registry.cpp
+		util/searchlineedit.cpp \
+		util/registry.cpp \
+		util/qmenuview.cpp \
+		util/qt_dirs.cpp \
+		util/pictureflow.cpp \
+		util/buttons/BrowseButton.cpp \
+		util/buttons/DeckButtonsLayout.cpp \
+		util/buttons/RoundButton.cpp \
+		styles/seekstyle.cpp
+
+if HAVE_WIN32
+SOURCES_qt4 += main_interface_win32.cpp
+endif
 
 noinst_HEADERS = \
 	qt4.hpp \
@@ -247,13 +354,17 @@ noinst_HEADERS = \
 	dialogs_provider.hpp \
 	input_manager.hpp \
 	actions_manager.hpp \
+	extensions_manager.hpp \
 	recents.hpp \
+	adapters/seekpoints.hpp \
 	variables.hpp \
 	dialogs/playlist.hpp \
 	dialogs/bookmarks.hpp \
 	dialogs/mediainfo.hpp \
+	dialogs/ml_configuration.hpp \
 	dialogs/extended.hpp \
 	dialogs/messages.hpp \
+	dialogs/epg.hpp \
 	dialogs/errors.hpp \
 	dialogs/external.hpp \
 	dialogs/plugins.hpp \
@@ -266,9 +377,12 @@ 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/info_widgets.hpp \
 	components/preferences_widgets.hpp \
 	components/complete_preferences.hpp \
 	components/simple_preferences.hpp \
@@ -276,9 +390,18 @@ noinst_HEADERS = \
 	components/interface_widgets.hpp \
 	components/controller.hpp \
 	components/controller_widget.hpp \
+	components/epg/EPGChannels.hpp \
+	components/epg/EPGItem.hpp \
+	components/epg/EPGRuler.hpp \
+	components/epg/EPGView.hpp \
+	components/epg/EPGWidget.hpp \
+	components/playlist/views.hpp \
+	components/playlist/ml_item.hpp \
+	components/playlist/ml_model.hpp \
+	components/playlist/vlc_model.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 \
@@ -286,16 +409,25 @@ noinst_HEADERS = \
 	components/sout/sout_widgets.hpp \
 	components/sout/profiles.hpp \
 	util/input_slider.hpp \
+	util/timetooltip.hpp \
 	util/customwidgets.hpp \
+	util/searchlineedit.hpp \
 	util/qvlcframe.hpp \
 	util/qvlcapp.hpp \
+	util/qmenuview.hpp \
 	util/qt_dirs.hpp \
-	util/registry.hpp
+	util/registry.hpp \
+	util/pictureflow.hpp \
+	util/singleton.hpp \
+	util/buttons/RoundButton.hpp \
+	util/buttons/DeckButtonsLayout.hpp \
+	util/buttons/BrowseButton.hpp \
+	styles/seekstyle.hpp
+
 
 EXTRA_DIST += \
 	vlc.qrc \
 	ui/equalizer.ui \
-	ui/v4l2.ui \
 	ui/video_effects.ui \
 	ui/open_file.ui \
 	ui/open_disk.ui \
@@ -310,7 +442,9 @@ EXTRA_DIST += \
 	ui/sprefs_subtitles.ui \
 	ui/sprefs_video.ui \
 	ui/streampanel.ui \
+	ui/messages_panel.ui \
+	ui/about.ui \
+	ui/update.ui \
 	ui/sout.ui \
 	ui/vlm.ui \
 	$(DEPS_res)
-