Qt: menu, code simplification.

[vlc] / modules / gui / qt4 / dialogs / playlist.cpp

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index cd8aacab3746b608272d5a98ff1f93fcde629ca8..2736e5279c3982fecec87e3c559362b66fe1ce96 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -20,35 +20,70 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "dialogs/playlist.hpp"
-#include "util/qvlcframe.hpp"
-#include "qt4.hpp"
-#include "components/playlist/panels.hpp"
-#include "components/playlist/selector.hpp"
+
+#include "components/playlist/playlist.hpp"
+
+#include "util/qt_dirs.hpp"
+
+#include <QUrl>
 #include <QHBoxLayout>
 
 PlaylistDialog *PlaylistDialog::instance = NULL;
 
-PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
+PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
+                : QVLCMW( _p_intf )
 {
+    QWidget *main = new QWidget( this );
+    setCentralWidget( main );
     setWindowTitle( qtr( "Playlist" ) );
-    selector = new PLSelector( this, p_intf, THEPL );
-    selector->setMaximumWidth( 150 );
-
-    rightPanel = qobject_cast<PLPanel *>(new StandardPLPanel( this, p_intf,
-                                   THEPL, THEPL->p_local_category ) );
-    connect( selector, SIGNAL( activated( int ) ),
-             rightPanel, SLOT( setRoot( int ) ) );
-
-    QHBoxLayout *layout = new QHBoxLayout();
-    layout->addWidget( selector, 0 );
-    layout->addWidget( rightPanel, 10 );
-    readSettings( "playlist", QSize( 600,300 ) );
-    setLayout( layout );
+    setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
+
+    QHBoxLayout *l = new QHBoxLayout( centralWidget() );
+
+    getSettings()->beginGroup("playlistdialog");
+
+    playlistWidget = new PlaylistWidget( p_intf );
+    l->addWidget( playlistWidget );
+
+    readSettings( getSettings(), QSize( 600,700 ) );
+
+    getSettings()->endGroup();
 }
 
 PlaylistDialog::~PlaylistDialog()
 {
-    writeSettings( "playlist" );
+    getSettings()->beginGroup("playlistdialog");
+    writeSettings( getSettings() );
+    getSettings()->endGroup();
+}
+
+void PlaylistDialog::dropEvent( QDropEvent *event )
+{
+     const QMimeData *mimeData = event->mimeData();
+     foreach( const QUrl &url, mimeData->urls() ) {
+        QString s = toNativeSeparators( url.toString() );
+        if( s.length() > 0 ) {
+            playlist_Add( THEPL, qtu(s), NULL,
+                          PLAYLIST_APPEND, PLAYLIST_END, true, false );
+        }
+     }
+     event->acceptProposedAction();
 }
+void PlaylistDialog::dragEnterEvent( QDragEnterEvent *event )
+{
+     event->acceptProposedAction();
+}
+void PlaylistDialog::dragMoveEvent( QDragMoveEvent *event )
+{
+     event->acceptProposedAction();
+}
+void PlaylistDialog::dragLeaveEvent( QDragLeaveEvent *event )
+{
+     event->accept();
+}
+