Commit 97be5f61 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Open: Capture Tab added. Still almost empty, but well, this is coming after. :D

parent a33fbe90
......@@ -271,4 +271,7 @@ void CaptureOpenPanel::clear()
{}
void CaptureOpenPanel::updateMRL()
{}
{
QString mrl = "";
emit mrlUpdated(mrl);
}
......@@ -42,12 +42,15 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
setModal( modal );
ui.setupUi( this );
setWindowTitle( qtr("Open" ) );
fileOpenPanel = new FileOpenPanel(this , p_intf );
diskOpenPanel = new DiskOpenPanel(this , p_intf );
netOpenPanel = new NetOpenPanel(this , p_intf );
ui.Tab->addTab(fileOpenPanel, qtr("File"));
ui.Tab->addTab(diskOpenPanel, qtr("Disc"));
ui.Tab->addTab(netOpenPanel, qtr("Network"));
fileOpenPanel = new FileOpenPanel( this , p_intf );
diskOpenPanel = new DiskOpenPanel( this , p_intf );
netOpenPanel = new NetOpenPanel( this , p_intf );
captureOpenPanel = new CaptureOpenPanel( this, p_intf );
ui.Tab->addTab( fileOpenPanel, qtr( "File" ) );
ui.Tab->addTab( diskOpenPanel, qtr( "Disc" ) );
ui.Tab->addTab( netOpenPanel, qtr( "Network" ) );
ui.Tab->addTab( captureOpenPanel, qtr( "Capture" ) );
ui.advancedFrame->hide();
......@@ -57,6 +60,9 @@ OpenDialog::OpenDialog( QWidget *parent, intf_thread_t *_p_intf, bool modal ) :
CONNECT( fileOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
CONNECT( netOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
CONNECT( diskOpenPanel, mrlUpdated( QString ), this, updateMRL(QString) );
CONNECT( captureOpenPanel, mrlUpdated( QString ), this,
updateMRL(QString) );
CONNECT( fileOpenPanel, methodChanged( QString ),
this, newMethod(QString) );
......@@ -122,7 +128,7 @@ void OpenDialog::ok()
PLAYLIST_APPEND | (i ? 0 : PLAYLIST_GO) |
( i ? PLAYLIST_PREPARSE : 0 ),
PLAYLIST_END, VLC_TRUE, VLC_FALSE );
}
}
}
else
......
......@@ -60,6 +60,7 @@ private:
FileOpenPanel *fileOpenPanel;
NetOpenPanel *netOpenPanel;
DiskOpenPanel *diskOpenPanel;
CaptureOpenPanel *captureOpenPanel;
QString storedMethod;
int advHeight, mainHeight;
......
......@@ -86,7 +86,7 @@ void DialogsProvider::customEvent( QEvent *event )
case INTF_DIALOG_NET:
openNetDialog(); break;
case INTF_DIALOG_CAPTURE:
openDialog(); break;
openCaptureDialog(); break;
case INTF_DIALOG_PLAYLIST:
playlistDialog(); break;
case INTF_DIALOG_MESSAGES:
......@@ -173,6 +173,10 @@ void DialogsProvider::openNetDialog()
{
openDialog( 2 );
}
void DialogsProvider::openCaptureDialog()
{
openDialog( 3 );
}
void DialogsProvider::openDialog( int i_tab )
{
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
......
......@@ -89,6 +89,7 @@ public slots:
void openDialog(int );
void openFileDialog();
void openNetDialog();
void openCaptureDialog();
void openDiscDialog();
void PLAppendDialog();
void MLAppendDialog();
......
......@@ -145,6 +145,7 @@ QMenu *QVLCMenu::FileMenu()
DP_SADD( qtr("Open &File..." ), "", "", openFileDialog() );
DP_SADD( qtr("Open &Disc..." ), "", "", openDiscDialog());
DP_SADD( qtr("Open &Network..." ), "", "", openNetDialog());
DP_SADD( qtr("Open &Network..." ), "", "", openCaptureDialog());
menu->addSeparator();
DP_SADD( qtr("Streaming..."), "", "", streamingDialog() );
menu->addSeparator();
......
......@@ -59,7 +59,7 @@
</widget>
</item>
<item row="2" column="0" colspan="3" >
<widget class="QGroupBox" name="groupBox_3" >
<widget class="QGroupBox" name="Options" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
......@@ -83,6 +83,7 @@
</item>
</layout>
</widget>
<includes/>
<resources/>
<connections/>
</ui>
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