macosx: CAS: implemented destination file selector

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index f64eda1b51ea1b5a97d44290bef10c18895e0ec4..ae626fd3c653f79696f407932aaf259322804151 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -70,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 \
@@ -95,6 +96,7 @@ nodist_SOURCES_qt4 = \
                ui/messages_panel.h \
                ui/about.h \
                ui/update.h \
+               styles/seekstyle.moc.cpp \
                dialogs/ml_configuration.moc.cpp \
                components/playlist/ml_model.moc.cpp \
                ui/sout.h
@@ -104,6 +106,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 \
@@ -150,6 +153,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 \
@@ -225,12 +229,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
 
@@ -243,7 +247,7 @@ 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 \
@@ -307,11 +311,13 @@ 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 \
                util/buttons/DeckButtonsLayout.cpp \
-               util/buttons/RoundButton.cpp
+               util/buttons/RoundButton.cpp \
+               styles/seekstyle.cpp
 
 if HAVE_DARWIN
 SOURCES_qt4 +=  util/searchlineedit_mac.mm
@@ -387,13 +393,15 @@ noinst_HEADERS = \
        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/buttons/RoundButton.hpp \
        util/buttons/DeckButtonsLayout.hpp \
-       util/buttons/BrowseButton.hpp
+       util/buttons/BrowseButton.hpp \
+       styles/seekstyle.hpp
 
 
 EXTRA_DIST += \