]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/Modules.am
Qt: Teletext handling simplifications and change of the icons to more clear ones.
[vlc] / modules / gui / qt4 / Modules.am
index 66148d7164d284f272f9d5f26ed40a5ca52e2627..a663ebe8dbb1650b9ae6070b5213a0b9b5a9b643 100644 (file)
@@ -17,33 +17,44 @@ 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/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 \
@@ -57,19 +68,108 @@ nodist_SOURCES_qt4 = \
                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/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
+
 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
@@ -84,31 +184,42 @@ SOURCES_qt4 =      qt4.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 \
@@ -116,37 +227,51 @@ 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 \
@@ -157,68 +282,10 @@ EXTRA_DIST += \
        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/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/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-low.png \
-       pixmaps/volume-muted.png 
+       $(DEPS_res)
+