Qt: Ok is not ok as a button label.

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

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index a01c326c58cdc2efb30b1bd38a2a544d64da4121..c652396f9f8b559a3a40367846fed049db8b4fb6 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -20,20 +20,18 @@
  * 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 "main_interface.hpp"
 #include "components/playlist/playlist.hpp"
-#include "dialogs_provider.hpp"
-#include "menus.hpp"
+
+#include "util/qt_dirs.hpp"
 
 #include <QUrl>
 #include <QHBoxLayout>
-#include <QSignalMapper>
-#include <QMenu>
-#include <QAction>
-#include <QMenuBar>
 
 PlaylistDialog *PlaylistDialog::instance = NULL;
 
@@ -46,25 +44,32 @@ PlaylistDialog::PlaylistDialog( intf_thread_t *_p_intf )
     setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
 
     QHBoxLayout *l = new QHBoxLayout( centralWidget() );
-    PlaylistWidget *plw = new PlaylistWidget( p_intf, NULL );
-    l->addWidget( plw );
 
-    readSettings( "playlist", QSize( 600,700 ) );
+    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( QUrl url, mimeData->urls() ) {
-        QString s = url.toString();
+        QString s = toNativeSeparators( url.toString() );
         if( s.length() > 0 ) {
             playlist_Add( THEPL, qtu(s), NULL,
-                          PLAYLIST_APPEND, PLAYLIST_END, VLC_TRUE, VLC_FALSE );
+                          PLAYLIST_APPEND, PLAYLIST_END, true, false );
         }
      }
      event->acceptProposedAction();