Commit 9b499eae authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Adding Open Menu entries.

parent bf38fbd0
...@@ -84,6 +84,7 @@ OpenDialog::~OpenDialog() ...@@ -84,6 +84,7 @@ OpenDialog::~OpenDialog()
void OpenDialog::showTab(int i_tab=0) void OpenDialog::showTab(int i_tab=0)
{ {
printf ( "%i" , i_tab);
this->show(); this->show();
ui.Tab->setCurrentIndex(i_tab); ui.Tab->setCurrentIndex(i_tab);
} }
...@@ -141,6 +142,8 @@ void OpenDialog::toggleAdvancedPanel() ...@@ -141,6 +142,8 @@ void OpenDialog::toggleAdvancedPanel()
} }
resize( width(), mainHeight + advHeight ); resize( width(), mainHeight + advHeight );
} }
showTab( 2 );
} }
void OpenDialog::updateMRL() { void OpenDialog::updateMRL() {
......
...@@ -80,10 +80,13 @@ void DialogsProvider::customEvent( QEvent *event ) ...@@ -80,10 +80,13 @@ void DialogsProvider::customEvent( QEvent *event )
switch( de->i_dialog ) switch( de->i_dialog )
{ {
case INTF_DIALOG_FILE: case INTF_DIALOG_FILE:
openDialog(); break;
case INTF_DIALOG_DISC: case INTF_DIALOG_DISC:
openDiscDialog(); break;
case INTF_DIALOG_NET: case INTF_DIALOG_NET:
openNetDialog(); break;
case INTF_DIALOG_CAPTURE: case INTF_DIALOG_CAPTURE:
openDialog( de->i_dialog ); break; openDialog(); break;
case INTF_DIALOG_PLAYLIST: case INTF_DIALOG_PLAYLIST:
playlistDialog(); break; playlistDialog(); break;
case INTF_DIALOG_MESSAGES: case INTF_DIALOG_MESSAGES:
...@@ -158,17 +161,27 @@ void DialogsProvider::openDialog() ...@@ -158,17 +161,27 @@ void DialogsProvider::openDialog()
{ {
openDialog( 0 ); openDialog( 0 );
} }
void DialogsProvider::PLAppendDialog() void DialogsProvider::openDiscDialog()
{ {
openDialog( 1 );
} }
void DialogsProvider::MLAppendDialog() void DialogsProvider::openNetDialog()
{ {
openDialog( 2 );
} }
void DialogsProvider::openDialog( int i_tab ) void DialogsProvider::openDialog( int i_tab )
{ {
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab ); OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
} }
void DialogsProvider::PLAppendDialog()
{
}
void DialogsProvider::MLAppendDialog()
{
}
/**** Simple open ****/ /**** Simple open ****/
QStringList DialogsProvider::showSimpleOpen() QStringList DialogsProvider::showSimpleOpen()
......
...@@ -83,9 +83,11 @@ public slots: ...@@ -83,9 +83,11 @@ public slots:
void simpleMLAppendDialog(); void simpleMLAppendDialog();
void simpleOpenDialog(); void simpleOpenDialog();
void openDialog(); void openDialog();
void openDialog(int );
void openNetDialog();
void openDiscDialog();
void PLAppendDialog(); void PLAppendDialog();
void MLAppendDialog(); void MLAppendDialog();
void openDialog( int );
void popupMenu( int ); void popupMenu( int );
void doInteraction( intf_dialog_args_t * ); void doInteraction( intf_dialog_args_t * );
void menuAction( QObject *); void menuAction( QObject *);
......
...@@ -143,6 +143,8 @@ QMenu *QVLCMenu::FileMenu() ...@@ -143,6 +143,8 @@ QMenu *QVLCMenu::FileMenu()
QMenu *menu = new QMenu(); QMenu *menu = new QMenu();
DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() ); DP_SADD( qtr("Quick &Open File...") , "", "", simpleOpenDialog() );
DP_SADD( qtr("&Advanced Open..." ), "", "", openDialog() ); DP_SADD( qtr("&Advanced Open..." ), "", "", openDialog() );
DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog());
DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog());
menu->addSeparator(); menu->addSeparator();
DP_SADD( qtr("Streaming..."), "", "", streamingDialog() ); DP_SADD( qtr("Streaming..."), "", "", streamingDialog() );
menu->addSeparator(); menu->addSeparator();
......
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