Qt: first attempt at a QMenuView

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 5ad68ceede247ee2bf283007676465107e76fdb8..22c22772344bbd5ceb15b2341f9537fb1bf316f3 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -22,6 +22,7 @@ nodist_SOURCES_qt4 = \
                actions_manager.moc.cpp \
                extensions_manager.moc.cpp \
                recents.moc.cpp \
+               adapters/seekpoints.moc.cpp \
                variables.moc.cpp \
                dialogs/playlist.moc.cpp \
                dialogs/bookmarks.moc.cpp \
@@ -69,6 +70,7 @@ nodist_SOURCES_qt4 = \
                util/timetooltip.moc.cpp \
                util/customwidgets.moc.cpp \
                util/searchlineedit.moc.cpp \
+               util/qmenuview.moc.cpp \
                util/qvlcapp.moc.cpp \
                util/pictureflow.moc.cpp \
                util/buttons/RoundButton.moc.cpp \
@@ -103,6 +105,7 @@ DEPS_res = \
        pixmaps/clear.png \
        pixmaps/eject.png \
        pixmaps/faster.png \
+       pixmaps/faster2.png \
        pixmaps/go-next.png \
        pixmaps/menus/help_16px.png \
        pixmaps/menus/info_16px.png \
@@ -149,6 +152,7 @@ DEPS_res = \
        pixmaps/sample_minimal.png \
        pixmaps/sample_skins.png \
        pixmaps/slower.png \
+       pixmaps/slower2.png \
        pixmaps/space.png \
        pixmaps/stop.png \
        pixmaps/stop_16px.png \
@@ -204,6 +208,7 @@ DEPS_res = \
        pixmaps/win7/win7thumbnail_next.png \
        pixmaps/win7/win7thumbnail_play.png \
        pixmaps/update.png \
+       pixmaps/search_clear.png \
        pixmaps/lock.png
 
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
@@ -223,12 +228,12 @@ resources.cpp: vlc.qrc $(DEPS_res)
 
 .hpp.moc.cpp:
 if HAVE_DARWIN
-       $(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) -DQ_WS_MAC $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
 else
 if HAVE_WIN32
-       $(moc_verbose)$(MOC) -DWIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) -DWIN32 $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
 else
-       $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CPPFLAGS_qt4) -o $@ $<
 endif
 endif
 
@@ -241,17 +246,17 @@ endif
        $(AM_V_at)rm -f $@.tmp
 
 .mm.lo: 
-       $(top_builddir)/libtool --verbose --mode=compile $(CXX) $(objcxxflags) -DQ_WS_MAC -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cxxflags plugin qt4` -c $< -o $@ 
+       $(top_builddir)/libtool --verbose --mode=compile $(CXX) $(objcxxflags) -DQ_WS_MAC -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CXXFLAGS_qt4) -c $< -o $@ 
 
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
                main_interface.cpp \
-               main_interface_win32.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
                actions_manager.cpp \
                extensions_manager.cpp \
                recents.cpp \
+               adapters/seekpoints.cpp \
                variables.cpp \
                dialogs/playlist.cpp \
                dialogs/bookmarks.cpp \
@@ -305,6 +310,7 @@ SOURCES_qt4 =       qt4.cpp \
                util/customwidgets.cpp \
                util/searchlineedit.cpp \
                util/registry.cpp \
+               util/qmenuview.cpp \
                util/qt_dirs.cpp \
                util/pictureflow.cpp \
                util/buttons/BrowseButton.cpp \
@@ -315,6 +321,10 @@ if HAVE_DARWIN
 SOURCES_qt4 +=  util/searchlineedit_mac.mm
 endif
 
+if HAVE_WIN32
+SOURCES_qt4 += main_interface_win32.cpp
+endif
+
 noinst_HEADERS = \
        qt4.hpp \
        menus.hpp \
@@ -324,6 +334,7 @@ noinst_HEADERS = \
        actions_manager.hpp \
        extensions_manager.hpp \
        recents.hpp \
+       adapters/seekpoints.hpp \
        variables.hpp \
        dialogs/playlist.hpp \
        dialogs/bookmarks.hpp \
@@ -380,6 +391,7 @@ noinst_HEADERS = \
        util/searchlineedit.hpp \
        util/qvlcframe.hpp \
        util/qvlcapp.hpp \
+       util/qmenuview.hpp \
        util/qt_dirs.hpp \
        util/registry.hpp \
        util/pictureflow.hpp \