X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2FModules.am;h=68fb4b135ae86cb0215b83537c57f565459d239d;hb=1c6b27d3715a074504fdb46617fd0876b870019e;hp=b1fd45aee6d33b66aa38929f06212a9de2d1fb3e;hpb=7bc28eebe843ef72304a7ec4bb7e89a12a17187a;p=vlc diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am index b1fd45aee6..68fb4b135a 100644 --- a/modules/gui/qt4/Modules.am +++ b/modules/gui/qt4/Modules.am @@ -17,18 +17,23 @@ nodist_SOURCES_qt4 = \ menus.moc.cpp \ dialogs_provider.moc.cpp \ input_manager.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 \ @@ -38,6 +43,8 @@ nodist_SOURCES_qt4 = \ components/simple_preferences.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 \ @@ -64,11 +71,101 @@ nodist_SOURCES_qt4 = \ 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: vlc.qrc +resources.cpp: vlc.qrc $(DEPS_res) $(RCC) -name vlc -o $@ $< .hpp.moc.cpp: @@ -87,6 +184,8 @@ SOURCES_qt4 = qt4.cpp \ main_interface.cpp \ dialogs_provider.cpp \ input_manager.cpp \ + actions_manager.cpp \ + recents.cpp \ dialogs/playlist.cpp \ dialogs/bookmarks.cpp \ dialogs/preferences.cpp \ @@ -94,11 +193,14 @@ SOURCES_qt4 = qt4.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 \ @@ -108,6 +210,8 @@ SOURCES_qt4 = qt4.cpp \ components/simple_preferences.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 \ @@ -123,18 +227,23 @@ noinst_HEADERS = \ main_interface.hpp \ dialogs_provider.hpp \ input_manager.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 \ @@ -144,6 +253,8 @@ noinst_HEADERS = \ components/simple_preferences.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 \ @@ -153,6 +264,8 @@ noinst_HEADERS = \ util/input_slider.hpp \ util/customwidgets.hpp \ util/qvlcframe.hpp \ + util/qvlcapp.hpp \ + util/qt_dirs.hpp \ util/registry.hpp EXTRA_DIST += \ @@ -174,67 +287,5 @@ EXTRA_DIST += \ ui/streampanel.ui \ ui/sout.ui \ ui/vlm.ui \ - pixmaps/advprefs_audio.png \ - pixmaps/advprefs_codec.png \ - pixmaps/advprefs_extended.png \ - pixmaps/advprefs_intf.png \ - pixmaps/advprefs_playlist.png \ - pixmaps/advprefs_sout.png \ - pixmaps/advprefs_video.png \ - pixmaps/capture-card_16px.png \ - pixmaps/cdda_16px.png \ - pixmaps/disc_16px.png \ - pixmaps/file-asym_16px.png \ - pixmaps/file-wide_16px.png \ - pixmaps/folder-blue_16px.png \ - pixmaps/folder-grey_16px.png \ - pixmaps/go-next.png \ - pixmaps/harddisk_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/network_16px.png \ - pixmaps/next_16px.png \ - pixmaps/next.png \ - pixmaps/noart.png \ - pixmaps/pause_16px.png \ - pixmaps/pause.png \ - pixmaps/play_16px.png \ - pixmaps/playlist_16px.png \ - pixmaps/playlist_add.png \ - pixmaps/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/record_16px.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/tape_16px.png \ - pixmaps/type_directory.png \ - pixmaps/type_file.png \ - pixmaps/type_net.png \ - pixmaps/type_node.png \ - pixmaps/type_playlist.png \ - pixmaps/type_unknown.xpm \ - pixmaps/volume-high.png \ - pixmaps/volume-medium.png \ - pixmaps/volume-low.png \ - pixmaps/volume-muted.png \ - pixmaps/volume-slider.svg \ - pixmaps/volume-slider-inside.png \ - pixmaps/volume-slider-outside.png + $(DEPS_res) +