X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=1ac1454da423a7a3ba8415dcb8c4a9bb47a249df;hb=b7f39e459e4c6b0af86548c6017cde538af10c51;hp=a0c87de8e212005aec09612b801c35b8c74ddd11;hpb=9f3d094cb03be94f45f4c7d83aeff8aa7e03b4c7;p=vlc

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index a0c87de8e2..1ac1454da4 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -1,73 +1,24 @@
-# vim:syntax=make
+# vim:syntax=automake
 ## Howto
 # For each Q_OBJECT:
-#   - Add it without extension to TOMOC
-#   - Add the moc.cpp to BUILT_SOURCES and nodist_SOURCES_qt4
-#   - Add the cpp to SOURCES_qt4
-#   - Add the hpp to EXTRA_DIST
+#   - Add the .moc.cpp to BUILT_SOURCES and nodist_SOURCES_qt4
+#   - Add the .cpp to SOURCES_qt4
+#   - Add the .hpp to EXTRA_DIST
 # For each UI
-#   - Add it without extension to TOUI
 #   - Add it to EXTRA_DIST
+#   - Add the .h to nodist_SOURCES_qt4
 
 AUTOMAKE_OPTIONS = subdir-objects
-
-TOUI = 	\
-	ui/equalizer \
-	ui/video_effects \
-	ui/open_file \
-	ui/open_disk \
-	ui/open_net \
-	ui/open_capture \
-	ui/open \
-	ui/main_interface \
-	ui/sprefs_audio \
-	ui/sprefs_input \
-	ui/sprefs_interface \
-	ui/sprefs_subtitles \
-	ui/sprefs_video \
-	ui/sprefs_hotkeys \
-	ui/streampanel \
-	ui/sout
-
-
-UIH = $(TOUI:%=%.h)
-
-TOMOC = main_interface \
-	menus \
-	dialogs_provider \
-	input_manager \
-	playlist_model \
-	dialogs/playlist \
-	dialogs/preferences \
-	dialogs/messages \
-	dialogs/errors \
-	dialogs/mediainfo \
-	dialogs/extended \
-	dialogs/interaction \
-	dialogs/sout \
-	dialogs/help \
-	dialogs/gototime \
-	dialogs/open \
-	components/extended_panels \
-	components/infopanels \
-	components/preferences_widgets \
-	components/complete_preferences \
-	components/simple_preferences \
-	components/open \
-	components/interface_widgets \
-	components/playlist/panels \
-	components/playlist/selector \
-	util/input_slider \
-	util/customwidgets
-MOCCPP = $(TOMOC:%=%.moc.cpp)
+MOSTLYCLEANFILES = $(UIH)
+SUFFIXES += .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
 		main_interface.moc.cpp \
 		menus.moc.cpp \
 		dialogs_provider.moc.cpp \
 		input_manager.moc.cpp \
-		playlist_model.moc.cpp \
 		dialogs/playlist.moc.cpp \
+		dialogs/bookmarks.moc.cpp \
 		dialogs/mediainfo.moc.cpp \
 		dialogs/extended.moc.cpp \
 		dialogs/messages.moc.cpp \
@@ -78,46 +29,64 @@ 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 \
-	 	components/complete_preferences.moc.cpp \
+		components/info_panels.moc.cpp \
+		components/preferences_widgets.moc.cpp \
+		components/complete_preferences.moc.cpp \
 		components/simple_preferences.moc.cpp \
-		components/open.moc.cpp \
+		components/open_panels.moc.cpp \
 		components/interface_widgets.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/selector.moc.cpp \
 		util/input_slider.moc.cpp \
 		util/customwidgets.moc.cpp \
-		resources.cpp
+		resources.cpp \
+		ui/equalizer.h \
+		ui/v4l2.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 \
+		ui/sprefs_subtitles.h \
+		ui/sprefs_video.h \
+		ui/streampanel.h \
+		ui/sout.h
 
-if ENABLE_QT4
-BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4)
-endif
+BUILT_SOURCES += $(nodist_SOURCES_qt4)
 
-resources.cpp: res.qrc
+resources.cpp: vlc.qrc
 	$(RCC) -name vlc -o $@ $<
 
