Commit d811cff9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: allow more flexibility on tab selection for Open.

parent ecb12128
...@@ -251,6 +251,7 @@ void StandardPLPanel::popupAdd() ...@@ -251,6 +251,7 @@ void StandardPLPanel::popupAdd()
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( MLAppendDialog() ) ); popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( MLAppendDialog() ) );
popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) ); popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
} }
popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() ) popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )
+ QPoint( 0, addButton->height() ) ); + QPoint( 0, addButton->height() ) );
} }
......
...@@ -349,17 +349,17 @@ void DialogsProvider::openCaptureDialog() ...@@ -349,17 +349,17 @@ void DialogsProvider::openCaptureDialog()
} }
/* Same as the open one, but force the enqueue */ /* Same as the open one, but force the enqueue */
void DialogsProvider::PLAppendDialog() void DialogsProvider::PLAppendDialog( int tab )
{ {
OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false,
OPEN_AND_ENQUEUE )->showTab( OPEN_FILE_TAB ); OPEN_AND_ENQUEUE )->showTab( tab );
} }
void DialogsProvider::MLAppendDialog() void DialogsProvider::MLAppendDialog( int tab )
{ {
OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false,
OPEN_AND_ENQUEUE, false, false ) OPEN_AND_ENQUEUE, false, false )
->showTab( OPEN_FILE_TAB ); ->showTab( tab );
} }
/** /**
......
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
#include "qt4.hpp" #include "qt4.hpp"
#include "dialogs/open.hpp"
#include <QObject> #include <QObject>
#include <QStringList>
#define ADD_FILTER_MEDIA( string ) \ #define ADD_FILTER_MEDIA( string ) \
string += qtr( "Media Files" ); \ string += qtr( "Media Files" ); \
...@@ -82,7 +84,6 @@ enum { ...@@ -82,7 +84,6 @@ enum {
class QEvent; class QEvent;
class QSignalMapper; class QSignalMapper;
class QVLCMenu; class QVLCMenu;
#include <QStringList>
class DialogsProvider : public QObject class DialogsProvider : public QObject
{ {
...@@ -171,8 +172,8 @@ public slots: ...@@ -171,8 +172,8 @@ public slots:
void openNetDialog(); void openNetDialog();
void openCaptureDialog(); void openCaptureDialog();
void PLAppendDialog(); void PLAppendDialog( int tab = OPEN_FILE_TAB );
void MLAppendDialog(); void MLAppendDialog( int tab = OPEN_FILE_TAB );
void PLOpenDir(); void PLOpenDir();
void PLAppendDir(); void PLAppendDir();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment