Browse Source

Qt: move getDirectoryDialog to a static helper

pull/21/head
Jean-Baptiste Kempf 12 years ago
parent
commit
7f2ce08ccc
  1. 2
      modules/gui/qt4/components/playlist/standardpanel.cpp
  2. 5
      modules/gui/qt4/dialogs_provider.cpp
  3. 3
      modules/gui/qt4/dialogs_provider.hpp

2
modules/gui/qt4/components/playlist/standardpanel.cpp

@ -358,7 +358,7 @@ void StandardPLPanel::popupAction( QAction *action )
break;
case VLCModelSubInterface::ACTION_ENQUEUEDIR:
temp = THEDP->getDirectoryDialog();
temp = DialogsProvider::getDirectoryDialog( p_intf );
if ( temp.isEmpty() ) return;
a.uris << temp;
action->setData( QVariant::fromValue( a ) );

5
modules/gui/qt4/dialogs_provider.cpp

@ -514,9 +514,10 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
Open::openMRL( p_intf, uri, go, pl );
}
QString DialogsProvider::getDirectoryDialog()
QString DialogsProvider::getDirectoryDialog( intf_thread_t *p_intf )
{
QString dir = QFileDialog::getExistingDirectory( NULL, qtr( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath );
QString dir = QFileDialog::getExistingDirectory( NULL,
qtr( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath );
if( dir.isEmpty() ) return QString();

3
modules/gui/qt4/dialogs_provider.hpp

@ -90,6 +90,8 @@ public:
EXT_FILTER_PLAYLIST,
const QString& path = QString() );
bool isDying() { return b_isDying; }
static QString getDirectoryDialog( intf_thread_t *p_intf);
protected:
QSignalMapper *menusMapper;
QSignalMapper *menusUpdateMapper;
@ -143,7 +145,6 @@ public slots:
void openNetDialog();
void openCaptureDialog();
QString getDirectoryDialog();
void PLAppendDialog( int tab = OPEN_FILE_TAB );
void MLAppendDialog( int tab = OPEN_FILE_TAB );

Loading…
Cancel
Save