Qt4: firstRun dialog is now separated

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index dea66d629915d71ea3bc5dc75d41db3629807037..d80f7b2cc18132ef20910da4252e4bc4c974d4b7 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -21,16 +21,18 @@ nodist_SOURCES_qt4 = \
                input_manager.moc.cpp \
                actions_manager.moc.cpp \
                recents.moc.cpp \
+               variables.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/external.moc.cpp \
                dialogs/plugins.moc.cpp \
                dialogs/preferences.moc.cpp \
-               dialogs/interaction.moc.cpp \
                dialogs/sout.moc.cpp \
+               dialogs/convert.moc.cpp \
                dialogs/help.moc.cpp \
                dialogs/gototime.moc.cpp \
                dialogs/toolbar.moc.cpp \
@@ -38,6 +40,7 @@ nodist_SOURCES_qt4 = \
                dialogs/openurl.moc.cpp \
                dialogs/podcast_configuration.moc.cpp \
                dialogs/vlm.moc.cpp \
+               dialogs/firstrun.moc.cpp \
                components/extended_panels.moc.cpp \
                components/info_panels.moc.cpp \
                components/preferences_widgets.moc.cpp \
@@ -48,13 +51,14 @@ nodist_SOURCES_qt4 = \
                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 \
                components/sout/profile_selector.moc.cpp \
+               components/sout/sout_widgets.moc.cpp \
                util/input_slider.moc.cpp \
                util/customwidgets.moc.cpp \
+               util/qvlcapp.moc.cpp \
                resources.cpp \
                ui/equalizer.h \
                ui/v4l2.h \
@@ -99,6 +103,7 @@ DEPS_res = \
        pixmaps/playlist/add.png \
        pixmaps/playlist/jumpto.png \
        pixmaps/playlist/playlist.png \
+       pixmaps/playlist/remove.png \
        pixmaps/playlist/repeat_all.png \
        pixmaps/playlist/repeat_off.png \
        pixmaps/playlist/repeat_one.png \
@@ -120,6 +125,10 @@ 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 \
        pixmaps/slower.png \
        pixmaps/space.png \
        pixmaps/stop.png \
@@ -166,23 +175,34 @@ DEPS_res = \
        pixmaps/types/type_node.png \
        pixmaps/types/type_playlist.png \
        pixmaps/types/type_unknown.xpm \
-       pixmaps/update.png
+       pixmaps/update.png \
+       pixmaps/lock.png
 
 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)
+
+uic_verbose = $(uic_verbose_$(V))
+uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
+uic_verbose_0 = @echo "  UIC   " $@;
+uic_verbose__0 = $(uic_verbose_0)
+
 resources.cpp: vlc.qrc $(DEPS_res)
-       $(RCC) -name vlc -o $@ $<
+       $(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
 .hpp.moc.cpp:
-       $(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
+       $(moc_verbose)$(MOC) $(DEFS) $(CPPFLAGS) -I$(top_builddir) `$(VLC_CONFIG) --cppflags plugin qt4` -o $@ $<
 
 .ui.h:
-       mkdir -p -- ui
-       rm -f $@ $@.tmp
-       echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
-       $(UIC) -tr "Q_" $< >> $@.tmp
-       sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
-       rm -f $@.tmp
+       $(AM_V_at)mkdir -p -- ui
+       $(AM_V_at)rm -f $@ $@.tmp
+       $(AM_V_at)echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@.tmp
+       $(uic_verbose)$(UIC) -tr "Q_" $< >> $@.tmp
+       $(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
+       $(AM_V_at)rm -f $@.tmp
 
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
@@ -191,6 +211,7 @@ SOURCES_qt4 =       qt4.cpp \
                input_manager.cpp \
                actions_manager.cpp \
                recents.cpp \
+               variables.cpp \
                dialogs/playlist.cpp \
                dialogs/bookmarks.cpp \
                dialogs/preferences.cpp \
@@ -198,15 +219,17 @@ SOURCES_qt4 =     qt4.cpp \
                dialogs/extended.cpp \
                dialogs/messages.cpp \
                dialogs/errors.cpp \
+               dialogs/external.cpp \
                dialogs/plugins.cpp \
-               dialogs/interaction.cpp \
                dialogs/sout.cpp \
+               dialogs/convert.cpp \
                dialogs/help.cpp \
                dialogs/gototime.cpp \
                dialogs/toolbar.cpp \
                dialogs/open.cpp \
                dialogs/openurl.cpp \
                dialogs/vlm.cpp \
+               dialogs/firstrun.cpp \
                dialogs/podcast_configuration.cpp \
                components/extended_panels.cpp \
                components/info_panels.cpp \
@@ -223,6 +246,7 @@ SOURCES_qt4 =       qt4.cpp \
                components/playlist/playlist.cpp \
                components/playlist/selector.cpp \
                components/sout/profile_selector.cpp \
+               components/sout/sout_widgets.cpp \
                util/input_slider.cpp \
                util/customwidgets.cpp \
                util/registry.cpp
@@ -235,22 +259,25 @@ noinst_HEADERS = \
        input_manager.hpp \
        actions_manager.hpp \
        recents.hpp \
+       variables.hpp \
        dialogs/playlist.hpp \
        dialogs/bookmarks.hpp \
        dialogs/mediainfo.hpp \
        dialogs/extended.hpp \
        dialogs/messages.hpp \
        dialogs/errors.hpp \
+       dialogs/external.hpp \
        dialogs/plugins.hpp \
        dialogs/preferences.hpp \
-       dialogs/interaction.hpp \
        dialogs/sout.hpp \
+       dialogs/convert.hpp \
        dialogs/help.hpp \
        dialogs/gototime.hpp \
        dialogs/toolbar.hpp \
        dialogs/open.hpp \
        dialogs/openurl.hpp \
        dialogs/vlm.hpp \
+       dialogs/firstrun.hpp \
        dialogs/podcast_configuration.hpp \
        components/extended_panels.hpp \
        components/info_panels.hpp \
@@ -268,6 +295,8 @@ noinst_HEADERS = \
        components/playlist/selector.hpp \
        components/playlist/sorting.h \
        components/sout/profile_selector.hpp \
+       components/sout/sout_widgets.hpp \
+       components/sout/profiles.hpp \
        util/input_slider.hpp \
        util/customwidgets.hpp \
        util/qvlcframe.hpp \