Skip to content

V
vlc
Commit 41e490d1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Don't use Simple Open, it can be broken. Workaround it. Close #1917

parent 4f10b8ae
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @ 41e490d1
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
...@@ -252,8 +253,7 @@ void StandardPLPanel::popupAdd() ...@@ -252,8 +253,7 @@ void StandardPLPanel::popupAdd()
if( currentRootId == THEPL->p_local_category->i_id || if( currentRootId == THEPL->p_local_category->i_id ||
currentRootId == THEPL->p_local_onelevel->i_id ) currentRootId == THEPL->p_local_onelevel->i_id )
{ {
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(simplePLAppendDialog())); popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(PLAppendDialog()) );
popup.addAction( qtr(I_PL_ADVADD), THEDP, SLOT(PLAppendDialog()) );
popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) ); popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
} }
else if( ( THEPL->p_ml_category && else if( ( THEPL->p_ml_category &&
...@@ -261,8 +261,7 @@ void StandardPLPanel::popupAdd() ...@@ -261,8 +261,7 @@ void StandardPLPanel::popupAdd()
( THEPL->p_ml_onelevel && ( THEPL->p_ml_onelevel &&
currentRootId == THEPL->p_ml_onelevel->i_id ) ) currentRootId == THEPL->p_ml_onelevel->i_id ) )
{ {
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(simpleMLAppendDialog())); popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( MLAppendDialog() ) );
popup.addAction( qtr(I_PL_ADVADD), 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() )
......
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