Skip to content

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

Qt: Remove some connect errors.

parent f5a31fb7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @ dcbb433f
...@@ -241,19 +241,18 @@ void StandardPLPanel::popupAdd() ...@@ -241,19 +241,18 @@ 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(PLAppendDialog( OPEN_FILE_TAB )) ); popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simplePLAppendDialog()) );
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(PLAppendDialog( OPEN_DISC_TAB )) );
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(PLAppendDialog( OPEN_NETWORK_TAB )) );
popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT(PLAppendDialog( OPEN_FILE_TAB )) );
popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) ); popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
popup.addAction( qtr(I_OP_ADVOP), THEDP, SLOT( PLAppendDialog()) );
} }
else if( ( THEPL->p_ml_category && else if( ( THEPL->p_ml_category &&
currentRootId == THEPL->p_ml_category->i_id ) || currentRootId == THEPL->p_ml_category->i_id ) ||
( 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( MLAppendDialog() ) ); popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simpleMLAppendDialog()) );
popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) ); popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
popup.addAction( qtr(I_OP_ADVOP), THEDP, SLOT( MLAppendDialog() ) );
} }
popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() ) popup.exec( QCursor::pos() - addButton->mapFromGlobal( QCursor::pos() )
......
modules/gui/qt4/util/customwidgets.cpp
View file @ dcbb433f
...@@ -241,6 +241,6 @@ QString VLCKeyToString( int val ) ...@@ -241,6 +241,6 @@ QString VLCKeyToString( int val )
if( val & KEY_MODIFIER_SHIFT ) if( val & KEY_MODIFIER_SHIFT )
r+= "Shift+"; r+= "Shift+";
return r + (base ? base : "Unset"); return r + (base ? base : qtr( "Unset" ) );
} }
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