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 cb7d4e4e20fda4f2960ad698f4d51742c96edac4..22c22772344bbd5ceb15b2341f9537fb1bf316f3 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -22,11 +22,11 @@ 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 \
                dialogs/mediainfo.moc.cpp \
-               dialogs/ml_configuration.moc.cpp \
                dialogs/extended.moc.cpp \
                dialogs/messages.moc.cpp \
                dialogs/epg.moc.cpp \
@@ -60,8 +60,6 @@ nodist_SOURCES_qt4 = \
                components/epg/EPGWidget.moc.cpp \
                components/playlist/views.moc.cpp \
                components/playlist/vlc_model.moc.cpp \
-               components/playlist/ml_item.moc.cpp \
-               components/playlist/ml_model.moc.cpp \
                components/playlist/playlist_model.moc.cpp \
                components/playlist/playlist.moc.cpp \
                components/playlist/standardpanel.moc.cpp \
@@ -69,10 +67,15 @@ nodist_SOURCES_qt4 = \
                components/sout/profile_selector.moc.cpp \
                components/sout/sout_widgets.moc.cpp \
                util/input_slider.moc.cpp \
+               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 \
+               util/buttons/DeckButtonsLayout.moc.cpp \
+               util/buttons/BrowseButton.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
                ui/video_effects.h \
@@ -93,6 +96,8 @@ nodist_SOURCES_qt4 = \
                ui/messages_panel.h \
                ui/about.h \
                ui/update.h \
+               dialogs/ml_configuration.moc.cpp \
+               components/playlist/ml_model.moc.cpp \
                ui/sout.h
 
 DEPS_res = \
@@ -100,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 \
@@ -146,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 \
@@ -191,11 +198,17 @@ DEPS_res = \
        pixmaps/types/type_node.png \
        pixmaps/types/type_playlist.png \
        pixmaps/types/type_unknown.xpm \
+       pixmaps/util/wait0.png \
+       pixmaps/util/wait1.png \
+       pixmaps/util/wait2.png \
+       pixmaps/util/wait3.png \
+       pixmaps/util/wait4.png \
        pixmaps/win7/win7thumbnail_pause.png \
        pixmaps/win7/win7thumbnail_prev.png \
        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)
@@ -215,9 +228,13 @@ 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
-       $(moc_verbose)$(MOC) $(DEFS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+if HAVE_WIN32
+       $(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) $(CPPFLAGS_qt4) -o $@ $<
+endif
 endif
 
 .ui.h:
@@ -229,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 \
@@ -289,16 +306,25 @@ SOURCES_qt4 =     qt4.cpp \
                components/sout/profile_selector.cpp \
                components/sout/sout_widgets.cpp \
                util/input_slider.cpp \
+               util/timetooltip.cpp \
                util/customwidgets.cpp \
                util/searchlineedit.cpp \
                util/registry.cpp \
+               util/qmenuview.cpp \
                util/qt_dirs.cpp \
-               util/pictureflow.cpp
+               util/pictureflow.cpp \
+               util/buttons/BrowseButton.cpp \
+               util/buttons/DeckButtonsLayout.cpp \
+               util/buttons/RoundButton.cpp
 
 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 \
@@ -308,6 +334,7 @@ noinst_HEADERS = \
        actions_manager.hpp \
        extensions_manager.hpp \
        recents.hpp \
+       adapters/seekpoints.hpp \
        variables.hpp \
        dialogs/playlist.hpp \
        dialogs/bookmarks.hpp \
@@ -341,14 +368,13 @@ noinst_HEADERS = \
        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/views.hpp \
-    components/playlist/ml_item.hpp \
-    components/playlist/ml_model.hpp \
+       components/playlist/ml_item.hpp \
+       components/playlist/ml_model.hpp \
        components/playlist/vlc_model.hpp \
        components/playlist/playlist_model.hpp \
        components/playlist/playlist_item.hpp \
@@ -360,14 +386,19 @@ noinst_HEADERS = \
        components/sout/sout_widgets.hpp \
        components/sout/profiles.hpp \
        util/input_slider.hpp \
+       util/timetooltip.hpp \
        util/customwidgets.hpp \
        util/searchlineedit.hpp \
        util/qvlcframe.hpp \
        util/qvlcapp.hpp \
+       util/qmenuview.hpp \
        util/qt_dirs.hpp \
        util/registry.hpp \
        util/pictureflow.hpp \
-       util/singleton.hpp
+       util/singleton.hpp \
+       util/buttons/RoundButton.hpp \
+       util/buttons/DeckButtonsLayout.hpp \
+       util/buttons/BrowseButton.hpp
 
 
 EXTRA_DIST += \