X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=622a9dbb4802a07b78c01398f3afeec9a0b2b77b;hb=ebd971c2ed87ab3d470018c8138046560c3efe8b;hp=a715e40e6b1c680e3fb63df73aa4061d911d7cc7;hpb=39ef9e13a25db2472b360d9e0bd5a4c57cef71b8;p=vlc diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index a715e40e6b..622a9dbb48 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -7,6 +7,8 @@ # 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) @@ -17,20 +19,30 @@ nodist_SOURCES_qt4 = \ menus.moc.cpp \ 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 \ 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 \ + dialogs/firstrun.moc.cpp \ + dialogs/extensions.moc.cpp \ components/extended_panels.moc.cpp \ components/info_panels.moc.cpp \ components/preferences_widgets.moc.cpp \ @@ -39,13 +51,17 @@ nodist_SOURCES_qt4 = \ components/open_panels.moc.cpp \ components/interface_widgets.moc.cpp \ components/controller.moc.cpp \ + components/controller_widget.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 \ util/input_slider.moc.cpp \ util/customwidgets.moc.cpp \ + util/qvlcapp.moc.cpp \ resources.cpp \ ui/equalizer.h \ ui/v4l2.h \ @@ -57,6 +73,7 @@ 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 \ @@ -66,111 +83,140 @@ nodist_SOURCES_qt4 = \ ui/sout.h DEPS_res = \ - 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/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/menus/playlist_16px.png \ - pixmaps/go-next.png \ - pixmaps/next_16px.png \ pixmaps/next.png \ + pixmaps/next_16px.png \ + pixmaps/noart-64.png \ pixmaps/noart.png \ - pixmaps/pause_16px.png \ pixmaps/pause.png \ - pixmaps/faster.png \ - pixmaps/slower.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/playlist/jumpto.png \ - pixmaps/play.png \ - pixmaps/previous_16px.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/stop_16px.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/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/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/tv.png \ + pixmaps/toolbar/extended_16px.png \ + pixmaps/toolbar/frame-by-frame.png \ pixmaps/toolbar/fullscreen.png \ - pixmaps/toolbar/defullscreen.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/tvtelx-transparent.png \ + pixmaps/toolbar/visu.png \ pixmaps/toolbar/volume-high.png \ - pixmaps/toolbar/volume-medium.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/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 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 \ main_interface.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 \ @@ -178,13 +224,19 @@ SOURCES_qt4 = qt4.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/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 \ @@ -193,11 +245,15 @@ SOURCES_qt4 = qt4.cpp \ components/open_panels.cpp \ components/interface_widgets.cpp \ components/controller.cpp \ + components/controller_widget.cpp \ + components/playlist/icon_view.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/registry.cpp @@ -208,20 +264,30 @@ noinst_HEADERS = \ main_interface.hpp \ dialogs_provider.hpp \ input_manager.hpp \ + actions_manager.hpp \ + extensions_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/convert.hpp \ dialogs/help.hpp \ dialogs/gototime.hpp \ + dialogs/toolbar.hpp \ 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 \ @@ -230,16 +296,25 @@ noinst_HEADERS = \ components/open_panels.hpp \ components/interface_widgets.hpp \ components/controller.hpp \ + components/controller_widget.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 \ + components/sout/profile_selector.hpp \ + components/sout/sout_widgets.hpp \ + components/sout/profiles.hpp \ util/input_slider.hpp \ util/customwidgets.hpp \ util/qvlcframe.hpp \ - util/registry.hpp + util/qvlcapp.hpp \ + util/qt_dirs.hpp \ + util/registry.hpp \ + util/singleton.hpp + EXTRA_DIST += \ vlc.qrc \ @@ -252,6 +327,7 @@ 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 \