-$(MOCCPP): %.moc.cpp: %.hpp
-	@echo "$(MOC) $< -> $@"
-	$(MOC) -o $@ $<
+.hpp.moc.cpp:
+	$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
-$(UIH): %.h: %.ui
+.ui.h:
 	mkdir -p -- ui
-	@echo "$(UIC) $< -> $@"
-	rm -f $@
-	echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.uih-tmp
-	$(UIC) -tr "Q_" $< >> $@.uih-tmp
-	sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.uih-tmp
-	mv $@.uih-tmp $@
+	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
 
 SOURCES_qt4 = 	qt4.cpp \
 		menus.cpp \
 		main_interface.cpp \
 		dialogs_provider.cpp \
 		input_manager.cpp \
-		playlist_model.cpp \
 		dialogs/playlist.cpp \
+		dialogs/bookmarks.cpp \
 		dialogs/preferences.cpp \
 		dialogs/mediainfo.cpp \
 		dialogs/extended.cpp \
@@ -128,28 +97,32 @@ 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/info_panels.cpp \
 		components/preferences_widgets.cpp \
 		components/complete_preferences.cpp \
 		components/simple_preferences.cpp \
-		components/open.cpp \
+		components/open_panels.cpp \
 		components/interface_widgets.cpp \
+		components/playlist/playlist_model.cpp \
+		components/playlist/playlist_item.cpp \
 		components/playlist/standardpanel.cpp \
+		components/playlist/playlist.cpp \
 		components/playlist/selector.cpp \
 		util/input_slider.cpp \
 		util/customwidgets.cpp \
-		$(NULL)
+		util/registry.cpp
 
-EXTRA_DIST += \
+noinst_HEADERS = \
 	qt4.hpp \
 	menus.hpp \
 	main_interface.hpp \
 	dialogs_provider.hpp \
 	input_manager.hpp \
-	playlist_model.hpp \
-	res.qrc \
 	dialogs/playlist.hpp \
+	dialogs/bookmarks.hpp \
 	dialogs/mediainfo.hpp \
 	dialogs/extended.hpp \
 	dialogs/messages.hpp \
@@ -160,61 +133,122 @@ EXTRA_DIST += \
 	dialogs/help.hpp \
 	dialogs/gototime.hpp \
 	dialogs/open.hpp \
+	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.hpp \
+	components/open_panels.hpp \
 	components/interface_widgets.hpp \
+	components/playlist/playlist_model.hpp \
+	components/playlist/playlist_item.hpp \
 	components/playlist/panels.hpp \
+	components/playlist/playlist.hpp \
 	components/playlist/selector.hpp \
+	components/playlist/sorting.h \
 	util/input_slider.hpp \
-	util/directslider.hpp \
 	util/customwidgets.hpp \
 	util/qvlcframe.hpp \
+	util/registry.hpp
+
+EXTRA_DIST += \
+	vlc.qrc \
 	ui/equalizer.ui \
+	ui/v4l2.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/main_interface.ui \
+	ui/podcast_configuration.ui \
 	ui/sprefs_audio.ui \
 	ui/sprefs_input.ui \
 	ui/sprefs_interface.ui \
-	ui/sprefs_hotkeys.ui \
 	ui/sprefs_subtitles.ui \
 	ui/sprefs_video.ui \
 	ui/streampanel.ui \
 	ui/sout.ui \
