qt4: attempt to work around a design flaw in the toolbar editor

[vlc] / modules / gui / qt4 / Modules.am

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 622a9dbb4802a07b78c01398f3afeec9a0b2b77b..60355813d170af0e7ddbcff828cb421d2cec8ca7 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -12,7 +12,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
-SUFFIXES += .ui .h .hpp .moc.cpp
+SUFFIXES = .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
                main_interface.moc.cpp \
@@ -28,6 +28,7 @@ nodist_SOURCES_qt4 = \
                dialogs/mediainfo.moc.cpp \
                dialogs/extended.moc.cpp \
                dialogs/messages.moc.cpp \
+               dialogs/epg.moc.cpp \
                dialogs/errors.moc.cpp \
                dialogs/external.moc.cpp \
                dialogs/plugins.moc.cpp \
@@ -52,6 +53,10 @@ nodist_SOURCES_qt4 = \
                components/interface_widgets.moc.cpp \
                components/controller.moc.cpp \
                components/controller_widget.moc.cpp \
+               components/epg/EPGChannels.moc.cpp \
+               components/epg/EPGRuler.moc.cpp \
+               components/epg/EPGView.moc.cpp \
+               components/epg/EPGWidget.moc.cpp \
                components/playlist/icon_view.moc.cpp \
                components/playlist/playlist_model.moc.cpp \
                components/playlist/playlist.moc.cpp \
@@ -64,7 +69,6 @@ nodist_SOURCES_qt4 = \
                util/qvlcapp.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
-               ui/v4l2.h \
                ui/video_effects.h \
                ui/open_file.h \
                ui/open_disk.h \
@@ -80,6 +84,9 @@ nodist_SOURCES_qt4 = \
                ui/sprefs_subtitles.h \
                ui/sprefs_video.h \
                ui/streampanel.h \
+               ui/messages_panel.h \
+               ui/about.h \
+               ui/update.h \
                ui/sout.h
 
 DEPS_res = \
@@ -129,7 +136,6 @@ DEPS_res = \
        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 \
@@ -179,6 +185,10 @@ DEPS_res = \
        pixmaps/types/type_node.png \
        pixmaps/types/type_playlist.png \
        pixmaps/types/type_unknown.xpm \
+       pixmaps/win7/win7thumbnail_pause.png \
+       pixmaps/win7/win7thumbnail_prev.png \
+       pixmaps/win7/win7thumbnail_next.png \
+       pixmaps/win7/win7thumbnail_play.png \
        pixmaps/update.png \
        pixmaps/lock.png
 
@@ -187,7 +197,7 @@ 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)
+moc_verbose__0 = $(moc_verbose_0)
 
 uic_verbose = $(uic_verbose_$(V))
 uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
@@ -198,7 +208,7 @@ resources.cpp: vlc.qrc $(DEPS_res)
        $(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(moc_verbose)$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
        $(AM_V_at)mkdir -p -- ui
@@ -211,6 +221,7 @@ resources.cpp: vlc.qrc $(DEPS_res)
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
                main_interface.cpp \
+               main_interface_win32.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
                actions_manager.cpp \
@@ -221,6 +232,7 @@ SOURCES_qt4 =       qt4.cpp \
                dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
                dialogs/mediainfo.cpp \
+               dialogs/epg.cpp \
                dialogs/extended.cpp \
                dialogs/messages.cpp \
                dialogs/errors.cpp \
@@ -246,6 +258,11 @@ SOURCES_qt4 =      qt4.cpp \
                components/interface_widgets.cpp \
                components/controller.cpp \
                components/controller_widget.cpp \
+               components/epg/EPGChannels.cpp \
+               components/epg/EPGItem.cpp \
+               components/epg/EPGRuler.cpp \
+               components/epg/EPGView.cpp \
+               components/epg/EPGWidget.cpp \
                components/playlist/icon_view.cpp \
                components/playlist/playlist_model.cpp \
                components/playlist/playlist_item.cpp \
@@ -273,6 +290,7 @@ noinst_HEADERS = \
        dialogs/mediainfo.hpp \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
+       dialogs/epg.hpp \
        dialogs/errors.hpp \
        dialogs/external.hpp \
        dialogs/plugins.hpp \
@@ -297,6 +315,12 @@ noinst_HEADERS = \
        components/interface_widgets.hpp \
        components/controller.hpp \
        components/controller_widget.hpp \
+       components/epg/EPGChannels.hpp \
+       components/epg/EPGEvent.hpp \
+       components/epg/EPGItem.hpp \
+       components/epg/EPGRuler.hpp \
+       components/epg/EPGView.hpp \
+       components/epg/EPGWidget.hpp \
        components/playlist/icon_view.hpp \
        components/playlist/playlist_model.hpp \
        components/playlist/playlist_item.hpp \
@@ -319,7 +343,6 @@ noinst_HEADERS = \
 EXTRA_DIST += \
        vlc.qrc \
        ui/equalizer.ui \
-       ui/v4l2.ui \
        ui/video_effects.ui \
        ui/open_file.ui \
        ui/open_disk.ui \
@@ -334,6 +357,9 @@ EXTRA_DIST += \
        ui/sprefs_subtitles.ui \
        ui/sprefs_video.ui \
        ui/streampanel.ui \
+       ui/messages_panel.ui \
+       ui/about.ui \
+       ui/update.ui \
        ui/sout.ui \
        ui/vlm.ui \
        $(DEPS_res)