A bunch of various fixes (encoding, refcount, layout)

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

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index cdd5e7fe071446440e72c1325540ccbc5902c415..753195d7973ad664a51ff28c5f8c3790e9a192d7 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -11,39 +11,55 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-TOUI = ui/input_stats ui/main_interface ui/file_open
+TOUI = ui/input_stats ui/main_interface ui/file_open \
+       ui/okcanceldialog
 UIH = $(TOUI:%=%.h)
 
 TOMOC = main_interface \
+       menus \
        dialogs_provider \
        input_manager \
+       playlist_model \
        dialogs/playlist \
        dialogs/prefs_dialog \
        dialogs/streaminfo \
+       dialogs/interaction \
        components/infopanels \
        components/preferences_widgets \
        components/preferences \
        components/open \
+       components/video_widget \
+       components/playlist/panels \
+       components/playlist/selector \
        util/input_slider
 MOCCPP = $(TOMOC:%=%.moc.cpp)
 
 nodist_SOURCES_qt4 = \
                main_interface.moc.cpp \
+               menus.moc.cpp \
                dialogs_provider.moc.cpp \
                input_manager.moc.cpp \
+               playlist_model.moc.cpp \
                dialogs/playlist.moc.cpp \
                dialogs/streaminfo.moc.cpp \
                dialogs/prefs_dialog.moc.cpp \
+               dialogs/interaction.moc.cpp \
                components/infopanels.moc.cpp \
                components/preferences_widgets.moc.cpp \
                components/preferences.moc.cpp \
                components/open.moc.cpp \
-               util/input_slider.moc.cpp
+               components/video_widget.moc.cpp \
+               components/playlist/panels.moc.cpp \
+               components/playlist/selector.moc.cpp \
+               util/input_slider.moc.cpp \
+               resources.cpp
 
 if ENABLE_QT4
 BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4)
 endif
 
+resources.cpp: res.qrc
+       $(RCC) -name vlc -o $@ $<
 
 $(MOCCPP): %.moc.cpp: %.hpp
        @echo "$(MOC) $< -> $@"
@@ -53,38 +69,56 @@ $(UIH): %.h: %.ui
        $(install_sh) -d ui
        @echo "$(UIC) $< -> $@"
        rm -f $@
-       echo "#define Q_(a,b) _(a)" > $@
+       echo "#define Q_(a,b) QString::fromUtf8(_(a))" > $@
        $(UIC) -tr "Q_" $< >> $@
 
 
 SOURCES_qt4 =  qt4.cpp \
+               menus.cpp \
                main_interface.cpp \
                dialogs_provider.cpp \
                input_manager.cpp \
+               playlist_model.cpp \
                dialogs/playlist.cpp \
                dialogs/prefs_dialog.cpp \
                dialogs/streaminfo.cpp \
+               dialogs/interaction.cpp \
                components/infopanels.cpp \
                components/preferences_widgets.cpp \
                components/preferences.cpp \
                components/open.cpp \
-               util/input_slider.cpp
+               components/video_widget.cpp \
+               components/playlist/standardpanel.cpp \
+               components/playlist/selector.cpp \
+               util/input_slider.cpp \
                $(NULL)
 
 EXTRA_DIST += \
        qt4.hpp \
+       menus.hpp \
        main_interface.hpp \
        dialogs_provider.hpp \
        input_manager.hpp \
+       playlist_model.hpp \
+       res.qrc \
        dialogs/playlist.hpp \
        dialogs/streaminfo.hpp \
        dialogs/prefs_dialog.hpp \
+       dialogs/interaction.hpp \
        components/infopanels.hpp \
        components/preferences_widgets.hpp \
        components/preferences.hpp \
        components/open.hpp \
+       components/video_widget.hpp \
+       components/playlist/panels.hpp \
+    components/playlist/selector.hpp \
        util/input_slider.hpp \
+       util/directslider.hpp \
+       util/qvlcframe.hpp \
        ui/input_stats.ui \
+       ui/file_open.ui \
+       ui/main_interface.ui \
+       ui/okcanceldialog.ui \
        pixmaps/advanced.xpm \
        pixmaps/audio.xpm \
        pixmaps/codec.xpm \