-	pixmaps/advanced.xpm \
-	pixmaps/audio.xpm \
-	pixmaps/codec.xpm \
-	pixmaps/intf.xpm \
-	pixmaps/type_net.xpm \
-	pixmaps/type_playlist.xpm \
-	pixmaps/video.xpm \
-	pixmaps/hotkeys_50x50.xpm \
-	pixmaps/audio_50x50.xpm \
-	pixmaps/input_and_codecs_50x50.xpm \
-	pixmaps/interface_50x50.xpm \
-	pixmaps/playlist_50x50.xpm \
-	pixmaps/subtitles_50x50.xpm \
-	pixmaps/video_50x50.xpm \
+	ui/vlm.ui \
+	pixmaps/prefs/advprefs_audio.png \
+	pixmaps/prefs/advprefs_codec.png \
+	pixmaps/prefs/advprefs_extended.png \
+	pixmaps/prefs/advprefs_intf.png \
+	pixmaps/prefs/advprefs_playlist.png \
+	pixmaps/prefs/advprefs_sout.png \
+	pixmaps/prefs/advprefs_video.png \
+	pixmaps/prefs/spref_cone_Audio_64.png \
+	pixmaps/prefs/spref_cone_Hotkeys_64.png \
+	pixmaps/prefs/spref_cone_Input_64.png \
+	pixmaps/prefs/spref_cone_Interface_64.png \
+	pixmaps/prefs/spref_cone_Subtitles_64.png \
+	pixmaps/prefs/spref_cone_Video_64.png \
+	pixmaps/types/capture-card_16px.png \
+	pixmaps/types/cdda_16px.png \
+	pixmaps/types/disc_16px.png \
+	pixmaps/types/file-asym_16px.png \
+	pixmaps/types/file-wide_16px.png \
+	pixmaps/types/folder-blue_16px.png \
+	pixmaps/types/folder-grey_16px.png \
+	pixmaps/types/harddisk_16px.png \
+	pixmaps/types/network_16px.png \
+	pixmaps/menus/help_16px.png \
+	pixmaps/menus/info_16px.png \
+	pixmaps/menus/messages_16px.png \
+	pixmaps/menus/preferences_16px.png \
+	pixmaps/menus/quit_16px.png \
+	pixmaps/menus/settings_16px.png \
+	pixmaps/menus/stream_16px.png \
+	pixmaps/menus/playlist_16px.png \
 	pixmaps/go-next.png \
+	pixmaps/next_16px.png \
 	pixmaps/next.png \
 	pixmaps/noart.png \
-	pixmaps/playlist_icon.png \
+	pixmaps/pause_16px.png \
+	pixmaps/pause.png \
+	pixmaps/play_16px.png \
+	pixmaps/playlist/add.png \
+	pixmaps/playlist/playlist.png \
+	pixmaps/playlist/repeat_all.png \
+	pixmaps/playlist/repeat_off.png \
+	pixmaps/playlist/repeat_one.png \
+	pixmaps/playlist/shuffle_off.png \
+	pixmaps/playlist/shuffle_on.png \
 	pixmaps/play.png \
+	pixmaps/previous_16px.png \
 	pixmaps/previous.png \
-	pixmaps/spref_cone_Audio_64.png \
-	pixmaps/spref_cone_Hotkeys_64.png \
-	pixmaps/spref_cone_Input_64.png \
-	pixmaps/spref_cone_Interface_64.png \
-	pixmaps/spref_cone_Subtitles_64.png \
-	pixmaps/spref_cone_Video_64.png \
+	pixmaps/stop_16px.png \
 	pixmaps/stop.png \
-	pixmaps/volume-high.png \
-	pixmaps/volume-low.png
+	pixmaps/eject.png \
+	pixmaps/update.png \
+	pixmaps/clear.png \
+	pixmaps/arrow_down_dark.png \
+	pixmaps/types/tape_16px.png \
+	pixmaps/types/type_directory.png \
+	pixmaps/types/type_file.png \
+	pixmaps/types/type_net.png \
+	pixmaps/types/type_node.png \
+	pixmaps/types/type_playlist.png \
+	pixmaps/types/type_unknown.xpm \
+	pixmaps/toolbar/extended_16px.png \
+	pixmaps/toolbar/record_16px.png \
+	pixmaps/toolbar/snapshot.png \
+	pixmaps/toolbar/atob.png \
+	pixmaps/toolbar/atob-noa.png \
+	pixmaps/toolbar/atob-nob.png \
+	pixmaps/toolbar/dvd_menu.png \
+	pixmaps/toolbar/dvd_next.png \
+	pixmaps/toolbar/dvd_prev.png \
+	pixmaps/toolbar/tv.png \
+	pixmaps/toolbar/fullscreen.png \
+	pixmaps/toolbar/tvtelx.png \
+	pixmaps/toolbar/tvtelx-transparent.png \
+	pixmaps/toolbar/volume-high.png \
+	pixmaps/toolbar/volume-medium.png \
+	pixmaps/toolbar/volume-low.png \
+	pixmaps/toolbar/volume-muted.png \
+	pixmaps/toolbar/volume-slider.svg \
+	pixmaps/toolbar/volume-slider-inside.png \
+	pixmaps/toolbar/volume-slider-outside.png