Merge branch 'master' into devel
This commit is contained in:
2 files changed
+4
-6
No files matched your search
+4
-4
@@ -196,8 +196,8 @@ Void PlaYUVerApp::loadFile( QString fileName, PlaYUVerStreamInfo* pStreamInfo )
|
|||||||
m_pcWindowHandle->setActiveSubWindow( videoSubWindow );
|
m_pcWindowHandle->setActiveSubWindow( videoSubWindow );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
videoSubWindow =
|
videoSubWindow =
|
||||||
new VideoSubWindow( VideoSubWindow::VIDEO_STREAM_SUBWINDOW ); // createSubWindow();
|
new VideoSubWindow( VideoSubWindow::VIDEO_STREAM_SUBWINDOW ); // createSubWindow();
|
||||||
SubWindowAbstract* subWindow = videoSubWindow;
|
SubWindowAbstract* subWindow = videoSubWindow;
|
||||||
if( !pStreamInfo )
|
if( !pStreamInfo )
|
||||||
{
|
{
|
||||||
@@ -872,8 +872,8 @@ Void PlaYUVerApp::updateRecentFileActions()
|
|||||||
m_arrayRecentFilesActions.at( actionIdx )->setText( QFileInfo( text ).fileName() );
|
m_arrayRecentFilesActions.at( actionIdx )->setText( QFileInfo( text ).fileName() );
|
||||||
m_arrayRecentFilesActions.at( actionIdx )->setToolTip( "Open File " + text );
|
m_arrayRecentFilesActions.at( actionIdx )->setToolTip( "Open File " + text );
|
||||||
m_arrayRecentFilesActions.at( actionIdx )->setStatusTip( "Open File " + text );
|
m_arrayRecentFilesActions.at( actionIdx )->setStatusTip( "Open File " + text );
|
||||||
m_arrayRecentFilesActions.at( actionIdx )
|
m_arrayRecentFilesActions.at( actionIdx )
|
||||||
->setData( QVariant::fromValue( m_aRecentFileStreamInfo.at( actionIdx ) ) );
|
->setData( QVariant::fromValue( m_aRecentFileStreamInfo.at( actionIdx ) ) );
|
||||||
m_arrayRecentFilesActions.at( actionIdx )->setVisible( true );
|
m_arrayRecentFilesActions.at( actionIdx )->setVisible( true );
|
||||||
actionIdx++;
|
actionIdx++;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,8 +34,6 @@ class PlaYUVerFrame;
|
|||||||
public: \
|
public: \
|
||||||
static PlaYUVerStreamHandlerIf* Create() { return new X(); } \
|
static PlaYUVerStreamHandlerIf* Create() { return new X(); } \
|
||||||
void Delete() { delete this; }
|
void Delete() { delete this; }
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \class PlaYUVerStreamHandlerIf
|
* \class PlaYUVerStreamHandlerIf
|
||||||
* \ingroup PlaYUVerLib_Stream
|
* \ingroup PlaYUVerLib_Stream
|
||||||
|
|||||||
Reference in new issue
Block a user