X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=1d416fbd40873bb33be58d7da12f54105c243e9f;hb=d2d62531e689b20176d57fd122db06d4656a4180;hp=d3a5c7ae23d17ec9aaa8b38352101a2b3916ea89;hpb=349cbdc6208ec2f9615a69c5f068e720f60bd186;p=vlc diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index d3a5c7ae23..1d416fbd40 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -7,10 +7,11 @@ # For each UI # - Add it to EXTRA_DIST # - Add the .h to nodist_SOURCES_qt4 +# For each ressource (icon, png, ...) +# - Add it to DEPS_res AUTOMAKE_OPTIONS = subdir-objects MOSTLYCLEANFILES = $(UIH) -CLEANFILES += dialogs/about.hpp SUFFIXES += .ui .h .hpp .moc.cpp nodist_SOURCES_qt4 = \ @@ -18,34 +19,49 @@ nodist_SOURCES_qt4 = \ menus.moc.cpp \ dialogs_provider.moc.cpp \ input_manager.moc.cpp \ - playlist_model.moc.cpp \ + actions_manager.moc.cpp \ + recents.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/errors.moc.cpp \ + dialogs/external.moc.cpp \ + dialogs/plugins.moc.cpp \ dialogs/preferences.moc.cpp \ - dialogs/interaction.moc.cpp \ dialogs/sout.moc.cpp \ + dialogs/convert.moc.cpp \ dialogs/help.moc.cpp \ dialogs/gototime.moc.cpp \ + dialogs/toolbar.moc.cpp \ dialogs/open.moc.cpp \ + dialogs/openurl.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/controller.moc.cpp \ + components/controller_widget.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 \ + components/sout/profile_selector.moc.cpp \ + components/sout/sout_widgets.moc.cpp \ util/input_slider.moc.cpp \ util/customwidgets.moc.cpp \ + util/qvlcapp.moc.cpp \ resources.cpp \ ui/equalizer.h \ - ui/spatializer.h \ + ui/v4l2.h \ ui/video_effects.h \ ui/open_file.h \ ui/open_disk.h \ @@ -54,24 +70,121 @@ nodist_SOURCES_qt4 = \ ui/open.h \ ui/vlm.h \ ui/podcast_configuration.h \ + ui/profiles.h \ ui/sprefs_audio.h \ ui/sprefs_input.h \ ui/sprefs_interface.h \ ui/sprefs_subtitles.h \ ui/sprefs_video.h \ - ui/sprefs_hotkeys.h \ ui/streampanel.h \ ui/sout.h -if ENABLE_QT4 -BUILT_SOURCES += $(nodist_SOURCES_qt4) dialogs/about.hpp -endif +DEPS_res = \ + pixmaps/arrow_down_dark.png \ + pixmaps/clear.png \ + pixmaps/eject.png \ + pixmaps/faster.png \ + pixmaps/go-next.png \ + pixmaps/menus/help_16px.png \ + pixmaps/menus/info_16px.png \ + pixmaps/menus/messages_16px.png \ + pixmaps/menus/playlist_16px.png \ + pixmaps/menus/preferences_16px.png \ + pixmaps/menus/quit_16px.png \ + pixmaps/menus/settings_16px.png \ + pixmaps/menus/stream_16px.png \ + pixmaps/next.png \ + pixmaps/next_16px.png \ + pixmaps/noart.png \ + pixmaps/pause.png \ + pixmaps/pause_16px.png \ + pixmaps/play.png \ + pixmaps/play_16px.png \ + 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 \ + pixmaps/playlist/shuffle_off.png \ + pixmaps/playlist/shuffle_on.png \ + 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/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 \ + pixmaps/stop_16px.png \ + pixmaps/toolbar/arrows.png \ + pixmaps/toolbar/aspect-ratio.png \ + pixmaps/toolbar/atob.png \ + pixmaps/toolbar/atob_noa.png \ + pixmaps/toolbar/atob_nob.png \ + pixmaps/toolbar/defullscreen.png \ + pixmaps/toolbar/dvd_menu.png \ + pixmaps/toolbar/dvd_next.png \ + pixmaps/toolbar/dvd_prev.png \ + pixmaps/toolbar/extended_16px.png \ + pixmaps/toolbar/frame-by-frame.png \ + pixmaps/toolbar/fullscreen.png \ + pixmaps/toolbar/play_reverse.png \ + pixmaps/toolbar/record_16px.png \ + pixmaps/toolbar/snapshot.png \ + pixmaps/toolbar/skip_for.png \ + pixmaps/toolbar/skip_back.png \ + pixmaps/toolbar/tv.png \ + pixmaps/toolbar/tvtelx.png \ + pixmaps/toolbar/visu.png \ + pixmaps/toolbar/volume-high.png \ + pixmaps/toolbar/volume-low.png \ + pixmaps/toolbar/volume-medium.png \ + pixmaps/toolbar/volume-muted.png \ + pixmaps/toolbar/volume-slider-inside.png \ + pixmaps/toolbar/volume-slider-outside.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/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/update.png \ + pixmaps/lock.png -resources.cpp: res.qrc +BUILT_SOURCES += $(nodist_SOURCES_qt4) + +resources.cpp: vlc.qrc $(DEPS_res) $(RCC) -name vlc -o $@ $< .hpp.moc.cpp: - $(MOC) -o $@ $< + $(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $< .ui.h: mkdir -p -- ui @@ -81,52 +194,51 @@ resources.cpp: res.qrc 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 \ main_interface.cpp \ dialogs_provider.cpp \ input_manager.cpp \ - playlist_model.cpp \ + actions_manager.cpp \ + recents.cpp \ + variables.cpp \ dialogs/playlist.cpp \ + dialogs/bookmarks.cpp \ dialogs/preferences.cpp \ dialogs/mediainfo.cpp \ dialogs/extended.cpp \ dialogs/messages.cpp \ dialogs/errors.cpp \ - dialogs/interaction.cpp \ + dialogs/external.cpp \ + dialogs/plugins.cpp \ dialogs/sout.cpp \ + dialogs/convert.cpp \ dialogs/help.cpp \ dialogs/gototime.cpp \ + dialogs/toolbar.cpp \ dialogs/open.cpp \ - dialogs/vlm.cpp \ + dialogs/openurl.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/controller.cpp \ + components/controller_widget.cpp \ + components/playlist/playlist_model.cpp \ + components/playlist/playlist_item.cpp \ components/playlist/standardpanel.cpp \ + components/playlist/playlist.cpp \ components/playlist/selector.cpp \ + components/sout/profile_selector.cpp \ + components/sout/sout_widgets.cpp \ util/input_slider.cpp \ - util/customwidgets.cpp + util/customwidgets.cpp \ + util/registry.cpp noinst_HEADERS = \ qt4.hpp \ @@ -134,39 +246,56 @@ noinst_HEADERS = \ main_interface.hpp \ dialogs_provider.hpp \ input_manager.hpp \ - playlist_model.hpp \ + actions_manager.hpp \ + recents.hpp \ + variables.hpp \ dialogs/playlist.hpp \ + dialogs/bookmarks.hpp \ dialogs/mediainfo.hpp \ dialogs/extended.hpp \ dialogs/messages.hpp \ dialogs/errors.hpp \ + dialogs/external.hpp \ + dialogs/plugins.hpp \ dialogs/preferences.hpp \ - dialogs/interaction.hpp \ dialogs/sout.hpp \ - dialogs/about.hpp \ + dialogs/convert.hpp \ dialogs/help.hpp \ dialogs/gototime.hpp \ + dialogs/toolbar.hpp \ dialogs/open.hpp \ - dialogs/vlm.hpp \ + dialogs/openurl.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/controller.hpp \ + components/controller_widget.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 \ + components/sout/profile_selector.hpp \ + components/sout/sout_widgets.hpp \ + components/sout/profiles.hpp \ util/input_slider.hpp \ - util/directslider.hpp \ util/customwidgets.hpp \ - util/qvlcframe.hpp + util/qvlcframe.hpp \ + util/qvlcapp.hpp \ + util/qt_dirs.hpp \ + util/registry.hpp EXTRA_DIST += \ - res.qrc \ + vlc.qrc \ ui/equalizer.ui \ - ui/spatializer.ui \ + ui/v4l2.ui \ ui/video_effects.ui \ ui/open_file.ui \ ui/open_disk.ui \ @@ -174,74 +303,14 @@ EXTRA_DIST += \ ui/open_capture.ui \ ui/open.ui \ ui/podcast_configuration.ui \ + ui/profiles.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 \ ui/vlm.ui \ - pixmaps/codec.xpm \ - pixmaps/type_net.xpm \ - pixmaps/type_playlist.xpm \ - pixmaps/type_unknown.xpm \ - pixmaps/type_file.xpm \ - pixmaps/type_card.xpm \ - pixmaps/type_disc.xpm \ - pixmaps/type_cdda.xpm \ - pixmaps/type_directory.xpm \ - pixmaps/type_node.xpm \ - pixmaps/go-next.png \ - pixmaps/next.png \ - 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 \ - 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.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 \ - pixmaps/vlc_pause_16px.png \ - pixmaps/vlc_messages_16px.png \ - pixmaps/vlc_network_16px.png \ - pixmaps/vlc_stream_16px.png \ - pixmaps/vlc_quit_16px.png \ - pixmaps/vlc_disc_16px.png \ - pixmaps/vlc_network_16px.png \ - pixmaps/vlc_capture-card_16px.png \ - pixmaps/vlc_preferences_16px.png \ - pixmaps/vlc_settings_16px.png \ - pixmaps/vlc_playlist_16px.png \ - pixmaps/vlc_folder-grey_16px.png \ - pixmaps/vlc_folder-blue_16px.png \ - pixmaps/vlc_tape_16px.png \ - pixmaps/vlc_file-asym_16px.png \ - pixmaps/vlc_file-wide_16px.png \ - pixmaps/vlc_info_16px.png \ - pixmaps/vlc_previous_16px.png \ - pixmaps/vlc_next_16px.png \ - pixmaps/vlc_record_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 + $(DEPS_res) +