jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug when saving frame

Browse Source
This commit is contained in:
jfmcarreira
2018-04-04 21:58:25 +01:00
parent 6ce6b95b30
commit bcba3c7368
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/MainWindow.cpp
+11 -9
View File
@@ -278,14 +278,16 @@ QStringList MainWindow::showFileDialog( bool bRead )
filter << supported << formatsList << tr( "All Files (*)" ); filter << supported << formatsList << tr( "All Files (*)" );
QStringList fileNameList; QStringList fileNameList;
fileNameList.clear();
if( bRead ) if( bRead )
{ {
fileNameList = QFileDialog::getOpenFileNames( this, tr( "Open File" ), m_cLastOpenPath, filter.join( ";;" ) ); fileNameList = QFileDialog::getOpenFileNames( this, tr( "Open File" ), m_cLastOpenPath, filter.join( ";;" ) );
} }
else else
{ {
QString fileName = QFileDialog::getSaveFileName( this, tr( "Open File" ), m_cLastOpenPath, filter.join( ";;" ) ); QString fileName = QFileDialog::getSaveFileName( this, tr( "Save File" ), m_cLastOpenPath, filter.join( ";;" ) );
fileNameList.append( fileName ); if( !fileName.isEmpty() )
fileNameList.append( fileName );
} }
return fileNameList; return fileNameList;
} }
@@ -321,10 +323,10 @@ void MainWindow::saveFrame()
{ {
VideoSubWindow* saveWindow = m_pcCurrentVideoSubWindow; VideoSubWindow* saveWindow = m_pcCurrentVideoSubWindow;
QStringList fileNames = showFileDialog( false ); QStringList fileNameList = showFileDialog( false );
if( fileNames.size() == 1 ) if( fileNameList.size() == 1 )
{ {
QString fileName = fileNames[0]; QString fileName = fileNameList[0];
m_cLastOpenPath = QFileInfo( fileName ).path(); m_cLastOpenPath = QFileInfo( fileName ).path();
try try
{ {
@@ -349,10 +351,10 @@ void MainWindow::saveStream()
{ {
VideoSubWindow* saveWindow = m_pcCurrentVideoSubWindow; VideoSubWindow* saveWindow = m_pcCurrentVideoSubWindow;
QStringList fileNames = showFileDialog( false ); QStringList fileNameList = showFileDialog( false );
if( fileNames.size() == 1 ) if( fileNameList.size() == 1 )
{ {
QString fileName = fileNames[0]; QString fileName = fileNameList[0];
m_cLastOpenPath = QFileInfo( fileName ).path(); m_cLastOpenPath = QFileInfo( fileName ).path();
try try
{ {
@@ -657,7 +659,7 @@ void MainWindow::createActions()
m_arrayActions[SAVE_STREAM_ACT]->setIcon( style()->standardIcon( QStyle::SP_DialogSaveButton ) ); m_arrayActions[SAVE_STREAM_ACT]->setIcon( style()->standardIcon( QStyle::SP_DialogSaveButton ) );
m_arrayActions[SAVE_STREAM_ACT]->setShortcuts( QKeySequence::SaveAs ); m_arrayActions[SAVE_STREAM_ACT]->setShortcuts( QKeySequence::SaveAs );
m_arrayActions[SAVE_STREAM_ACT]->setStatusTip( tr( "Save current stream" ) ); m_arrayActions[SAVE_STREAM_ACT]->setStatusTip( tr( "Save current stream" ) );
connect( m_arrayActions[SAVE_ACT], SIGNAL( triggered() ), this, SLOT( saveStream() ) ); connect( m_arrayActions[SAVE_STREAM_ACT], SIGNAL( triggered() ), this, SLOT( saveStream() ) );
m_arrayActions[FORMAT_ACT] = new QAction( tr( "&Format" ), this ); m_arrayActions[FORMAT_ACT] = new QAction( tr( "&Format" ), this );
m_arrayActions[FORMAT_ACT]->setIcon( QIcon::fromTheme( "transform-scale" ) ); m_arrayActions[FORMAT_ACT]->setIcon( QIcon::fromTheme( "transform-scale" ) );