X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=68fb4b135ae86cb0215b83537c57f565459d239d;hb=1c6b27d3715a074504fdb46617fd0876b870019e;hp=ad563a23b6c9a7a9d1def68006b1c7d7a8387366;hpb=e9216a8302a41658c27e8b4c26e98d3cf7e10ba2;p=vlc diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index ad563a23b6..68fb4b135a 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -17,92 +17,209 @@ 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 \ 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/plugins.moc.cpp \ dialogs/preferences.moc.cpp \ dialogs/interaction.moc.cpp \ dialogs/sout.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 \ 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 \ 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/sprefs_hotkeys.h \ ui/streampanel.h \ ui/sout.h -if ENABLE_QT4 +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/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/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/record_16px.png \ + pixmaps/toolbar/snapshot.png \ + pixmaps/toolbar/skip_for.png \ + pixmaps/toolbar/skip_back.png \ + pixmaps/toolbar/tv.png \ + pixmaps/toolbar/tvtelx-transparent.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 + BUILT_SOURCES += $(nodist_SOURCES_qt4) -endif -resources.cpp: res.qrc +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 rm -f $@ $@.tmp echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp $(UIC) -tr "Q_" $< >> $@.tmp - sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp - mv -f $@.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 \ + actions_manager.cpp \ + recents.cpp \ dialogs/playlist.cpp \ + dialogs/bookmarks.cpp \ dialogs/preferences.cpp \ dialogs/mediainfo.cpp \ dialogs/extended.cpp \ dialogs/messages.cpp \ dialogs/errors.cpp \ + dialogs/plugins.cpp \ dialogs/interaction.cpp \ dialogs/sout.cpp \ dialogs/help.cpp \ dialogs/gototime.cpp \ + dialogs/toolbar.cpp \ dialogs/open.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 \ util/input_slider.cpp \ - util/customwidgets.cpp + util/customwidgets.cpp \ + util/registry.cpp noinst_HEADERS = \ qt4.hpp \ @@ -110,97 +227,65 @@ noinst_HEADERS = \ main_interface.hpp \ dialogs_provider.hpp \ input_manager.hpp \ - playlist_model.hpp \ + actions_manager.hpp \ + recents.hpp \ dialogs/playlist.hpp \ + dialogs/bookmarks.hpp \ dialogs/mediainfo.hpp \ dialogs/extended.hpp \ dialogs/messages.hpp \ dialogs/errors.hpp \ + dialogs/plugins.hpp \ dialogs/preferences.hpp \ dialogs/interaction.hpp \ dialogs/sout.hpp \ dialogs/help.hpp \ dialogs/gototime.hpp \ + dialogs/toolbar.hpp \ dialogs/open.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 \ 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/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/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/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/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/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 + ui/vlm.ui \ + $(DEPS_res) +