X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2FModules.am;h=bf228afff7e199d8bb88916c9f30c2c6b8eacd8e;hb=b5077c0ef45f56e5b4126f78b71aadecf8f2857f;hp=336a9a2acdd41d8973cb81abade3bf1fd2e9ca59;hpb=35fd46d31f5fbcd6f187d7103f3bfa5fb65a2627;p=vlc

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 336a9a2acd..bf228afff7 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -64,9 +64,7 @@ nodist_SOURCES_qt4 = \
 		ui/streampanel.h \
 		ui/sout.h
 
-if ENABLE_QT4
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
-endif
 
 resources.cpp: vlc.qrc
 	$(RCC) -name vlc -o $@ $<
@@ -149,6 +147,7 @@ noinst_HEADERS = \
 	components/playlist/panels.hpp \
 	components/playlist/playlist.hpp \
 	components/playlist/selector.hpp \
+	components/playlist/sorting.h \
 	util/input_slider.hpp \
 	util/customwidgets.hpp \
 	util/qvlcframe.hpp \
@@ -173,67 +172,81 @@ EXTRA_DIST += \
 	ui/streampanel.ui \
 	ui/sout.ui \
 	ui/vlm.ui \
-	pixmaps/advprefs_audio.png \
-	pixmaps/advprefs_codec.png \
-	pixmaps/advprefs_extended.png \
-	pixmaps/advprefs_intf.png \
-	pixmaps/advprefs_playlist.png \
-	pixmaps/advprefs_sout.png \
-	pixmaps/advprefs_video.png \
-	pixmaps/capture-card_16px.png \
-	pixmaps/cdda_16px.png \
-	pixmaps/disc_16px.png \
-	pixmaps/file-asym_16px.png \
-	pixmaps/file-wide_16px.png \
-	pixmaps/folder-blue_16px.png \
-	pixmaps/folder-grey_16px.png \
+	pixmaps/prefs/advprefs_audio.png \
+	pixmaps/prefs/advprefs_codec.png \
+	pixmaps/prefs/advprefs_extended.png \
+	pixmaps/prefs/advprefs_intf.png \
+	pixmaps/prefs/advprefs_playlist.png \
+	pixmaps/prefs/advprefs_sout.png \
+	pixmaps/prefs/advprefs_video.png \
+	pixmaps/prefs/spref_cone_Audio_64.png \
+	pixmaps/prefs/spref_cone_Hotkeys_64.png \
+	pixmaps/prefs/spref_cone_Input_64.png \
+	pixmaps/prefs/spref_cone_Interface_64.png \
+	pixmaps/prefs/spref_cone_Subtitles_64.png \
+	pixmaps/prefs/spref_cone_Video_64.png \
+	pixmaps/types/capture-card_16px.png \
+	pixmaps/types/cdda_16px.png \
+	pixmaps/types/disc_16px.png \
+	pixmaps/types/file-asym_16px.png \
+	pixmaps/types/file-wide_16px.png \
+	pixmaps/types/folder-blue_16px.png \
+	pixmaps/types/folder-grey_16px.png \
+	pixmaps/types/harddisk_16px.png \
+	pixmaps/types/network_16px.png \
+	pixmaps/menus/help_16px.png \
+	pixmaps/menus/info_16px.png \
+	pixmaps/menus/messages_16px.png \
+	pixmaps/menus/preferences_16px.png \
+	pixmaps/menus/quit_16px.png \
+	pixmaps/menus/settings_16px.png \
+	pixmaps/menus/stream_16px.png \
+	pixmaps/menus/playlist_16px.png \
 	pixmaps/go-next.png \
-	pixmaps/harddisk_16px.png \
-	pixmaps/menus_help_16px.png \
-	pixmaps/menus_info_16px.png \
-	pixmaps/menus_messages_16px.png \
-	pixmaps/menus_preferences_16px.png \
-	pixmaps/menus_quit_16px.png \
-	pixmaps/menus_settings_16px.png \
-	pixmaps/menus_stream_16px.png \
-	pixmaps/network_16px.png \
 	pixmaps/next_16px.png \
 	pixmaps/next.png \
 	pixmaps/noart.png \
 	pixmaps/pause_16px.png \
 	pixmaps/pause.png \
 	pixmaps/play_16px.png \
-	pixmaps/playlist_16px.png \
-	pixmaps/playlist_add.png \
-	pixmaps/playlist.png \
-	pixmaps/playlist_repeat_all.png \
-	pixmaps/playlist_repeat_off.png \
-	pixmaps/playlist_repeat_one.png \
-	pixmaps/playlist_shuffle_off.png \
-	pixmaps/playlist_shuffle_on.png \
+	pixmaps/playlist/add.png \
+	pixmaps/playlist/playlist.png \
+	pixmaps/playlist/repeat_all.png \
+	pixmaps/playlist/repeat_off.png \
+	pixmaps/playlist/repeat_one.png \
+	pixmaps/playlist/shuffle_off.png \
+	pixmaps/playlist/shuffle_on.png \
 	pixmaps/play.png \
 	pixmaps/previous_16px.png \
 	pixmaps/previous.png \
-	pixmaps/record_16px.png \
-	pixmaps/spref_cone_Audio_64.png \
-	pixmaps/spref_cone_Hotkeys_64.png \
-	pixmaps/spref_cone_Input_64.png \
-	pixmaps/spref_cone_Interface_64.png \
-	pixmaps/spref_cone_Subtitles_64.png \
-	pixmaps/spref_cone_Video_64.png \
 	pixmaps/stop_16px.png \
 	pixmaps/stop.png \
-	pixmaps/tape_16px.png \
-	pixmaps/type_directory.png \
-	pixmaps/type_file.png \
-	pixmaps/type_net.png \
-	pixmaps/type_node.png \
-	pixmaps/type_playlist.png \
-	pixmaps/type_unknown.xpm \
-	pixmaps/volume-high.png \
-	pixmaps/volume-medium.png \
-	pixmaps/volume-low.png \
-	pixmaps/volume-muted.png \
-	pixmaps/volume-slider.svg \
-	pixmaps/volume-slider-inside.png \
-	pixmaps/volume-slider-outside.png
+	pixmaps/eject.png \
+	pixmaps/update.png \
+	pixmaps/clear.png \
+	pixmaps/arrow_down_dark.png \
+	pixmaps/types/tape_16px.png \
+	pixmaps/types/type_directory.png \
+	pixmaps/types/type_file.png \
+	pixmaps/types/type_net.png \
+	pixmaps/types/type_node.png \
+	pixmaps/types/type_playlist.png \
+	pixmaps/types/type_unknown.xpm \
+	pixmaps/toolbar/extended_16px.png \
+	pixmaps/toolbar/record_16px.png \
+	pixmaps/toolbar/snapshot.png \
+	pixmaps/toolbar/atob.png \
+	pixmaps/toolbar/dvd_menu.png \
+	pixmaps/toolbar/dvd_next.png \
+	pixmaps/toolbar/dvd_prev.png \
+	pixmaps/toolbar/tv.png \
+	pixmaps/toolbar/fullscreen.png \
+	pixmaps/toolbar/tvtelx.png \
+	pixmaps/toolbar/tvtelx-transparent.png \
+	pixmaps/toolbar/volume-high.png \
+	pixmaps/toolbar/volume-medium.png \
+	pixmaps/toolbar/volume-low.png \
+	pixmaps/toolbar/volume-muted.png \
+	pixmaps/toolbar/volume-slider.svg \
+	pixmaps/toolbar/volume-slider-inside.png \
+	pixmaps/toolbar/volume-slider-outside.png